bump version, requirements

2004-07-02  JP Rosevear  <jpr@novell.com>

	* configure.in: bump version, requirements

2004-07-02  JP Rosevaer  <jpr@novell.com>

	* Makefile.am (SUBDIRS): Revert previous error change

svn path=/trunk/; revision=26583

1 files changed, 4144 insertions, 3406 deletions

diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 2f7b4820ea..bdaac3cd35 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.0\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-03-26 17:35+0100\n"
 "Last-Translator: Danilo Šegan <danilo@prevod.org>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
@@ -25,14 +25,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "adresar evolucije"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "zaglavlje kontakta: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "vizitkarta evolucije"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "tekući direktorijum adresara"
@@ -56,34 +48,252 @@ msgstr " karte"
 msgid " card"
 msgstr " karta"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "zaglavlje kontakta: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "vizitkarta evolucije"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Kursor nije mogao da bude učitan\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Neuspešna prijava na LDAP server"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Server je odgovorio nepodržanim bazama za pretragu"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Ovaj server ne podržava podatke LDAPv3 šeme"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Nisam mogao da preuzmem članak %s sa NNTP servera."
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Server nije odgovorio sa ispravnim podacima šeme"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Nisam mogao da učitam adresar"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Uređivač kategorija nije dostupan."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Sačuvaj u adresaru"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Greška kod učitavanja predefinisanog adresara."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Greška tokom pretrage"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Želite li da sačuvate promene?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Odbaci"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "i još %d kontakt."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Ne mogu da raščlanim sadržaj poruke"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Greška kod dodavanja kontakta"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Preglednik adresa Evolucija adresara"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Podrazumevana adresa za sinhronizovanje:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Nisam mogao da učitam adresar"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Nisam mogao da pročitam programski blok adresa pilota"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Anonimno pristupam LDAP serveru"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Nisam mogao da se prijavim.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Samodopunjavanje"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sUnesi lozinku za %s (korisnik %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakti"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Sertifikati"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Podesite ovde samodopunjavanje"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kontakti"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolucija adresar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Iskačući prozor za adrese Evolucija adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Preglednik adresa Evolucija adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Preglednik Evolucija adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Deo Evolucija adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Upravljanje S/MIME sertifikatima iz Evolucije"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Upravljanje podešavanjem direktorijuma iz Evolucije"
+
+# bug: s/manager/manage/
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+msgid "Manage your S/MIME certificates here"
+msgstr "Ovde upravljajte vašim S/MIME sertifikatima"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -116,7 +326,7 @@ msgstr "Novi kontakt"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Kontakti:"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -140,15 +350,15 @@ msgid "Migrating `%s':"
 msgstr "Prenosim „%s“:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Na ovom računaru"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -157,19 +367,19 @@ msgid "Personal"
 msgstr "Lično"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "Na LDAP serverima"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "LDAP serveri"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr "Podešavanje samodopunjavanja"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -181,7 +391,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenese vaše direktorijume..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -193,7 +403,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenese vaše direktorijume..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -205,7 +415,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenese vaše direktorijume..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -217,36 +427,45 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenese vaše direktorijume..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Adresar „%s“ će biti uklonjen. Sigurno želite da nastavite?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Novi adresar"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Obriši"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Osobine..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakti"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Anonimno pristupam LDAP serveru"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Nisam mogao da se prijavim.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sUnesi lozinku za %s (korisnik %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -267,62 +486,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Adresa za direktorijum poslednje korišćen u prozorčetu za izbor imena"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Samodopunjavanje"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Kontakti"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Sertifikati"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Podesite ovde samodopunjavanje"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolucija adresar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Iskačući prozor za adrese Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Preglednik adresa Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Preglednik Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Deo Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Upravljanje S/MIME sertifikatima iz Evolucije"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Upravljanje podešavanjem direktorijuma iz Evolucije"
-
-# bug: s/manager/manage/
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-#, fuzzy
-msgid "Manage your S/MIME certificates here"
-msgstr "Ovde upravljajte vašim S/MIME sertifikatima"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -330,7 +493,7 @@ msgstr "Ovde upravljajte vašim S/MIME sertifikatima"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -339,8 +502,7 @@ msgstr "Ovde upravljajte vašim S/MIME sertifikatima"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -366,6 +528,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Identifikacija"
@@ -414,13 +577,11 @@ msgid "Anonymously"
 msgstr "Anonimno"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Osnovno"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalji"
 
@@ -681,33 +842,26 @@ msgstr "karte"
 
 # bug: plural-forms
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minuta"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Izaberite kontakte iz adresara"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Alat za odabir imena Evolucija adresara"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Ukloni sve"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Ukloni"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Ime"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Ukloni sve"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Pogledaj listu kontakt listu"
@@ -722,7 +876,7 @@ msgid "Send HTML Mail?"
 msgstr "Pošalji HTML poruku?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Dodaj u kontakte"
 
@@ -730,15 +884,22 @@ msgstr "Dodaj u kontakte"
 msgid "Unnamed Contact"
 msgstr "Neimenovani kontakt"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Ime"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Izvor"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Alat za odabir imena Evolucija adresara"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Izaberite kontakte iz adresara"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -760,6 +921,11 @@ msgstr "_Kategorija:"
 msgid "_Find"
 msgstr "_Nađi"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "Prona_đi"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -806,9 +972,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Radna nedelja</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
 
@@ -833,7 +998,6 @@ msgid "Birthday:"
 msgstr "Rođenda_n"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalendar:"
 
@@ -848,15 +1012,15 @@ msgid "Company:"
 msgstr "Naredba:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Urednik kontakata"
 
@@ -965,8 +1129,8 @@ msgstr "_Veb stranica:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -988,44 +1152,28 @@ msgid "_File under:"
 msgstr "Naziv datoteke:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "S_erver:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Jeste li sigurni da hoćete\n"
-"da obrišete ove kontakte?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Jeste li sigurni da hoćete\n"
-"da obrišete ovaj kontakt?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Adresa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Može se menjati"
 
@@ -1998,132 +2146,124 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL brza poruka"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "DŽaber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "Jahu"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Jahu glasnik"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-msgid "GroupWise"
-msgstr "Grupvajz"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Usluga"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Mesto"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Korisničko ime"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Kuća"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Drugo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Jahu"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "Grupvajz"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Izvorni adresar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Odredišni adresar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Je novi kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Polja za upis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Promenjen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Ovaj kontakt pripada ovim kategorijama"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Molim izaberite od sledećih opcija"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Datum povraćaja nije dobar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Neispravna svrha"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Odbaci"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL brza poruka"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Jahu glasnik"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Usluga"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Mesto"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Korisničko ime"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Brzo dodavanje kontakta"
@@ -2141,6 +2281,22 @@ msgstr "_Puno ime:"
 msgid "E-_mail:"
 msgstr "E-_pošta:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Jeste li sigurni da hoćete\n"
+"da obrišete ove kontakte?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Jeste li sigurni da hoćete\n"
+"da obrišete ovaj kontakt?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresa _2:"
@@ -2263,48 +2419,69 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Izaberite sadržaj iz adresara"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Članovi"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Ukloni odabrane predmete sa liste priloga"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Odabrano"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Sakrij adrese kada šalješ poštu na ovu listu"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "Ime _liste:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 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/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "urednik-kontakt-liste"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "prozorče1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Knjiga"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Da li je nova lista"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Obavezno prisustvo"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Urednik kontakt liste"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Sačuvaj listu kao VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Promenjen kontakt:"
@@ -2343,422 +2520,11 @@ msgstr ""
 "u ovom direktorijumu. Želite li svejedno da dodate?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr "(mapa)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr "mapa"
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "Ispiši članove"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "E-pošta"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organizacija"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-msgid "Position"
-msgstr "Položaj"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "Groupwise"
-msgstr "Grupvajz"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr "Video konferencije"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr "Faks"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "work"
-msgstr "posao"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr "Beb"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Blogče"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Mobilni telefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "personal"
-msgstr "lično"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Napomena"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Uloga na poslu"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-pošta"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Lična stranica"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Uspeh"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Arhiva nije na mreži"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Address Book does not exist"
-msgstr "Adresar ne postoji"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Nova kontakt lista"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Zabranjen pristup"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Kontakt nije pronađen"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "IB kontakta već postoji"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protokol nije podržan"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Poništeno"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Ne mogu da otvorim izvor"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Prijava neuspela"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Prijava obavezna"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS nije dostupan"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "Nema takve poruke"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Druga greška"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Nismo uspeli da otvorimo ovaj adresar. Proverite da putanja postoji i da "
-"imate prava pristupa."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Nismo uspeli da otvorimo ovaj adresar. To znači ili da ste uneli netačnu "
-"adresu, ili je LDAP server nedostupan."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-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 "
-"Evolution package."
-msgstr ""
-"Ova verzija Evolucije nema podršku za LDAP u sebi. Ukoliko želite da "
-"koristite LDAP u Evoluciji morate da izgradite program iz izvornog koda u "
-"SUV-u (CVS) pošto preuzmete OpenLDAP sa sledeće adrese."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Nismo uspeli da otvorimo ovaj adresar. To znači ili da ste uneli netačnu "
-"adresu ili je server nedostupan."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"Više karti odgovara upitu koji je ili server tako  \n"
-"podešen vratio ili Evolucija tako podešena da pokaže.\n"
-"Molim da preciznije formulišete upit ili povećate limit\n"
-"broja rezultata u podešavanjima adresara za server direktorijuma."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-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"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"Vreme za izvršavanje ovog upita je preko limita servera ili limita\n"
-"koji ste podesili za ovaj adresar. Molim da preciznije formulišete\n"
-"upit ili povećate vremenski limit u podešavanjima adresara\n"
-"za server direktorijuma."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "Osnovni proces ovog adresara nije mogao da obradi upit."
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "Osnovni proces ovog adresara je odbio da obradi ovaj upit."
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Ovaj upit nije uspešno završen."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Greška kod dodavanja liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Greška kod dodavanja kontakta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Greška kod izmene liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Greška pri izmeni kontakta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Greška kod uklanjanja liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Greška kod uklanjanja kontakta"
-
-# bug: plural-forms
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, c-format
-msgid ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr ""
-"Otvaranje %d kontakata će otvoriti i %d novih prozora.\n"
-"Da li stvarno želite da pogledate sve ove kontakte?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s već postoji\n"
-"Želite li da prepišete novim unosom?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Prepiši"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "karta.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Premesti kontakt u"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Umnoži kontakt u"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Premesti kontakte u"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Umnoži kontakte u"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "Izaberite odredišni adresar."
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Višestruke VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard za %s"
-
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: addressbook/gui/widgets/eab-popup-control.c:199
-msgid "(none)"
-msgstr "(prazno)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Osnovna E-pošta"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "E-pošta 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "E-pošta 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Odaberi akciju"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Unesi novi kontakt \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Dodaj adresu postojećim kontaktima \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Pretražujem adresar..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Promeni podatke o kontaktu"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Spoji elektronske adrese"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "i još %d kontakt."
-msgstr[1] "i još %d kontakta."
-msgstr[2] "i još %d kontakata."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Prikaži celu vizit kartu"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Prikaži sažetu vizit kartu"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Sačuvaj u adresaru"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Nema kontakta"
@@ -2773,9 +2539,9 @@ msgstr[2] "%d kontakata"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Upit"
 
@@ -2791,130 +2557,130 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Greška pri izmeni karte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Ime počinje sa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "E-pošta počinje sa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Polje koje sadrži"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Napredno..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Adresar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Sačuvaj kao VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Nov kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Nova lista kontakata..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Idi u direktorijum..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Uvezi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Tražim kontakte..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Izvori adresara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Podešavanja pilota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Prosledi kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Pošalji kontaktu poruku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Štampaj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Štampaj koverat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Umnoži u adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Prebaci u adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Iseci"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Umnoži"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Ubaci"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Trenutan pogled"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
@@ -2948,6 +2714,8 @@ msgid "Car Phone"
 msgstr "Telefon u kolima"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Categories"
 msgstr "Kategorije"
 
@@ -2955,6 +2723,21 @@ msgstr "Kategorije"
 msgid "Company Phone"
 msgstr "Telefon firme"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "E-pošta"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "E-pošta 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "E-pošta 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Prezime"
@@ -2991,14 +2774,29 @@ msgstr "Dnevnik"
 msgid "Manager"
 msgstr "Upravnik"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Mobilni telefon"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Nadimak"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Napomena"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kancelarija"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organizacija"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Drugi faks"
@@ -3050,29 +2848,21 @@ msgstr "Jedinica"
 msgid "Web Site"
 msgstr "Internet adresa"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Širina"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Visina"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Ima fokus"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Odabrano"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Ima kursor"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Polje"
@@ -3089,7 +2879,11 @@ msgstr "Model teksta"
 msgid "Max field name length"
 msgstr "Najveća dužina imena polja"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Širina kolone"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3103,7 +2897,7 @@ msgstr ""
 "\n"
 "Kliknite dva puta da napravite novi kontakt."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3113,13 +2907,392 @@ msgstr ""
 "\n"
 "Nema šta da se pokaže u ovom pogledu."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Širina kolone"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Odabrano"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Ima kursor"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr "(mapa)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr "mapa"
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Ispiši članove"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-pošta"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Položaj"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Video konferencije"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Telefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Faks"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "posao"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "Beb"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Blogče"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "lično"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Uloga na poslu"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Lična stranica"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Uspeh"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Arhiva nije na mreži"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "Adresar ne postoji"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Nova kontakt lista"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Zabranjen pristup"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Kontakt nije pronađen"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "IB kontakta već postoji"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protokol nije podržan"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Poništeno"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Ne mogu da otvorim izvor"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Prijava neuspela"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Prijava obavezna"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS nije dostupan"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "Nema takve poruke"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Druga greška"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Nismo uspeli da otvorimo ovaj adresar. Proverite da putanja postoji i da "
+"imate prava pristupa."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Nismo uspeli da otvorimo ovaj adresar. To znači ili da ste uneli netačnu "
+"adresu, ili je LDAP server nedostupan."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+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 "
+"Evolution package."
+msgstr ""
+"Ova verzija Evolucije nema podršku za LDAP u sebi. Ukoliko želite da "
+"koristite LDAP u Evoluciji morate da izgradite program iz izvornog koda u "
+"SUV-u (CVS) pošto preuzmete OpenLDAP sa sledeće adrese."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Nismo uspeli da otvorimo ovaj adresar. To znači ili da ste uneli netačnu "
+"adresu ili je server nedostupan."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"Više karti odgovara upitu koji je ili server tako  \n"
+"podešen vratio ili Evolucija tako podešena da pokaže.\n"
+"Molim da preciznije formulišete upit ili povećate limit\n"
+"broja rezultata u podešavanjima adresara za server direktorijuma."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+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"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"Vreme za izvršavanje ovog upita je preko limita servera ili limita\n"
+"koji ste podesili za ovaj adresar. Molim da preciznije formulišete\n"
+"upit ili povećate vremenski limit u podešavanjima adresara\n"
+"za server direktorijuma."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "Osnovni proces ovog adresara nije mogao da obradi upit."
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "Osnovni proces ovog adresara je odbio da obradi ovaj upit."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Ovaj upit nije uspešno završen."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Greška kod dodavanja liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Greška kod dodavanja kontakta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Greška kod izmene liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Greška pri izmeni kontakta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Greška kod uklanjanja liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Greška kod uklanjanja kontakta"
+
+# bug: plural-forms
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"Otvaranje %d kontakata će otvoriti i %d novih prozora.\n"
+"Da li stvarno želite da pogledate sve ove kontakte?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s već postoji\n"
+"Želite li da prepišete novim unosom?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Prepiši"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "karta.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Premesti kontakt u"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Umnoži kontakt u"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Premesti kontakte u"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Umnoži kontakte u"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Izaberite odredišni adresar."
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Višestruke VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard za %s"
+
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * contact.
+#.
+#: addressbook/gui/widgets/eab-popup-control.c:198
+msgid "(none)"
+msgstr "(prazno)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Osnovna E-pošta"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Odaberi akciju"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Unesi novi kontakt \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Dodaj adresu postojećim kontaktima \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "Pretražujem adresar..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Promeni podatke o kontaktu"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Spoji elektronske adrese"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "i još %d kontakt."
+msgstr[1] "i još %d kontakta."
+msgstr[2] "i još %d kontakata."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Prikaži celu vizit kartu"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Prikaži sažetu vizit kartu"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Sačuvaj u adresaru"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3163,6 +3336,11 @@ msgstr "Evolucija VCard uvoznik"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Štampaj kovertu"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Štampaj kontakte"
@@ -3172,11 +3350,6 @@ msgstr "Štampaj kontakte"
 msgid "Print contact"
 msgstr "Štampaj kontakt"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Štampaj kovertu"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 p. Tahoma"
@@ -3361,6 +3534,22 @@ msgstr "Proba štampe kontakta"
 msgid "This should test the contact print code"
 msgstr "Ovo isprobava kod za štampu kontakata"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Ne mogu da otvorim datoteku"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Nisam mogao da učitam adresar"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Ne mogu da otvorim adresar"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Navedite izlaznu datoteku umesto standardnog izlaza"
@@ -3419,22 +3608,6 @@ msgstr "U običnom režimu, ne sme se dati opcija za veličinu."
 msgid "Impossible internal error."
 msgstr "Nemoguća unutrašnja greška."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Ne mogu da otvorim datoteku"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Nisam mogao da učitam adresar"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Ne mogu da otvorim adresar"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Greška kod učitavanja predefinisanog adresara."
@@ -3451,39 +3624,362 @@ msgstr "Ime datoteke nije dato."
 msgid "Unnamed List"
 msgstr "Lista bez imena"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Ne briši"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Pošalji kome:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Sigurno želite da poništite i obrišete ovaj sastanak?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Sigurno želite da izbrišete %d zaduženje"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Sigurno želite da poništite i obrišete ovaj unos u dnevnik?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Sigurno želite da izbrišete %d unos u dnevnik?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Sigurno želite da obrišete ovaj zakazani sastanak `%s'?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Sigurno želite da izbrišete %d zakazani sastanak?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Sigurno želite da obrišete zaduženje `%s'?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Sigurno želite da izbrišete unos u dnevnik `%s'?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Sigurno želite da obrišete ovaj zakazani sastanak `%s'?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Sigurno želite da obrišete zaduženje `%s'?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Sigurno želite da izbrišete unos u dnevnik `%s'?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Zakazani sastanak"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Želite li da sačuvate promene?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s Uneli ste izmene. Da ih zaboravim i osvežim promenama urednik?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Zanemari promene"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Sačuvaj poruku..."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Pošalji"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Osnovni proces lokalnih datoteka Evolucije kalendara"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Unesite lozinku"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Podeli višednevne događaje:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Nisam mogao da pokrenem vombat server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Nisam mogao da pokrenem vombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisam mogao da pročitam programski blok Kalendara"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Predefinisan prioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisam mogao da pročitam pilotov ToDo programski blok"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalendar i zadaci"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Kalendari"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Podesite vašu vremensku zonu, kalendar i listu zadataka ovde "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolucija kalendar i zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Kontrola podešavanja Evolucija kalendara"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Preglednik zakazanih poruka Evolucija kalendara"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Urednik Evolucija kalendara/zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Deo Evolucije za kalendar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Deo Evolucije za zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendari"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Zaduženja"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Servis za alarm obaveštenja Evolucija kalendara"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Pokrećem:"
@@ -3583,10 +4079,6 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovo za ovaj program."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Servis za alarm obaveštenja Evolucija kalendara"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Nisam uspeo da pokrenem Bonobo"
@@ -3727,9 +4219,29 @@ msgstr "Da li da prikazujem vreme u 24č obliku umesto am/pm"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Da li da prikazuje brojeve nedelja u izbiraču datuma"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Sažetak sadrži"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Opis sadrži"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Komentar sadrži"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Putanja sadrži"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Neraspodeljeno"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3751,8 +4263,8 @@ msgid "Purge events older than"
 msgstr "Obriši događaje starije od"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "dana"
 
@@ -3763,7 +4275,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3812,62 +4324,52 @@ msgstr "Ne mogu da otvorim kalendar „%s“ radi pravljenja događaja i sastana
 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:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Kalendari"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Novi zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "Zakazani _sastanak"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Zakaži sastanak"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Sačini novi zahtev za sastanak"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Novi celodnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Celo_dnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Sačini novi celodnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "K_alendar"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Kalendar"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Napravi novi kalendar"
 
@@ -3897,26 +4399,6 @@ msgstr "Nedeljni pregled"
 msgid "Month View"
 msgstr "Mesečni pregled"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Sažetak sadrži"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Opis sadrži"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Komentar sadrži"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "Putanja sadrži"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Neraspodeljeno"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Greška kod otvaranja kalendara"
@@ -3934,225 +4416,134 @@ msgstr "Zabranjen pristup kalendaru"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Opcije za zvučni alarm"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Opcije za tekstualni alarm"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Opcije za alarm preko E-pošte"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Opcije za program alarma"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Nepoznate opcije za alarm"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Ponavljanje alarma"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Poruka za prikaz:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Poruka za slanje"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Pusti zvuk:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Ponovi alarm"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Pokreni program:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Pošalji kome:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Sa ovim argumentima:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "prozorče1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Zvuk alarma</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "pokaži još na svakih"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Opis</b>"
 
-# bug: plural-forms
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "sati"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Podsetnici</b>"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr "Dejstvo/pokreni"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Alarmi"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Dodaj"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Sastavi poruku"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Osnove"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Datum/Vreme:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Po_ruke"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Pusti zvuk"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Podsetnici"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Pokreni program"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Pošalji kome:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Pošalji elektronsku poruku"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Zaključak:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Nalog:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Opcije..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Pokreni program"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Ponovi alarm"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Pošalji"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "nakon"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "pre"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "dan(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "kraj zakazanog sastanka"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: 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:24
 msgid "hour(s)"
 msgstr "sat(a)"
 
 # bug: plural-forms
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "sati"
+
+# bug: plural-forms
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minut(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "početak zakazanog sastanka"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Morate navesti putanju sa koje da preuzmem kalendar"
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Putanja izvora „%s“ nije ispravnog oblika."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Putanja izvora „%s“e predstavlja vebkal izvor."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Izvor imena „%s“ već postoji u izabranoj grupi"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"Grupa „%s“ je udaljena. Morate navesti putanju sa koje da preuzmem kalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Dodaj novi kalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Grupa spiska zaduženja"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "Boje"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Izaberite boju"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Dodaj novi kalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Dodaj grupu..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Osveži"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Tip:"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Dejstvo/pokreni"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_Adresa:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Dodaj"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "nedelje"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Alarmi"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4267,7 +4658,7 @@ msgid "Free/Busy Publishing"
 msgstr "_Objava stanja slobodan/zauzet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Petak"
@@ -4281,7 +4672,7 @@ msgid "Minutes"
 msgstr "Minuti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Ponedeljak"
@@ -4291,7 +4682,7 @@ msgid "S_un"
 msgstr "N_ed"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Subota"
@@ -4305,7 +4696,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Pokaži _brojeve nedelja u navigatoru za datume"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Nedelja"
@@ -4319,7 +4710,7 @@ msgid "T_hu"
 msgstr "U_to"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Četvrtak"
@@ -4333,7 +4724,7 @@ msgid "Time format:"
 msgstr "Format za vreme:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Utorak"
@@ -4343,7 +4734,7 @@ msgid "W_eek starts:"
 msgstr "Početak n_edelje:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Sreda"
@@ -4376,7 +4767,8 @@ msgstr "_Skupi nedelje u mesečni prikaz"
 msgid "_Day begins:"
 msgstr "Početak _dana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4426,6 +4818,80 @@ msgstr "_Sre"
 msgid "before every appointment"
 msgstr "pre svakog zakazanog sastanka"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "Morate navesti putanju sa koje da preuzmem kalendar"
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Putanja izvora „%s“ nije ispravnog oblika."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Putanja izvora „%s“e predstavlja vebkal izvor."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Izvor imena „%s“ već postoji u izabranoj grupi"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"Grupa „%s“ je udaljena. Morate navesti putanju sa koje da preuzmem kalendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Dodaj novi kalendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Grupa spiska zaduženja"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "Boje"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Izaberite boju"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Dodaj novi kalendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Dodaj grupu..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Osveži"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Tip:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_Adresa:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "nedelje"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Ovaj događaj je obrisan."
@@ -4470,81 +4936,75 @@ msgstr "%s Uneli ste izmene. Da ih zaboravim i osvežim promenama urednik?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Niste uneli izmene, da osvežim promenama urednik?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Greška pri proveri: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " za "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Završeno "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Završeno "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Do "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Nisam mogao da osvežim promenama objekat"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Izmeni zakazani sastanak"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zakazani sastanak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Zaduženje - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Unos u dnevnik - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Nema sažetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Sačuvaj kao..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Izmene učinjene na ovom predmetu mogu biti zanemarene ako bude osvežen "
 "promenama"
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Ne mogu da koristim tekuću verziju!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Greška pri proveri: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " za "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Završeno "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Završeno "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Do "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Do "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Ne mogu da otvorim izvor"
@@ -4606,8 +5066,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Unos nije mogao biti obrisan usled greške"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Adresar..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Kontakti"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4617,160 +5078,224 @@ msgstr "Delegiraj za:"
 msgid "Enter Delegate"
 msgstr "Unesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Zakazani sastanak"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Podsetnik"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 msgid "Recurrence"
 msgstr "Povraćaj"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "Zakazivanje"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Informacija"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "Događaj bez početnog datuma"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "Događaj bez krajnjeg datuma"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Početni datum je pogrešan"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Krajnji datum je pogrešan"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Početno vreme je pogrešno"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Krajnje vreme je pogrešno"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Ne mogu da otvorim kalendar „%s“."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "pre svakog zakazanog sastanka"
+msgstr[1] "pre svakog zakazanog sastanka"
+msgstr[2] "pre svakog zakazanog sastanka"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "kraj zakazanog sastanka"
+msgstr[1] "kraj zakazanog sastanka"
+msgstr[2] "kraj zakazanog sastanka"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "pre svakog zakazanog sastanka"
+msgstr[1] "pre svakog zakazanog sastanka"
+msgstr[2] "pre svakog zakazanog sastanka"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "C_elodnevni događaj"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "pre svakog zakazanog sastanka"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "Z_uzet"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "pre svakog zakazanog sastanka"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ka_tegorije..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "pre svakog zakazanog sastanka"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Spisak zaduženja</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Klasifikacija"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Datum i vreme</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Po_verljivo"
+msgid "A_ll day event"
+msgstr "C_elodnevni događaj"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Datum i vreme"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Sačuvaj podešeni pregled..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Slobodno"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ka_tegorije..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "_Mesto:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Kalendar:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Lič_no"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Klasifikacija"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Ja_vno"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Poverljivo"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Prikaži vreme kao"
+msgid "L_ocation:"
+msgstr "_Mesto:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Lično"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Javno"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Prikaži vreme kao"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Saž_etak:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Alarmi"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Opis:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Krajnje vreme:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Početno vreme:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Ništa"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "Izabrani organizator više nema nalog."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Zahteva organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Najmanje jedan prisutni je potreban."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Delegiraj za..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Obriši"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Ukloni"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4809,35 +5334,45 @@ msgid "Member"
 msgstr "Član"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stanje"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Dodaj prisu_tnog"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Uzbune</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Dodaj pošiljaoca u adresa_r"
+msgid "<b>Organizer</b>"
+msgstr "<b>Onda</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Promeni organizatora"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizator:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Kontakti"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Promeni organizatora"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organizator:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4905,149 +5440,143 @@ msgstr "Ova i buduća pojava"
 msgid "All Instances"
 msgstr "Sve pojave"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Ovaj zakazani sastanak sadrži povratne podatke koje Evolucija ne može "
 "izmeniti."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Datum povraćaja nije dobar"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "prvoj"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "drugoj"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "trećoj"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "četvrtoj"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "poslednjoj"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Drugi datum"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "dan"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "pojave"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Datum/vreme"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
+msgstr "<b>Opis</b>"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Prikaz</b>"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Povraćaj"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Svaki"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
-msgstr "Izuzeci"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Izgled"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Pravilo za ponavljanje"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Posebno ponavljanje"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Izmeni"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Bez ponavljanja"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Ukloni"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Jednostavno ponavljanje"
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Izmeni sastanak"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "za"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "uvek"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "mesec(i)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "do"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "nedelja(e)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "godina(e)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Izaberite odredište %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Odredišni direktorijum:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Spisak zaduženja"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Datum završetka je pogrešan"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">Fontovi poruke</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _gotovo"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Upozorenja</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:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Gotovo"
 
@@ -5059,8 +5588,8 @@ msgstr "Visok"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "U toku"
@@ -5072,22 +5601,22 @@ msgid "Low"
 msgstr "Nizak"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Običan"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Nije pokrenut"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Napredak"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Procenat završenog: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5110,36 +5639,42 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Veb stranica:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Zaduženje"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Zadatak"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Datum za završetak je pogrešan"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ne mogu da otvorim zaduženja u „%s“."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Pov_erljivo"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Opcije</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Brisanje pošte</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Opis:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Direktorijum:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "Datum p_očetka:"
@@ -5148,52 +5683,58 @@ msgstr "Datum p_očetka:"
 msgid "_Due date:"
 msgstr "Datum _roka:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Lična identifikacija za HTTP server."
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Grupa:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Izabrani kalendari za objavljivanje"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Opcije kalendara</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Svakodnevno"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Učestalost objavljivanja"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Uređivanje stanja slobodan/zauzet"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Putanja objavljivanja stanja slobodan/zauzet"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Putanja objavljivanja stanja slobodan/zauzet"
+msgid "Free/Busy Editor"
+msgstr "Uređivanje stanja slobodan/zauzet"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Prijavno ime:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Svakodnevno"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Lozinka:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Pošta:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Učestalost objavljivanja"
+#, fuzzy
+msgid "_Password:"
+msgstr "Lozinka:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Zapamti lozinku"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "Adresa (URL):"
+#, fuzzy
+msgid "_Username:"
+msgstr "Korisničko_ime"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "Korisnik objavljuje"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Nedeljno"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5280,7 +5821,7 @@ msgstr "%s na %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretača"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknite da otvorite %s"
@@ -5289,6 +5830,11 @@ msgstr "Kliknite da otvorite %s"
 msgid "Untitled"
 msgstr "Bez imena"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Zaključak:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5300,7 +5846,7 @@ msgstr "Datum završetka:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Stanje:"
 
@@ -5313,20 +5859,93 @@ msgstr "Važnost:"
 msgid "Web Page:"
 msgstr "_Veb stranica:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Javno"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Krajnji datum"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Lično"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Početni datum"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Poverljivo"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Izveštaj"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Slobodan"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Zauzet"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "J"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "I"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "Z"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Geografsko mesto mora biti uneto u obliku: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Da"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Ne"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
+#: camel/camel-gpg-context.c:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Nepoznato"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Povratno"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Dodeljeno"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5372,95 +5991,101 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Slobodan"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Zauzet"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Brišem izabrane objekte"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Unosim promene u objekte"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Otvori"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "Otvori _veb stranicu"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Sačuvaj kao..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "Štam_paj..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Iseci"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Umet_ni"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Dodeli zaduženje"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "_Prosledi kao iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Obeleži kao završeno"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Obeleži izabrana zaduženja kao završena"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Obriši"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Obriši izabrana zaduženja"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Sačuvaj kao..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Pritisni za novo zaduženje"
 
@@ -5469,176 +6094,107 @@ msgstr "Pritisni za novo zaduženje"
 msgid "% Complete"
 msgstr "% Gotovo"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Završeno"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Datum završetka"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Datum roka"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Početni datum"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Izveštaj"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Razvrstana zaduženja"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Pomeram poruke"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Kopiram poruke"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Nov zakazan _sastanak..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _događaj"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Novo zaduženje"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Izaberi _nit"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Izaberi..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi slobodan/zauzet informaciju"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 msgid "Cop_y to Calendar..."
 msgstr "Kop_iraj u kalendar..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 msgid "Mo_ve to Calendar..."
 msgstr "Prene_si u kalendar..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Prosledi kao iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Idi na _danas"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Idi na datum..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Podešavanja..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Krajnji datum"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Početni datum"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Povratno"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Dodeljeno"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Da"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ne"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "J"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "I"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "Z"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Geografsko mesto mora biti uneto u obliku: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5662,36 +6218,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutni razmaci"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutni razmaci"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5767,37 +6323,35 @@ msgid ", ending on "
 msgstr ", završavajući se "
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Početak:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Kraj:</b> "
+#, fuzzy
+msgid "Starts"
+msgstr "Stanje"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Završetak:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Do:</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Do "
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "iCalendar informacija"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "iCalendar greška"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5805,305 +6359,285 @@ msgstr ""
 "<br> Molim proverite sledeću informaciju, i potom odaberite akciju iz donjeg "
 "menija."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Ništa</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Mesto:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Prihvaćeno"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Odbijeno"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Izaberi akciju:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Ažuriraj"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Prihvati"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Prihvati sa rezervom"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Odbij"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Pošalji slobodan/zauzet informaciju"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Ažuriraj stanje stranke"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Pošalji najnoviju informaciju"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Odustani"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> je objavio informaciju o sastanku."
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Informacija o sastanku"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> traži prisustvo %s na sastanku."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> traži Vaše prisustvo na sastanku."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Predlog za sastanak"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> želi da doda postojećem sastanku"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Promena sastanka"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> želi da dobije najnoviju informaciju o sastanku."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Zahtev za novim podacima o sastanku"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> je odgovorio na zahtev o sastanku."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je otkazo sastanak."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Otkazivanje sastanka"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> je poslao nerazumljivu poruku."
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Loša poruka o sastanku"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> je objavio informaciju o zaduženju."
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Informacija o zaduženju"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> traži %s za obavljanje zaduženja."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> traži da Vi izvršite zaduženje."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Predlog za zaduženje"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b želi da doda na postojeće zaduženje."
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Ažuriranje zaduženja"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> želi da primi najnoviju informaciju o zaduženju."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Zahtev za promenama zaduženja"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> je odgovorio na dodeljeno zaduženje."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Odgovor na zaduženje"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je otkazao zaduženje."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Otkazivanje zaduženja"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Loša poruka o zaduženju"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> je objavio slobodan/zauzet informaciju."
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Slobodan/zauzet informacija"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> traži Vašu slobodan/zauzet informaciju."
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Slobodan/zauzet zahtev"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> je odgovorio na slobodan/zauzet zahtev."
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Slobodan/zauzet odgovor"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Loša slobodan/zauzet poruka"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "Poruka izgleda da nije ispravno sačinjena"
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Poruka sadrži samo nepodržane zahteve."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Prilog ne sadrži ispravnu poruku za kalendar"
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "Prilog nema delove kalendara koji se mogu pregledati"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Ažuriranje završeno\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Stanje prisutnog ne može biti ažurirano jer unos više ne postoji"
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekat je neispravan i ne može biti ažuriran\n"
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Ovaj odgovor nije poslao trenutno prisutan. Da ga dodam u prisutne?"
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Stanje prisutnog nije moglo biti ažurirano zbog neispravnog stanja!\n"
 
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr "Nastala je greška u CORBA sistemu\n"
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr "Objekat nije mogao biti pronađen\n"
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "Nemate prave dozvole za ažuriranje kalendara\n"
-
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Ažurirano stanje prisutnog\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Stanje prisutnog nije moglo biti ažurirano!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "Stanje prisutnog ne može biti ažurirano jer unos više ne postoji"
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Uklanjanje završeno"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Unos poslat!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Unos nije mogao biti poslat!\n"
 
@@ -6132,6 +6666,10 @@ msgstr "Učitavam kalendar"
 msgid "Loading calendar..."
 msgstr "Učitavam kalendar..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizator:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Poruka servera:"
@@ -6148,11 +6686,6 @@ msgstr "početni-datum"
 msgid "Chair Persons"
 msgstr "Predsedništvo"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Obavezno prisustvo"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Slobodno prisustvo"
@@ -6220,6 +6753,28 @@ msgstr "Delegirano"
 msgid "In Process"
 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:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %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:456
+#: calendar/gui/e-meeting-time-sel.c:2086 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a %m/%d/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Van kancelarije"
@@ -6228,98 +6783,64 @@ msgstr "Van kancelarije"
 msgid "No Information"
 msgstr "Bez informacije"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Dodaj pošiljaoca u adresa_r"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Opcije"
+msgid "O_ptions"
+msgstr "Opcije"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Pokaži _samo radne sate"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Pokaži _umanjeno"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "Ažuriraj slobodan/zauzet"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Sam bira"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Sve osobe i svi izvori"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Sve osobe i jedan izvor"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "_Obavezne osobe"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Obavezne osobe i _jedan izvor"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "_Početno vreme sastanka:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "_Krajnje vreme sastanka:"
-
-#. 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.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %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.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a %m/%d/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Unesite lozinku za „%s“"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6328,116 +6849,51 @@ msgstr ""
 "Greška na %s:\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "Učitavam zaduženja"
+
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otvaram zaduženja u %s"
 
-#: calendar/gui/e-tasks.c:824
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Greška pri otvaranju %s:\n"
-"%s"
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
-msgstr "Učitavam zaduženja"
-
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Ispunjavam zaduženja..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Brišem izabrane objekte..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Izbacujem"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Zaduženja"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Unosim promene u objekte"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Učitavam zakazane sastanke sa %s"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Učitavam zaduženja sa %s"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaram %s"
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr "Briše"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Kalendar i zadaci"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Podesite vašu vremensku zonu, kalendar i listu zadataka ovde "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolucija kalendar i zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Kontrola podešavanja Evolucija kalendara"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Preglednik zakazanih poruka Evolucija kalendara"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Urednik Evolucija kalendara/zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Deo Evolucije za kalendar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Deo Evolucije za zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Kalendari"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Zaduženja"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6785,10 +7241,6 @@ msgstr "Izabran mesec (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Izabrana godina (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Zaduženje"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6819,7 +7271,7 @@ msgid "Contacts: "
 msgstr "Konatkti: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Štampaj prikaz"
 
@@ -6848,7 +7300,7 @@ msgstr[0] "%d karata"
 msgstr[1] "%d karata"
 msgstr[2] "%d karata"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6872,35 +7324,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr "Nijedan kalendar nije dostupan za dodavanje zaduženja"
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Novo zaduženje"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Zaduženje"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Unesi novo zaduženje"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Diskusione grupe"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Grupa spiska zaduženja"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Unesi novo zaduženje"
@@ -8578,69 +9024,69 @@ msgstr "Pripremam direktorijum '%s' za rad bez mreže"
 msgid "You must be working online to complete this operation"
 msgstr "Morate da budete na mreži da bi završili ovu operaciju"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Neuspelo pravljenje veze ka '%s': %s"
 
-#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 camel/camel-filter-search.c:549
 #: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Neuspelo pravljenje sadržanog procesa '%s': %s"
 
-#: camel/camel-filter-driver.c:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Neispravan niz poruka primljen od %s: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Sinhronizujem direktorijume"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Greška kod čitanja filtera: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Greška kod primene filtera: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Nisam mogao da otvorim direktorijum za smeštanje reda"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Nisam mogao da prođem kroz direktorijum sa redom"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Primam poruku %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Ne mogu da otvorim poruku"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Greška kod poruke %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Sinhronizujem direktorijum"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primam poruku %d od %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Greška kod poruke %d od %d"
@@ -8662,42 +9108,6 @@ msgstr "Neipsravni argumenti za (korisnička-oznaka)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Greška kod primene filtera za pretragu: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nepodržana operacija: priključena poruka: za %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Nepodržana operacija: pretraga po izrazu: za %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Nepodržana operacija: pretraga po uid-u: za %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Pomeram poruke"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Kopiram poruke"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Izmena stanja đubreta"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Filtriram nove poruke"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8743,7 +9153,43 @@ msgstr "(odgovara-sve) zahteva samo jedan logički rezultat"
 msgid "Performing query on unknown header: %s"
 msgstr "Izvršavam pretragu na nepoznato zaglavlje: %s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Nepodržana operacija: priključena poruka: za %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Nepodržana operacija: pretraga po izrazu: za %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Nepodržana operacija: pretraga po uid-u: za %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Pomeram poruke"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Kopiram poruke"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Izmena stanja đubreta"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Filtriram nove poruke"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8754,15 +9200,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "Nisam mogao da pročitam gpg userid podsetnik."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nisam mogao da pročitam zahtev za gpg lozinkom"
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8771,28 +9217,28 @@ msgstr ""
 "Potrebna vam je lozinka za otključavanje ključa\n"
 "korisnika: \"%s\""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Poništeno."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Nisam mogao da otključam tajni ključ: date su 3 pogrešne lozinke."
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočekivan odgovor od GnuPG: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nisam mogao da šifriram: nisu označeni ispravni primaoci. "
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8803,62 +9249,83 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nisam mogao da primenim GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Nisam mogao da obrazujem podatke za potpisivanje: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nisam mogao da izvršim gpg: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Nisam mogao da izvršim gpg."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Ovo je deo poruke sa digitalnim potpisom"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ne mogu da proverim potpis poruke: neispravan oblik poruke"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Ne mogu da proverim potpis poruke: nisam mogao da napravim temp datoteku: %s"
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nisam mogao da obrazujem podatke za šifrovanje: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "Ovo je digitalno šifrovan deo poruke"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Šifrovan sadržaj"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "Ne mogu da raščlanim sadržaj poruke"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Ne mogu da napravim vezu ka pomoćniku zaključavanja: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Ne mogu da podelim pomoćnika zaključavanja: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+"Nisam mogao da zaključam '%s': greška u protokolu sa pomoćnikom zaključavanja"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Nisam mogao da zaključam '%s"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8881,27 +9348,6 @@ msgstr "Nisam mogao da zaključam koristeći fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nisam mogao da zaključam koristeći flock(2): %s "
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Ne mogu da napravim vezu ka pomoćniku zaključavanja: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Ne mogu da podelim pomoćnika zaključavanja: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr ""
-"Nisam mogao da zaključam '%s': greška u protokolu sa pomoćnikom zaključavanja"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Nisam mogao da zaključam '%s"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9152,7 +9598,7 @@ msgstr "Važenje traženih uverenja je isteklo."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Loš odgovor na prijavu od servera."
 
@@ -9235,55 +9681,55 @@ msgstr "POP pre SMTP auth korišćenjem izvora koji nije pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Neuspela kompilacija regularnog izraza: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s traži deo sa korisničkim imenom'"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s traži deo sa imenom domaćina"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s traži deo sa putanjom"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Nalazim: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Greška kod pretrage za imenom: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Neuspelo nalaženje domaćina: ne može da obrazuje nit: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Neuspelo nalaženje domaćina: %s: domaćin nije pronađen"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Neuspelo nalaženje domaćina: %s: nepoznat razlog"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Nalazim adresu"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Neuspelo nalaženje domaćina: domaćin nije pronađen"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Neuspelo nalaženje domaćina: nepoznat razlog"
 
@@ -9359,7 +9805,7 @@ msgstr "Sertifikat za ši_frovanje:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Nisam mogao da napravim S/MIME kontekst za dešifriranje."
@@ -9450,7 +9896,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Ispravan potpis"
 
 #: camel/camel-smime-context.c:651
@@ -9465,49 +9911,48 @@ msgstr "Neuspela DATA komanda"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Nisam mogao da nađem sertifikat za \"%s\"."
 
 #: camel/camel-smime-context.c:811
 #, fuzzy
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Nisam mogao da nađem opšti bulk algoritam."
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Na_pravi pravilo od poruke"
+msgid "Cannot create CMS Message"
+msgstr "Ne mogu da otvorim poruku"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Ne mogu da otvorim poruku"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Ne mogu da priložim datoteku %s: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Ne mogu da priložim datoteku %s: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Ne mogu da otvorim poruku"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Nisam mogao da napravim S/MIME kontekst za dešifriranje."
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9554,7 +9999,8 @@ msgstr "Ne mogu da napravim direktorijum „%s“: direktorijum postoji"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne mogu da obrišem direktorijum: %s: neispravna operacija"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne mogu da promenim ime  direktorijumu: %s: neispravna operacija"
@@ -9563,8 +10009,8 @@ msgstr "Ne mogu da promenim ime  direktorijumu: %s: neispravna operacija"
 msgid "Trash"
 msgstr "Smeće"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Đubre"
 
@@ -9684,7 +10130,7 @@ msgstr "Upotreba ključa ne podržava potpis sertifikatom"
 msgid "Error in application verification"
 msgstr "Greška kod provere programa"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9697,11 +10143,11 @@ msgstr ""
 "Oznaka:       %s\n"
 "Potpis:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "DOBAR"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "LOŠ"
 
@@ -9725,7 +10171,7 @@ msgstr ""
 "Želite li svejedno da prihvatite?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9740,7 +10186,7 @@ msgstr ""
 "\n"
 "Želite li da prihvatite?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9749,7 +10195,7 @@ msgstr ""
 "Problem sa sertifikatom: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9758,7 +10204,7 @@ msgstr ""
 "Loš domen sertifikata: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9767,7 +10213,7 @@ msgstr ""
 "Istekao sertifikat: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9776,7 +10222,7 @@ msgstr ""
 "Istekla lista priznatih sertifikata: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nisam mogao da obradim URL `%s"
@@ -9800,7 +10246,7 @@ msgstr "Ne mogu da kopiram ili premestim poruke u virtuelni direktorijum"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne mogu da obrišem direktorijum: %s: nema takvog direktorijuma"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne mogu da promenim ime  direktorijumu: %s: nema takvog direktorijuma"
@@ -9819,8 +10265,8 @@ msgid "Checking for new mail"
 msgstr "Proveravam za nove poruke"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Proveri za nove poruke u svim direktorijumima"
 
@@ -9850,8 +10296,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Za pristup Novel Grupvajz serverima"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9870,319 +10316,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Popis"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Neočekivan odgovor od IMAP servera %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Ne mogu da izaberem direktorijum „%s“: neispravno ime sandučeta"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Veza sa IMAP serverom %s je neočekivano prekinuta: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr "Primih odgovor BYE"
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Ne mogu da preuzmem direktorijum „%s“: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Ne mogu da preuzmem direktorijum „%s“: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Ne mogu da obrišem direktorijum „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Ne mogu dodati poruku u mh direktorijum: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Ne mogu da obrišem direktorijum „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Direktorijumi"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Pokaži samo odabrane direktorijume"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Premosti format imena direktorijuma koje daje server"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Format imena"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Za čitanje i smeštanje pošte na IMAP servere."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Ova opcija će povezati na IMAP server korišćenjem lozinke u običnom tekstu."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP servis za %s na %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/smtp/camel-smtp-transport.c:285
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Nisam mogao da se povežem na %s (port %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL nije dostupan"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Povezivanje poništeno"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Nisam mogao da se povežem na IMAP server %s u bezbednom režimu: server ne "
-"podržava STARTTLS"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Nisam mogao da se povežem na IMAP server %s u sigurnosnom modu: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Nepoznata greška"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Nisam mogao da se prijavim na IMAP server %s pomoću mehanizma prijave „%s“"
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sUnesite IMAP lozinku korisnika „%s“ na računaru %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Nisam mogao da se prijavim na IMAP server %s pomoću %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Ne mogu da preuzmem direktorijum „%s“: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Ime direktorijuma \"%s\" nije ispravno jer sadrži karakter \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Ne mogu da napravim direktorijum „%s“: neispravno ime sandučeta"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Ne mogu da napravim direktorijum „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Ne mogu da obrišem direktorijum „%s“: naročiti direktorijum"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Ne mogu da obrišem direktorijum „%s“: neispravno ime sandučeta"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Ne mogu da obrišem direktorijum „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, fuzzy, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr "Nisam mogao da se prijavim na IMAP server %s pomoću %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Naredba:"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr ""
-"Ne mogu da se pretplatim na direktorijum „%s“: neispravno ime sandučeta"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Ne mogu da se pretplatim na direktorijum „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Ne mogu da se odjavim sa direktorijuma „%s“: neispravno ime sandučeta"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Ne mogu da se odjavim sa direktorijuma „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Neočekivani element u odgovoru IMAP servera %s: "
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-msgid "No data"
-msgstr "Nema podataka"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Veza sa IMAP serverom %s je neočekivano prekinuta: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operacija obustavljena"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Veza sa serverom je neočekivano isključena: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Nepoznata greška"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10251,7 +10406,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10323,6 +10478,27 @@ msgstr "Koristi proizvoljnu naredbu za povezivanje sa serverom"
 msgid "Command:"
 msgstr "Naredba:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Direktorijumi"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Pokaži samo odabrane direktorijume"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Premosti format imena direktorijuma koje daje server"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Format imena"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Primeni filtere na nove poruke u INBOX-u ovog servera"
@@ -10343,43 +10519,92 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za čitanje i smeštanje pošte na IMAP servere."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP server %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP servis za %s na %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:285
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Nisam mogao da se povežem na %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL nije dostupan"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Povezivanje poništeno"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Nisam mogao da se povežem na IMAP server %s u sigurnosnom modu: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS ekstenzija nije podržana."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL pregovori nisu uspeli"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nisam mogao da se povežem pomoću naredbe %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s ne podržava traženi tip prijave  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nema podrške za tip prijave  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sMolim unesite IMAP lozinku za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Niste uneli lozinku."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10390,30 +10615,278 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Nema takvog direktorijuma %s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Ime direktorijuma \"%s\" nije ispravno jer sadrži karakter \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Glavni direktorijum ne može sadržati direktorijume u sebi"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Ne mogu da napravim direktorijum „%s“: direktorijum postoji."
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nepoznati glavni direktorijum: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Nisam mogao da se prijavim na POP server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Neočekivan odgovor od IMAP servera %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Neočekivan odgovor od IMAP servera: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Ne mogu da izaberem direktorijum „%s“: neispravno ime sandučeta"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Veza sa IMAP serverom %s je neočekivano prekinuta: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "Primih odgovor BYE"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Ne mogu da preuzmem direktorijum „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Ne mogu da preuzmem direktorijum „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Ne mogu da obrišem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Ne mogu dodati poruku u mh direktorijum: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Ne mogu da obrišem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Za čitanje i smeštanje pošte na IMAP servere."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Ova opcija će povezati na IMAP server korišćenjem lozinke u običnom tekstu."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Nisam mogao da se povežem na IMAP server %s u bezbednom režimu: server ne "
+"podržava STARTTLS"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Nisam mogao da se prijavim na IMAP server %s pomoću mehanizma prijave „%s“"
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sUnesite IMAP lozinku korisnika „%s“ na računaru %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Nisam mogao da se prijavim na IMAP server %s pomoću %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Ne mogu da preuzmem direktorijum „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Ne mogu da napravim direktorijum „%s“: neispravno ime sandučeta"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Ne mogu da napravim direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Ne mogu da obrišem direktorijum „%s“: naročiti direktorijum"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Ne mogu da obrišem direktorijum „%s“: neispravno ime sandučeta"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Ne mogu da obrišem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Ne mogu da obrišem direktorijum „%s“: naročiti direktorijum"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Ne mogu da napravim direktorijum „%s“: neispravno ime sandučeta"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Ne mogu da napravim direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, fuzzy, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr "Nisam mogao da se prijavim na IMAP server %s pomoću %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Naredba:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr ""
+"Ne mogu da se pretplatim na direktorijum „%s“: neispravno ime sandučeta"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Ne mogu da se pretplatim na direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Ne mogu da se odjavim sa direktorijuma „%s“: neispravno ime sandučeta"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Ne mogu da se odjavim sa direktorijuma „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Neočekivani element u odgovoru IMAP servera %s: "
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "Nema podataka"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Veza sa IMAP serverom %s je neočekivano prekinuta: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10585,18 +11058,26 @@ msgstr "Nisam mogao da sačuvam sažetak: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ne mogu da dodam poruku u sažetak: nepoznat razlog"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Sanduče"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Prododata Maildir poruka ponišetna"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ne mogu da dodam poruku u maildir direktorijum: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10612,48 +11093,48 @@ msgstr ""
 "Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Neispravan sadržaj poruke"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Ne mogu da preuzmem direktorijum „%s“: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Ne mogu da preuzmem direktorijum „%s“: direktorijum ne postoji."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Ne mogu da napravim direktorijum „%s“: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Ne mogu da preuzmem direktorijum „%s“: direktorijum nije maildir."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nisam mogao da obrišem direktorijum `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "nije maildir direktorijum"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11247,20 +11728,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Nisam mogao da se povežem na POP server %s (port %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Nisam mogao da se prijavim na POP server %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Nisam mogao da se povežem na POP server %s u sigurnosnom modu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Nisam mogao da se povežem na POP server %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11269,28 +11755,28 @@ msgstr ""
 "Nisam mogao da se povežem na POP server %s: Traženi mehanizam prijave nije "
 "podržan."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' prijava neuspela na POP server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Ne mogu da se prijavim na POP server %s: greška kod SASL protokola"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Nisam mogao da se prijavim na POP server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sUnesite lozinku za korisnika „%s“ na računaru %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11299,7 +11785,16 @@ msgstr ""
 "Nisam mogao da se povežem na POP server %s.\n"
 "Greška kod slanja lozinke: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Nisam mogao da se povežem na POP server %s.\n"
+"Greška kod slanja lozinke: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nema takvog direktorijuma `%s'."
@@ -11511,93 +12006,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP dostava pošte preko %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 msgid "Cannot send message: service not connected."
 msgstr "Ne mogu da pošaljem poruku: usluga nije povezana."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "Ne mogu da pošaljem poruku: adresa pošiljaoca nije ispravna."
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Slanje pripremljenih poruka"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne mogu da pošaljem poruku: nisu određeni primaoci."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ne mogu da pošaljem poruku: jedan ili više neispravnih primalaca"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "SMTP pozdrav"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "Neuspela HELO komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr "Neuspela HELO komanda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP prijava"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Greška kod prevljenja objekta SASL prijave."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "Neuspela AUTH komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr "Neuspela AUTH komanda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Loš odgovor na prijavu od servera.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Neuspela MAIL FROM komanda: %s: poruka nije poslata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr "Neuspela MAIL FROM komanda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Neuspela RCPT TO komanda: %s: poruka nije poslata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> neuspelo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Neuspela DATA komanda: %s: poruka nije poslata"
@@ -11605,26 +12100,26 @@ msgstr "Neuspela DATA komanda: %s: poruka nije poslata"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr "Neuspela DATA komanda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "Neuspela RSET komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr "Neuspela RSET komanda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "Neuspela QUIT komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr "Neuspela QUIT komanda"
 
@@ -11687,106 +12182,6 @@ msgstr "MIME tip:"
 msgid "Suggest automatic display of attachment"
 msgstr "Predloži automatsko otvaranje priloga"
 
-# bug: set for from account? probably 'for "from" account'
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Ne mogu da potpišem odlazeću poruku: nije postavljen sertifikat za "
-"potpisivanje na ovom nalogu"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Ne mogu da šifrujem odlazeću poruku: nije postavljen sertifikat za "
-"šifrovanje na ovom nalogu"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Ne mogu da otvorim datoteku"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Ne mogu da povratim poruku iz urednika"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Neimenovana poruka"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Otvori datoteku"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Autogenerisan"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Potpis:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> datoteka prikačena"
-msgstr[1] "<b>%d</b> datoteke prikačene"
-msgstr[2] "<b>%d</b> datoteka prikačeno"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Sakrij _traku priloga (ovde prevucite priloge)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Prikaži _traku priloga (ovde prevucite priloge)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Sastavi poruku"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"Nisam mogao da napravim prozor za sastavljanje:\n"
-"Ne mogu da pokrenem kontrolu biranja adresa."
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Nisam mogao da napravim prozor za sastavljanje:\n"
-"Ne mogu da aktiviram komponentu HTML urednika.\n"
-"Molim proverite da imate odgovarajuće verzije\n"
-"gtkhtml i libgtkhtml na sistemu.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Nisam mogao da napravim prozor za sastavljanje:\n"
-"Ne mogu da aktiviram komponentu HTML urednika."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Urednik sadrži u tekstu poruke ne sadrži tekst, i ne može biti menjan.)"
-"<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Odredište"
@@ -11867,17 +12262,98 @@ msgstr "Pritisnite ovde da izaberete direktorijume u koje šaljete"
 msgid "Attach file(s)"
 msgstr "Priloži datoteke"
 
+# bug: set for from account? probably 'for "from" account'
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Ne mogu da potpišem odlazeću poruku: nije postavljen sertifikat za "
+"potpisivanje na ovom nalogu"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Ne mogu da šifrujem odlazeću poruku: nije postavljen sertifikat za "
+"šifrovanje na ovom nalogu"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Ne mogu da otvorim datoteku"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Ne mogu da povratim poruku iz urednika"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Neimenovana poruka"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Otvori datoteku"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Autogenerisan"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Potpis:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> datoteka prikačena"
+msgstr[1] "<b>%d</b> datoteke prikačene"
+msgstr[2] "<b>%d</b> datoteka prikačeno"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Sakrij _traku priloga (ovde prevucite priloge)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Prikaži _traku priloga (ovde prevucite priloge)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Sastavi poruku"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Prosleđena poruka - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Priloži originalnu poruku"
+msgstr[1] "Priloži originalnu poruku"
+msgstr[2] "Priloži originalnu poruku"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Urednik sadrži u tekstu poruke ne sadrži tekst, i ne može biti menjan.)"
+"<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Dodaj datoteku poruci"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11895,54 +12371,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Nisam mogao da napravim vezu: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Nepročitanih poruka"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Želite li da sačuvate promene?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Ne uklanjaj"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Ukloni"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Nisam mogao da sačuvam potpis: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Greška kod čuvanja prečica."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Upozorenje: izmenjena poruka"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -11950,57 +12440,74 @@ msgid ""
 msgstr "Sigurno želite da obrišete ovaj neimenovani zakazani sastanak"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Zanemari promene"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Sačuvaj poruku..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Nisam mogao da napravim vezu: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Nisam mogao da sačuvam potpis: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Morate da podesite nalog pre sastavljanja poruke."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Nisam mogao da napravim vezu: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Nisam mogao da napravim prozor za sastavljanje:\n"
+"Ne mogu da pokrenem kontrolu biranja adresa."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Nisam mogao da napravim prozor za sastavljanje:\n"
+"Ne mogu da aktiviram komponentu HTML urednika.\n"
+"Molim proverite da imate odgovarajuće verzije\n"
+"gtkhtml i libgtkhtml na sistemu.\n"
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr "Paket programa Evolucija"
@@ -12307,11 +12814,6 @@ msgstr "%d.%b.%Y."
 msgid "Select a time to compare against"
 msgstr "Izaberite ime za poređenje"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "<b>Pr_avila filtera</b>"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12340,19 +12842,8 @@ msgstr "Morate dati ime datoteci."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Datoteka '%s' ne postoji ili nije regularna datoteka."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Premeštam direktorijum %s"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Morate odrediti direktorijum."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12360,156 +12851,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Zadatak"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Morate dati ime ovom filteru."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Morate imenovati ovaj vfolder."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Nije izabran server"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Izaberi datoteku"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
-msgstr "<b>Onda</b>"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Odaberite direktorijum"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: filter/filter.glade.h:2
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>Pr_avila filtera</b>"
-
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>vFolder izvori</b>"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Uporedi sa"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Dolazeći"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Datum poruke će biti upoređen sa\n"
-"vremenom u ponoć datog datuma."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Datum poruke će biti upoređen sa\n"
-"vremenom kada se filtriranje desilo."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Datum poruke će biti upoređen sa\n"
-"trenutnim vremenom kada se filtriranje desilo."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "vreme u odnosu na trenutno vreme"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "pre"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "meseci"
-
-# bug: plural-forms
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "sekunde"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "samo određeni direktorijumi"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "trenutno vreme"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "vreme koje ste odredili"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "sa svim aktivnim mrežnim direktorijumima"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "sa svim lokalnim i aktivnim mrežnim direktorijumima"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "sa svim lokalnim direktorijumima"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "godine"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Važno"
 
@@ -12577,6 +12949,71 @@ msgstr "dolazeći"
 msgid "outgoing"
 msgstr "odlazeći"
 
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>Pr_avila filtera</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Uporedi sa"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Dolazeći"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Datum poruke će biti upoređen sa\n"
+"vremenom u ponoć datog datuma."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Datum poruke će biti upoređen sa\n"
+"vremenom kada se filtriranje desilo."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Datum poruke će biti upoređen sa\n"
+"trenutnim vremenom kada se filtriranje desilo."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "vreme u odnosu na trenutno vreme"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "pre"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "meseci"
+
+# bug: plural-forms
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "sekunde"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "trenutno vreme"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "vreme koje ste odredili"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "godine"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
@@ -12589,60 +13026,71 @@ msgstr "Izmeni pravilo"
 msgid "Rule name"
 msgstr "Ime pravila"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Pravila rezultata"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Rezultat"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Postavke sastavljača"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Telo sadrži"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "Podesite osobine za poštu, uključujući sigurnost i prikaz poruke, ovde"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Telo ne sadrži"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Podesite proveru pravopisa, potpise, i sastavljač poruke ovde"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Telo ili naslov sadrže"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Podesite vaše naloge za poštu ovde"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Poruka sadrži"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolucija pošta"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Primaoci sadrže"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Kontrola podešavanja Evolucija naloga za poštu"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Pošiljalac sadrži"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Komponenta Evolucija pošte"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Naslov sadrži"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Sastavljač Evolucija pošte"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Naslov ne sadrži"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Kontrola podešavanja Evolucija sastavljača"
 
-#: filter/vfolder-editor.c:108
-#, fuzzy
-msgid "Virtual _Folders"
-msgstr "<b>Virtuelni _direktorijumi</b>"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Kontrola osobina Evolucija pošte"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Dodaj"
+# 48x48/emblems/emblem-mail.icon.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Pošta"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "VFolder izvor"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Poštanski nalozi"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Osobine pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Pošta:"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12675,45 +13123,308 @@ msgstr "_Dodaj potpis"
 msgid "Signature(s)"
 msgstr "Potpis(i)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Prosleđena poruka --------"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 msgid "an unknown sender"
 msgstr "nepoznati pošiljalac"
 
-#. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "U %a, %d. %m. %Y u %H:%M %%+05d, %%s napisa:"
+#. 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:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "<b>Pr_avila filtera</b>"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Odaberite direktorijum"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Preračunaj"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Dodeli boju"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Dodeli boju"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Prilozi"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Zvono"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "sadrži"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Kopiraj u direktorijum"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Datum primanja"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Datum slanja"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Obrisano"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "ne sadrži"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "ne završava se sa"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "ne postoji"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "ne vraća"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "ne zvuči kao"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "ne počinje sa"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Ne postoji"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Priprema"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "završava se sa"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Postoji"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "postoji"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Izraz"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Sledi"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "je"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "je posle"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "je pre"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "je označen"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "je veći od"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "je manji od"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "nije"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "nije označen"
+
+#: mail/em-filter-i18n.h:36
+msgid "Junk Test"
+msgstr "Provera đubreta"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etiketa"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Dopisna lista"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Telo poruke"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Zaglavlje poruke"
+
+#: mail/em-filter-i18n.h:41
+msgid "Message is Junk"
+msgstr "Poruka je đubre"
+
+#: mail/em-filter-i18n.h:42
+msgid "Message is not Junk"
+msgstr "Poruka nije đubre"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Premesti u direktorijum"
+
+#: mail/em-filter-i18n.h:44
+msgid "Pipe to Program"
+msgstr "Kroz cev do programa"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Pusti zvuk"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Čitaj"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Primaoci"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Reg. izraz pretraga"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Odgovoreno na"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "povraćaji"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "više povraćaja od"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "manje povraćaja od"
+
+#: mail/em-filter-i18n.h:53
+msgid "Run Program"
+msgstr "Pokreni program"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Rezultat"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Pošiljalac"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Dodeli status"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Veličina (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "zvuči kao"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Izvorni nalog"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Određeno zaglavlje"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "počinje sa"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Prekini sa obradom"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Naslov"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Nedodeljen status"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr "<b>Onda</b>"
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Napravi _Virtuelni direktorijum iz pretrage..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Osobine direktorijuma"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Osobine"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Ime direktorijuma"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Ukupno poruka"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Ukupno poruka"
+msgstr[1] "Ukupno poruka"
+msgstr[2] "Ukupno poruka"
 
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Nepročitanih poruka"
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Nepročitanih poruka"
+msgstr[1] "Nepročitanih poruka"
+msgstr[2] "Nepročitanih poruka"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12723,450 +13434,282 @@ msgstr "<protisnite ovde da izaberete direktorijum>"
 msgid "Create New Folder"
 msgstr "Napravi novi direktorijum"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Navedite gde da napravim direktorijum:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Napravi direktorijum"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "_Ime direktorijuma:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VFolder-i"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "NEPOKLOPLjEN"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Učitavam..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premeštam direktorijum %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "Umnožavam direktorijum %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premeštam poruke u direktorijum %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiram poruke u direktorijum %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ne mogu da ubacim poruke u smeštaj na najvišem nivou"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiraj u direktorijum"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Premesti u direktorijum"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "Pre_mesti"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Otkaži zaduženje"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Umnoži"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Pravim direktorijum „%s“"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Napravi direktorijum"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj direktorijum „%s“ u:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Preimenuj direktorijum"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "P_regled"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Otvori u _novom prozoru"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "_Kopiraj..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "_Premesti..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Novi direktorijum..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "Preimenu_j"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Osobine..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "VFolder-i"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "NEPOKLOPLjEN"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Sanduče"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Učitavam..."
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "_Preimenuj..."
 
-# 48x48/emblems/emblem-mail.icon.in.h:1
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Pošta"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Osobine"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Štampaj"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Odgovori _Svima"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Prosl_edi"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Pr_ati..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Označ_i završene"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "O_znači kao pročitano"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Označi kao _nepročitano"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Onači kao _važno"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "_Označi kao nevažno"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Označi kao _đubre"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Označi da _nije đubre"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "Poniš_ti brisanje"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Prene_si u direktorijum..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj u direktorijum..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etiketa"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Dodaj pošiljaoca u adresa_r"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Pri_meni filtere"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "F_iltriraj đubre"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Na_pravi pravilo od poruke"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "VFolder na _Naslov"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "VFolder na P_ošiljaoca"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "VFolder na _Primaoce"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "VFolder na dopisnu _listu"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filtriraj prema naslo_vu"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filtriraj prema p_ošiljaocu"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filtriraj prema p_rimaocu"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filtriraj prema _dopisnoj listi"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Podrazumevani"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Štampaj poruku"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "_Umnoži adresu veze"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite da pošaljete %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Od"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Odgovor-za"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Kome"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc (kopija)"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc (nevidljiva kopija)"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Naslov"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Diskusione grupe"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s prilog"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Ne mogu da obradim S/MIME poruku: nepoznata greška"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Nepodržana vrsta šifrovanja za multipart/encrypted"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Nisam mogao da obradim MIME poruku. Pokazujem kao izvor."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Nepodržan oblik potpisa"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Greška pri proveri potpisa"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Nepoznata greška pri proveri potpisa"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Preuzimam „%s“"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Nepotpisana"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Ispravan potpis"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Neispravan potpis"
-
-#: mail/em-format-html.c:562
-#, fuzzy
-msgid "Valid signature but cannot verify sender"
-msgstr "Ispravan potpis, ne mogu da proverim pošiljaoca"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Nešifrovano"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "Šifrovana, slabo"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Šifrovana"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "Šifrovana, dobro"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Loše složen spoljni deo."
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pokazivač na FTP adresu (%s)"
-
-#: mail/em-format-html.c:861
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Pokazivač na lokalnu datoteku (%s) koja odgovara adresi \"%s\""
-
-#: mail/em-format-html.c:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "pokazivač na lokalnu datoteku (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pokazivač na mrežni podatak (%s)"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pokazivač na napoznati spoljni podatak (\"%s\" tipa)"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Oblikujem poruku"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr "Pošiljalac"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 # bug: plural-forms if put as "%d matches"
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
@@ -13174,14 +13717,22 @@ msgstr "<I> (%R %Z)</I>"
 msgid "Matches: %d"
 msgstr "Poklapanja: %d"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Nepotpisana"
+
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "Ova poruka nije potpisana. Nema garancija da je pošiljalac poruke ispravan."
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Ispravan potpis"
+
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13189,7 +13740,11 @@ msgstr ""
 "Ova poruka je potpisana i ispravna što znači da je pošiljalac poruke vrlo "
 "verovatno onaj za koga se izdaje."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Neispravan potpis"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13197,11 +13752,11 @@ msgstr ""
 "Potpis ove poruke nije mogao biti proveren, možda je izmenjena prilikom "
 "prenosa."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "Ispravan potpis, ne mogu da proverim pošiljaoca"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13209,7 +13764,11 @@ msgstr ""
 "Poruka je potpisana ispravnim potpisom, ali pošiljalac poruke nije mogao "
 "biti proveren."
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Nešifrovano"
+
+#: mail/em-format-html-display.c:650
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13218,7 +13777,11 @@ msgstr ""
 "Ova poruka nije šifrovana.  Njen sadržaj je moguće videti prilikom prenosa "
 "preko Interneta."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Šifrovana, slabo"
+
+#: mail/em-format-html-display.c:651
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
@@ -13227,7 +13790,11 @@ msgstr ""
 "Ova poruka je šifrovana, ali slabim algoritmom. Teško je, ali ne i nemoguće, "
 "da neko sa strane vidi sadržaj ove poruke u dogledno vreme."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Šifrovana"
+
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13235,7 +13802,11 @@ msgstr ""
 "Ova poruka je šifrovana. Teško je moguće da neko sa strane vidi sadržaj ove "
 "poruke."
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Šifrovana, dobro"
+
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -13244,39 +13815,162 @@ msgstr ""
 "Ova poruka je šifrovana, i to dobrim algoritmom. Veoma teško je moguće da "
 "neko sa strane vidi sadržaj ove poruke u doglednom vremenu."
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "Po_gledaj sertifikat"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "Ovaj sertifikat se ne može pregledati"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Završeno: %d. %B, %Y. %k:%M"
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 msgid "Overdue:"
 msgstr "Prekoračeno:"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "do %d. %B, %Y. %k:%M"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "Po_gledaj unutar"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Strana %d od %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Preuzimam „%s“"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Ispravan potpis, ne mogu da proverim pošiljaoca"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Loše složen spoljni deo."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pokazivač na FTP adresu (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Pokazivač na lokalnu datoteku (%s) koja odgovara adresi \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "pokazivač na lokalnu datoteku (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pokazivač na mrežni podatak (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pokazivač na napoznati spoljni podatak (\"%s\" tipa)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Oblikujem poruku"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Od"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Odgovor-za"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Kome"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc (kopija)"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc (nevidljiva kopija)"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "Pošiljalac"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Datum"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Diskusione grupe"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s prilog"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Ne mogu da obradim S/MIME poruku: nepoznata greška"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Nepodržana vrsta šifrovanja za multipart/encrypted"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Nisam mogao da obradim MIME poruku. Pokazujem kao izvor."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Nepodržan oblik potpisa"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Greška pri proveri potpisa"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Nepoznata greška pri proveri potpisa"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Ubica-spama (ugrađen)"
@@ -13389,7 +14083,7 @@ msgstr "Pošalji _poruku..."
 msgid "_Add to Addressbook"
 msgstr "Dodaj u _adresar"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvori u %s..."
@@ -13402,7 +14096,7 @@ msgstr "Ovaj smeštaj ne podržava pretplate, ili nisu omogućene."
 msgid "Subscribed"
 msgstr "Pretplati se"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Direktorijum"
 
@@ -13436,11 +14130,24 @@ msgid "Add address"
 msgstr "Dodaj adresu"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "Poruke od %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "<b>Virtuelni _direktorijumi</b>"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "VFolder izvor"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Samoprepoznavanje veza"
@@ -13926,63 +14633,33 @@ msgstr "port za pokretanje korisnikovog spamd-a"
 msgid "spamd port"
 msgstr "port spamd-a"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Postavke sastavljača"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "Podesite osobine za poštu, uključujući sigurnost i prikaz poruke, ovde"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Podesite proveru pravopisa, potpise, i sastavljač poruke ovde"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Podesite vaše naloge za poštu ovde"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolucija pošta"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Kontrola podešavanja Evolucija naloga za poštu"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Komponenta Evolucija pošte"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolucija Elm uvoznik"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Sastavljač Evolucija pošte"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolucija Netscape pošta uvoznik"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Kontrola podešavanja Evolucija sastavljača"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolucija Outlook Express 4 uvoznik"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Kontrola osobina Evolucija pošte"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolucija Pine uvoznik"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Poštanski nalozi"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolucija mbox uvoznik"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Osobine pošte"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBoks (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "_Pošta:"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14040,34 +14717,6 @@ msgstr "Uvozim „%s“"
 msgid "Importing mailbox"
 msgstr "Uvozim poštansko sanduče"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolucija Elm uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolucija Netscape pošta uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolucija Outlook Express 4 uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolucija Pine uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolucija mbox uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBoks (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14232,77 +14881,90 @@ msgstr "%s dopisna lista"
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo filtriranja"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d izabranih"
+msgid_plural "%d deleted"
+msgstr[0] "%d izabranih"
+msgstr[1] "%d izabranih"
+msgstr[2] "%d izabranih"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d neposlatih"
+msgid_plural "%d junk"
+msgstr[0] "%d neposlatih"
+msgstr[1] "%d neposlatih"
+msgstr[2] "%d neposlatih"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "Priprema"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "Priprema"
+msgstr[1] "Priprema"
+msgstr[2] "Priprema"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d poslatih"
+msgid_plural "%d sent"
+msgstr[0] "%d poslatih"
+msgstr[1] "%d poslatih"
+msgstr[2] "%d poslatih"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d neposlatih"
+msgid_plural "%d unsent"
+msgstr[0] "%d neposlatih"
+msgstr[1] "%d neposlatih"
+msgstr[2] "%d neposlatih"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d ukupno"
+msgid_plural "%d total"
+msgstr[0] "%d ukupno"
+msgstr[1] "%d ukupno"
+msgstr[2] "%d ukupno"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr "%d neposlatih"
+msgid_plural ", %d unread"
+msgstr[0] "%d neposlatih"
+msgstr[1] "%d neposlatih"
+msgstr[2] "%d neposlatih"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Nova poruka"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 msgid "New Mail Folder"
 msgstr "Novi direktorijum sa poštom"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 msgid "Mail _Folder"
 msgstr "_Direktorijum sa poštom"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 msgid "Create a new mail folder"
 msgstr "Napravi novi direktorijum sa poštom"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "proveravam servis"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Povezujem se na server..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Ličnost"
@@ -14363,14 +15025,22 @@ msgstr ""
 "Evolucija nalog za poštu. Molim unesite dole ime za ovaj nalog. Ovo ime će "
 "biti korišćeno samo za potrebe prikazivanja na ekranu."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "proveravam servis"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Povezujem se na server..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
 #: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "_Proveri podržane vrste "
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Prikaz</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>SSL nije podržan u ovoj verziji evolucije</b>"
@@ -14624,7 +15294,7 @@ msgstr "Ne citiraj originalnu poruku"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ne potpisuj zahteve za s_astancima (za kompatibilnost sa Outlook-om)"
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Gotovo"
 
@@ -14962,6 +15632,117 @@ msgstr "boja"
 msgid "description"
 msgstr "opis"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>vFolder izvori</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Digitalni potpis</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Šifrovanje</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Prihvaćeno"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "G_otovo"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Osetljivo na velika i mala slova"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Pronađi u poruci"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Nađi:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Označi za praćenje"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Pretplate na direktorijume"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "Saglasnost ključa"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Ništa nije izabrano"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "S_erver:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Bezbednosni podaci"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Poruke koje ste izabrali za praćenje su dole izlistane.\n"
+"Molim odaberite akciju za sleđenje iz \"Oznaka\" menija."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Spisak naloga"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr "_Rok:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Oznaka:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "Pretp_lati se"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "Odjavi pretplatu"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "samo određeni direktorijumi"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "sa svim aktivnim mrežnim direktorijumima"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "sa svim lokalnim i aktivnim mrežnim direktorijumima"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "sa svim lokalnim direktorijumima"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15169,14 +15950,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15281,8 +16054,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Ne mogu da premestim direktorijum: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15334,8 +16108,9 @@ msgstr "Ne mogu da otvorim izvor"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "i još %d kontakt."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15364,8 +16139,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Ne briši"
+msgstr "_Povrati"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15429,8 +16205,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Ne mogu da obrišem direktorijum:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15472,13 +16251,44 @@ msgstr ""
 "    '%s'\n"
 "Potom su osveženi."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Premeštam direktorijum %s"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Morate odrediti direktorijum."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Morate imenovati ovaj vfolder."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Nije izabran server"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15486,16 +16296,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Prepiši"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Pošalji"
@@ -15660,7 +16470,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Čuvam prilog"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15669,45 +16479,21 @@ msgstr ""
 "Ne mogu da napravim izlaznu datoteku: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisam mogao da upišem: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Prekidam vezu sa %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponovo se povezujem na %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Osetljivo na velika i mala slova"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Pronađi u poruci"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Nađi:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Digitalni potpis</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Šifrovanje</span>"
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Bezbednosni podaci"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Poništavam..."
@@ -15743,24 +16529,24 @@ msgstr "Osvežavam..."
 msgid "Waiting..."
 msgstr "Čekam..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Korisnik je poništio operaciju."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Unesite lozinku"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
@@ -15815,15 +16601,15 @@ msgstr "Osvežavam vdirektorijume za adresu: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Osvežavam vdirektorijume za adresu: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vFolders-i"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Izmeni VFolder-e"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Novi VFolder"
 
@@ -15887,7 +16673,7 @@ msgstr "%d. %b, %k:%M "
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Pravim listu poruka"
 
@@ -15943,10 +16729,6 @@ msgstr "Prosledi"
 msgid "No Response Necessary"
 msgstr "Nije neophodan odgovor"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Čitaj"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Odgovori"
@@ -15959,49 +16741,49 @@ msgstr "Odgovori svima"
 msgid "Review"
 msgstr "Pročitaj"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Označi za praćenje"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Telo sadrži"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "G_otovo"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Telo ne sadrži"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Poruke koje ste izabrali za praćenje su dole izlistane.\n"
-"Molim odaberite akciju za sleđenje iz \"Oznaka\" menija."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Telo ili naslov sadrže"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr "_Rok:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Poruka sadrži"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Oznaka:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Primaoci sadrže"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Pretplate na direktorijume"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Pošiljalac sadrži"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Ništa nije izabrano"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Naslov sadrži"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "S_erver:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Naslov ne sadrži"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "Pretp_lati se"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolucija konzola"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "Odjavi pretplatu"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Proba Evolucije"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Probni deo Evolucije"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -16069,31 +16851,18 @@ msgstr "Da li da preskoči prozorče sa upozorenjem o razvoju"
 msgid "mail"
 msgstr "pošta"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Nepoznata greška"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Neispravni argumenti"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Ne mogu da se registruje na OAF"
+msgid "<b>Active Connections</b>"
+msgstr "Aktivne veze"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Baza sa podešavanjima nije nađena"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Aktivne veze"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Opšta greška"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Izaberite OK da prekinete vezu"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16279,30 +17048,6 @@ msgstr "Ime direktorijuma ne može da sadrži znak \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "„.“ i „..“ su rezervisana imena direktorijuma."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolucija je trenutno na mreži. Pritisnite ovo dugme da radite bez "
-"mreže."
-
-#: shell/e-shell-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolucija je u procesu odlaska u rad bez mreže."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolucija nije trenutno na mreži. Pritisnite ovo dugme da radite na "
-"mreži."
-
-#: shell/e-shell-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Pošta za %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Izgleda da GNOME Pilot alati nisu instalirani na ovaj sistem."
@@ -16320,110 +17065,94 @@ msgstr "Bug buddy nije instaliran."
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne može da se pokrene."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Grupvajz"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "_Na mreži"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Nije na mreži"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Radi bez mreže"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Kućica"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Novo"
-
-#: shell/evolution-test-component.c:140
-msgid "New Test"
-msgstr "Nova proba"
-
-#: shell/evolution-test-component.c:141
-msgid "_Test"
-msgstr "_Proba"
-
-#: shell/evolution-test-component.c:142
-msgid "Create a new test item"
-msgstr "Napravi novu probnu stavku"
+#: shell/e-shell-window.c:337
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolucija je trenutno na mreži. Pritisnite ovo dugme da radite bez "
+"mreže."
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Aktivne veze"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolucija je u procesu odlaska u rad bez mreže."
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Aktivne veze"
+#: shell/e-shell-window.c:350
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolucija nije trenutno na mreži. Pritisnite ovo dugme da radite na "
+"mreži."
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Izaberite OK da prekinete vezu"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Pošta za %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "K_alendar"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Contacts:"
-msgstr "Konatkti: "
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Pošta:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "Za_duženja:"
+msgid "Uknown system error."
+msgstr "Nepoznata greška"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "_Vrsta direktorijuma:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Neispravni argumenti"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Otvori direktorijum drugog korisnika"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Ne mogu da se registruje na OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Nalog:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Baza sa podešavanjima nije nađena"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Ime direktorijuma:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Opšta greška"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Korisnik:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Novo"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Pomoćnik Evolucija podešavanja"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Uvoz datoteka"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Vremenska zona"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Dobrodošli"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/evolution-startup-wizard.glade.h:6
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
@@ -16437,7 +17166,7 @@ msgstr ""
 "\n"
 "Molim pritisnite dugme \"Napred\" da nastavite. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16449,17 +17178,17 @@ msgstr ""
 "\n"
 "Pritisnite dugme \"Primeni\" da sačuvate vaša podešavanja. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolucija konzola"
+#: shell/evolution-test-component.c:140
+msgid "New Test"
+msgstr "Nova proba"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Proba Evolucije"
+#: shell/evolution-test-component.c:141
+msgid "_Test"
+msgstr "_Proba"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Probni deo Evolucije"
+#: shell/evolution-test-component.c:142
+msgid "Create a new test item"
+msgstr "Napravi novu probnu stavku"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16520,7 +17249,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolucija može da uveze podatke iz sledećih datoteka:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16555,7 +17284,7 @@ msgstr ""
 "Nadamo se da ćete uživati u plodovima našeg napornog rada, i \n"
 "željno iščekujemo vaše doprinose!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16564,39 +17293,39 @@ msgstr ""
 "Hvala\n"
 "Tim Ximian Evolucije\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Nemoj mi ponovo reći"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Pokreni Evoluciju uz navedeni deo"
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Počni sa radom bez mreže"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Počni sa radom na mreži"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Silom ugasi sve delove evolucije"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Primoraj ponovni prenos podataka iz Evolucije 1.4"
 
-#: shell/main.c:510
+#: shell/main.c:475
 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:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16671,6 +17400,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16915,6 +17666,11 @@ msgstr "Vaši sertifikati"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Sertifikat već postoji"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d. %m. %Y."
@@ -17116,11 +17872,6 @@ msgstr "Jedinstveni IB subjekta"
 msgid "Certificate Signature Value"
 msgstr "Vrednost potpisa sertifikata"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-msgid "Certificate already exists"
-msgstr "Sertifikat već postoji"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 lozinka datoteke"
@@ -17262,8 +18013,8 @@ msgstr "Pregledaj tekući kontakt"
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Akcije"
@@ -17742,16 +18493,6 @@ msgstr "_Obrni izbor"
 msgid "_Threaded Message List"
 msgstr "Lista poruka prema _niti razgovora"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Zatvori ovaj prozor"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Zatvori"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Dodaj _pošiljaoca u adresar"
@@ -18154,6 +18895,16 @@ msgstr "Ala_ti"
 msgid "_Undelete"
 msgstr "_Povrati"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Zatvori ovaj prozor"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Zatvori"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Priloži"
@@ -18236,10 +18987,6 @@ msgstr "Sačuvaj trenutnu datoteku sa drugim imenom"
 msgid "Save the message in a specified folder"
 msgstr "Sačuvaj poruku u navedenom direktorijumu"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Pošalji"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18809,7 +19556,7 @@ msgid "Evolution Query"
 msgstr "Evolucija sažetak"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18968,27 +19715,264 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% završeno)"
 
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Lična identifikacija za HTTP server."
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Izabrani kalendari za objavljivanje"
+
+#~ msgid "Login name:"
+#~ msgstr "Prijavno ime:"
+
+#~ msgid "URL:"
+#~ msgstr "Adresa (URL):"
+
+#~ msgid "User Publishes"
+#~ msgstr "Korisnik objavljuje"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "urednik-kontakt-liste"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Sačuvaj listu kao VCard"
+
+#~ msgid "Groupwise"
+#~ msgstr "Grupvajz"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Nisam mogao da pokrenem vombat"
+
+#~ msgid "C_alendar"
+#~ msgstr "K_alendar"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Opcije za zvučni alarm"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Opcije za tekstualni alarm"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Opcije za alarm preko E-pošte"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Opcije za program alarma"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Nepoznate opcije za alarm"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Ponavljanje alarma"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Poruka za prikaz:"
+
+#~ msgid "Message to Send"
+#~ msgstr "Poruka za slanje"
+
+#~ msgid "Play sound:"
+#~ msgstr "Pusti zvuk:"
+
+#~ msgid "Run program:"
+#~ msgstr "Pokreni program:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Sa ovim argumentima:"
+
+#~ msgid "Basics"
+#~ msgstr "Osnove"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Datum/Vreme:"
+
+#~ msgid "Reminders"
+#~ msgstr "Podsetnici"
+
+#~ msgid "_Options..."
+#~ msgstr "_Opcije..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Adresar..."
+
+#~ msgid "Reminder"
+#~ msgstr "Podsetnik"
+
+#~ msgid "B_usy"
+#~ msgstr "Z_uzet"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "Po_verljivo"
+
+#~ msgid "Date & Time"
+#~ msgstr "Datum i vreme"
+
+#~ msgid "F_ree"
+#~ msgstr "_Slobodno"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Lič_no"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Ja_vno"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Dodaj prisu_tnog"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Dodaj pošiljaoca u adresa_r"
+
+#~ msgid "Exceptions"
+#~ msgstr "Izuzeci"
+
+#~ msgid "Preview"
+#~ msgstr "Izgled"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Pravilo za ponavljanje"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Posebno ponavljanje"
+
+#~ msgid "_Modify"
+#~ msgstr "_Izmeni"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Bez ponavljanja"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Jednostavno ponavljanje"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _gotovo"
+
+#~ msgid "Progress"
+#~ msgstr "Napredak"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Pov_erljivo"
+
+#~ msgid "Folder:"
+#~ msgstr "Direktorijum:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Početak:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Kraj:</b> "
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Završetak:</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Do:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Ništa</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Nastala je greška u CORBA sistemu\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Objekat nije mogao biti pronađen\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Nemate prave dozvole za ažuriranje kalendara\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Stanje prisutnog nije moglo biti ažurirano!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Dodaj pošiljaoca u adresa_r"
+
+#~ msgid "_Options"
+#~ msgstr "_Opcije"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "_Početno vreme sastanka:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "_Krajnje vreme sastanka:"
+
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Greška pri otvaranju %s:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Nisam mogao da nađem sertifikat za \"%s\"."
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Na_pravi pravilo od poruke"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Nisam mogao da napravim S/MIME kontekst za dešifriranje."
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Nisam mogao da napravim prozor za sastavljanje:\n"
+#~ "Ne mogu da aktiviram komponentu HTML urednika."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Pravila rezultata"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "U %a, %d. %m. %Y u %H:%M %%+05d, %%s napisa:"
+
+#~ msgid "Folder Name"
+#~ msgstr "Ime direktorijuma"
+
+#~ msgid "_Rename"
+#~ msgstr "Preimenu_j"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Osobine..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Kućica"
+
+#~ msgid "C_alendar:"
+#~ msgstr "K_alendar"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Konatkti: "
+
+#~ msgid "_Mail:"
+#~ msgstr "_Pošta:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "Za_duženja:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "_Vrsta direktorijuma:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Otvori direktorijum drugog korisnika"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "_Ime direktorijuma:"
+
+#~ msgid "_User:"
+#~ msgstr "_Korisnik:"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Neuspešno povezivanje sa LDAP serverom"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Neuspešna prijava na LDAP server"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Nisam mogao da obavim upit na Root DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "Server je odgovorio nepodržanim bazama za pretragu"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Ovaj server ne podržava podatke LDAPv3 šeme"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Greška u čitanju podataka šeme"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Server nije odgovorio sa ispravnim podacima šeme"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr " P_okaži podržane baze "
 
@@ -19060,9 +20044,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Webcam:"
 #~ msgstr "Veb stranica:"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Uređivač kategorija nije dostupan."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19113,9 +20094,6 @@ msgstr "%s (%d%% završeno)"
 #~ "Obrisani događaj je sastanak, želite li da pošaljete poruku za njegovo "
 #~ "otkazivanje?"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Sigurno želite da poništite i obrišete ovaj sastanak?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19133,45 +20111,15 @@ msgstr "%s (%d%% završeno)"
 #~ "Obrisani unos u dnevnik je objavljen, želite li da pošaljete poruku za "
 #~ "njegovo otkazivanje?"
 
-#~ msgid "Are you sure you want to cancel and delete this journal entry?"
-#~ msgstr "Sigurno želite da poništite i obrišete ovaj unos u dnevnik?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Sigurno želite da obrišete ovaj zakazani sastanak `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Sigurno želite da obrišete ovaj neimenovani zakazani sastanak"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Sigurno želite da obrišete zaduženje `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Sigurno želite da obrišete ovo neimenovano zaduženje?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Sigurno želite da izbrišete unos u dnevnik `%s'?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "Sigurno želite da izbrišete ovan neimenovani unos u dnevnik?"
 
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Sigurno želite da izbrišete %d zakazani sastanak?"
-#~ msgstr[1] "Sigurno želite da izbrišete %d zakazana sastanka?"
-#~ msgstr[2] "Sigurno želite da izbrišete %d zakazanih sastanaka?"
-
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Sigurno želite da izbrišete %d zaduženje"
-#~ msgstr[1] "Sigurno želite da izbrišete %d zaduženja"
-#~ msgstr[2] "Sigurno želite da izbrišete %d zaduženja"
-
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Sigurno želite da izbrišete %d unos u dnevnik?"
-#~ msgstr[1] "Sigurno želite da izbrišete %d unosa u dnevnik?"
-#~ msgstr[2] "Sigurno želite da izbrišete %d unosa u dnevnik?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Pozovi druge..."
 
@@ -19219,9 +20167,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Learning junk and/or non junk message(s)"
 #~ msgstr "Učenje đubreta i ne-đubreta od poruka"
 
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Nisam mogao da preuzmem članak %s sa NNTP servera."
-
 #~ msgid "Posting not allowed by news server"
 #~ msgstr "Server ne dozvoljava slanje članaka"
 
@@ -19254,174 +20199,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Nepoznat odgovor servera: %s"
 
-#~ msgid "Adjust Score"
-#~ msgstr "Preračunaj"
-
-#~ msgid "Assign Color"
-#~ msgstr "Dodeli boju"
-
-#~ msgid "Assign Score"
-#~ msgstr "Dodeli boju"
-
-#~ msgid "Attachments"
-#~ msgstr "Prilozi"
-
-#~ msgid "Beep"
-#~ msgstr "Zvono"
-
-#~ msgid "contains"
-#~ msgstr "sadrži"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Kopiraj u direktorijum"
-
-#~ msgid "Date received"
-#~ msgstr "Datum primanja"
-
-#~ msgid "Date sent"
-#~ msgstr "Datum slanja"
-
-#~ msgid "Deleted"
-#~ msgstr "Obrisano"
-
-#~ msgid "does not contain"
-#~ msgstr "ne sadrži"
-
-#~ msgid "does not end with"
-#~ msgstr "ne završava se sa"
-
-#~ msgid "does not exist"
-#~ msgstr "ne postoji"
-
-#~ msgid "does not return"
-#~ msgstr "ne vraća"
-
-#~ msgid "does not sound like"
-#~ msgstr "ne zvuči kao"
-
-#~ msgid "does not start with"
-#~ msgstr "ne počinje sa"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Ne postoji"
-
-#~ msgid "Draft"
-#~ msgstr "Priprema"
-
-#~ msgid "ends with"
-#~ msgstr "završava se sa"
-
-#~ msgid "Exist"
-#~ msgstr "Postoji"
-
-#~ msgid "exists"
-#~ msgstr "postoji"
-
-#~ msgid "Expression"
-#~ msgstr "Izraz"
-
-#~ msgid "Follow Up"
-#~ msgstr "Sledi"
-
-#~ msgid "is"
-#~ msgstr "je"
-
-#~ msgid "is after"
-#~ msgstr "je posle"
-
-#~ msgid "is before"
-#~ msgstr "je pre"
-
-#~ msgid "is Flagged"
-#~ msgstr "je označen"
-
-#~ msgid "is greater than"
-#~ msgstr "je veći od"
-
-#~ msgid "is less than"
-#~ msgstr "je manji od"
-
-#~ msgid "is not"
-#~ msgstr "nije"
-
-#~ msgid "is not Flagged"
-#~ msgstr "nije označen"
-
-#~ msgid "Junk Test"
-#~ msgstr "Provera đubreta"
-
-#~ msgid "Mailing list"
-#~ msgstr "Dopisna lista"
-
-#~ msgid "Message Body"
-#~ msgstr "Telo poruke"
-
-#~ msgid "Message Header"
-#~ msgstr "Zaglavlje poruke"
-
-#~ msgid "Message is Junk"
-#~ msgstr "Poruka je đubre"
-
-#~ msgid "Message is not Junk"
-#~ msgstr "Poruka nije đubre"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Premesti u direktorijum"
-
-#~ msgid "Pipe to Program"
-#~ msgstr "Kroz cev do programa"
-
-#~ msgid "Play Sound"
-#~ msgstr "Pusti zvuk"
-
-#~ msgid "Recipients"
-#~ msgstr "Primaoci"
-
-#~ msgid "Regex Match"
-#~ msgstr "Reg. izraz pretraga"
-
-#~ msgid "Replied to"
-#~ msgstr "Odgovoreno na"
-
-#~ msgid "returns"
-#~ msgstr "povraćaji"
-
-#~ msgid "returns greater than"
-#~ msgstr "više povraćaja od"
-
-#~ msgid "returns less than"
-#~ msgstr "manje povraćaja od"
-
-#~ msgid "Run Program"
-#~ msgstr "Pokreni program"
-
-#~ msgid "Sender"
-#~ msgstr "Pošiljalac"
-
-#~ msgid "Set Status"
-#~ msgstr "Dodeli status"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Veličina (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "zvuči kao"
-
-#~ msgid "Source Account"
-#~ msgstr "Izvorni nalog"
-
-#~ msgid "Specific header"
-#~ msgstr "Određeno zaglavlje"
-
-#~ msgid "starts with"
-#~ msgstr "počinje sa"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Prekini sa obradom"
-
-#~ msgid "Unset Status"
-#~ msgstr "Nedodeljen status"
-
 #~ msgid "Check _Incoming Mail"
 #~ msgstr "Proveri pristig_lu poštu"
 
@@ -19660,9 +20437,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Finished"
 #~ msgstr "Gotovo"
 
-#~ msgid "Group:"
-#~ msgstr "Grupa:"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -20207,9 +20981,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "component"
 #~ msgstr "deo"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarmi"
-
 #~ msgid "Geographical position"
 #~ msgstr "Geografski položaj"
 
@@ -20773,9 +21544,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Evolution is now exiting ..."
 #~ msgstr "Evolucija sada izlazi..."
 
-#~ msgid "Select Contents from Address Book"
-#~ msgstr "Izaberite sadržaj iz adresara"
-
 #~ msgid ""
 #~ "The task backend for\n"
 #~ "%s\n"
@@ -20820,18 +21588,9 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "<b>Alarm Action</b>"
 #~ msgstr "<b>Dejstvo alarma</b>"
 
-#~ msgid "<b>Alarm Sound</b>"
-#~ msgstr "<b>Zvuk alarma</b>"
-
 #~ msgid "<b>Classification</b>"
 #~ msgstr "<b>Klasifikacija</b>"
 
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "<b>Datum i vreme</b>"
-
-#~ msgid "<b>Description</b>"
-#~ msgstr "<b>Opis</b>"
-
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>_Sažetak</b>"
 
@@ -21248,9 +22007,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "Primam rezultate pretrage sa LDAP servera"
 
-#~ msgid "Error performing search"
-#~ msgstr "Greška tokom pretrage"
-
 #~ msgid "Repository is offline"
 #~ msgstr "Arhiva nije na mreži"
 
@@ -21383,9 +22139,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Evolution Addressbook local/LDAP backend"
 #~ msgstr "Osnovni proces lokalnog /LDAP Evolucija adresara"
 
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Osnovni proces lokalnih datoteka Evolucije kalendara"
-
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Osnovni proces lokalnog /LDAP Evolucija adresara"
 
@@ -21485,9 +22238,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Use Score"
 #~ msgstr "Koristi rezultat"
 
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "Kursor nije mogao da bude učitan\n"
-
 #~ msgid "Folder containing contact information"
 #~ msgstr "Direktorijum sa podacima o kontaktima"
 
@@ -22066,9 +22816,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "View the selected folder"
 #~ msgstr "Pregledaj izabrani direktorijum"
 
-#~ msgid "_Copy..."
-#~ msgstr "_Kopiraj..."
-
 #~ msgid "_Folder Bar"
 #~ msgstr "_Linija direktorijuma"
 
@@ -22078,18 +22825,12 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "_Idi u direktorijum..."
 
-#~ msgid "_Move..."
-#~ msgstr "_Premesti..."
-
 #~ msgid "_New Folder"
 #~ msgstr "_Novi direktorijum"
 
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "_Ukloni direktorijum drugog korisnika"
 
-#~ msgid "_Rename..."
-#~ msgstr "_Preimenuj..."
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Traka sa prečicama"
 
@@ -22102,9 +22843,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Make this Occurrence _Movable"
 #~ msgstr "Neka ova pojava bude _pokretna"
 
-#~ msgid "Information"
-#~ msgstr "Informacija"
-
 #~ msgid "Error"
 #~ msgstr "Greška"