From c7dbb95e79df331a75d7ba49cedc1b8e816422cf Mon Sep 17 00:00:00 2001
From: JP Rosevear <jpr@novell.com>
Date: Wed, 19 May 2004 18:35:59 +0000
Subject: bump version

2004-05-19  JP Rosevear  <jpr@novell.com>

	* configure.in: bump version

svn path=/trunk/; revision=25982
---
 po/sr@Latn.po | 7786 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 4257 insertions(+), 3529 deletions(-)

(limited to 'po/sr@Latn.po')

diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index f6afb14998..3353b1d7bd 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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,6 +25,14 @@ 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"
@@ -48,14 +56,6 @@ msgstr " karte"
 msgid " card"
 msgstr " karta"
 
-#: 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/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Podrazumevana adresa za sinhronizovanje:"
@@ -70,64 +70,20 @@ msgstr "Nisam mogao da učitam adresar"
 msgid "Could not read pilot's Address application block"
 msgstr "Nisam mogao da pročitam programski blok adresa pilota"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Samodopunjavanje"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Sertifikati"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-msgstr "Podesite ovde samodopunjavanje"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakti"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolucija adresar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-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:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Preglednik adresa Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Preglednik Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Deo Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Preglednik direktorijuma Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Upravljanje S/MIME sertifikatima iz Evolucije"
+#: 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:12
-msgid "Evolution folder settings configuration control"
-msgstr "Upravljanje podešavanjem direktorijuma iz Evolucije"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Nisam mogao da se prijavim.\n"
 
-# bug: s/manager/manage/
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "Ovde upravljajte vašim S/MIME sertifikatima"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sUnesi lozinku za %s (korisnik %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -168,41 +124,45 @@ msgstr "_Kontakti:"
 msgid "Create a new contacts group"
 msgstr "Napravi novu grupu prečica"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:483
 msgid "Failed to connect to LDAP server"
 msgstr "Neuspešno povezivanje sa LDAP serverom"
 
-#: addressbook/gui/component/addressbook-config.c:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr "Neuspešna prijava na LDAP server"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr "Nisam mogao da obavim upit na Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr "Server je odgovorio nepodržanim bazama za pretragu"
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Ovaj server ne podržava podatke LDAPv3 šeme"
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Greška u čitanju podataka šeme"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: addressbook/gui/component/addressbook-config.c:1274
 msgid "Server did not respond with valid schema information"
 msgstr "Server nije odgovorio sa ispravnim podacima šeme"
 
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Prenosim..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Prenosim „%s“:"
@@ -210,8 +170,8 @@ msgstr "Prenosim „%s“:"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Na ovom računaru"
 
@@ -219,7 +179,7 @@ msgstr "Na ovom računaru"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Lično"
@@ -285,20 +245,41 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenese vaše direktorijume..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Anonimno pristupam LDAP serveru"
+#: addressbook/gui/component/addressbook-view.c:674
+#, 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.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Nisam mogao da se prijavim.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+msgid "New Address Book"
+msgstr "Novi adresar"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sUnesi lozinku za %s (korisnik %s)"
+#: addressbook/gui/component/addressbook-view.c:762
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
+#: filter/libfilter-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:763
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+msgid "Properties..."
+msgstr "Osobine..."
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/addressbook-view.c:1002
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kontakti"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -319,6 +300,62 @@ 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
 msgid "  S_how Supported Bases "
 msgstr " P_okaži podržane baze "
@@ -340,6 +377,7 @@ msgstr " P_okaži podržane baze "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -411,7 +449,7 @@ msgstr "_Kontakti:"
 msgid "Address Book Properties"
 msgstr "Osobine adresara"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Uvek"
@@ -426,106 +464,96 @@ msgid "Basic"
 msgstr "Osnovno"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "Boje"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Povezujem se"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalji"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Posebno _ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Posebno _ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "Limit za _preuzimanje:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Elektronska adresa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Elektronska adresa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolucija će koristiti ovaj DN za prijavljivanje na server"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolucija će koristiti ovu elektronsku adresu za prijavljivanje na server"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Podržane baze za pretragu"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Opšte"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Nikada"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Jedan"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Izaberite boju"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "Opseg p_retrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "Pretraži bazu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid "Search base:"
 msgstr "Pretraži bazu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Opseg p_retrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Tražim"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -535,7 +563,7 @@ msgstr ""
 "akoi\n"
 "on podržava SSL ili TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -552,7 +580,7 @@ msgstr ""
 "onda nema potrebe da Evolucija koristi SSL/TLS jer je vaša veza već\n"
 "bezbedna."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -564,19 +592,19 @@ msgstr ""
 "znači da će vaša beza biti nesigurna, i da ćete biti ranjivi na sigurnosne\n"
 "napade. "
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Pod"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Podržane baze za pretragu"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -587,7 +615,7 @@ msgstr ""
 "početi. Ako ovo ostavite prazno, pretraga će početi iz korena stabla "
 "direktorijuma."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -601,13 +629,13 @@ msgstr ""
 "\"sub\" će uključiti sve unose ispod vaše baze za pretragu. Opseg pretrage "
 "\"one\" će uključiti samo unose jedan nivo ispod vaše baze.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Ovo je puno ime vašeg ldap servera. Na primer, \"ldap.mojafirma.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -616,7 +644,7 @@ msgstr ""
 "Ovo je najveći broj unosa za preuzimanje. Ako unesete suviše veliki \n"
 "broj, usporićete vaš adresar."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -626,7 +654,7 @@ msgstr ""
 "uključivanje ovoga na \"Email Address\" zahteva anonimni pristup na vaš ldap "
 "server."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -635,7 +663,7 @@ msgstr ""
 "Ovo je ime servera koje će se pojaviti u listi direktorijuma Evolucije.\n"
 "To je samo za potrebe prikazivanja. "
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -647,129 +675,136 @@ msgstr ""
 "je spisak standardnih portova. Pitajte svog sistem administratora\n"
 "koji port da odaberete."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid "This option controls how long a search will be run."
 msgstr "Ova opcija kontroliše koliko će pretraga trajati."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Format za vreme:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "K_oristi SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Koristim posebno ime (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Koristim elektronsku adresu"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Kada je moguće"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontakti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:74
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "_Display name:"
 msgstr "_Ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "Limit za _preuzimanje:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Elektronska adresa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "Metod _prijave:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "Broj _porta:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Važnost:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "Baza _pretrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "Ime _servera:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "S_erver:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Odziv (minuti):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Koristi bezbednu vezu (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "karte"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "jezičak za vezu"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "jezičak za opšte podatke"
 
 # bug: plural-forms
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/alarm-options.glade.h:14
 #: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
 #: mail/mail-config.glade.h:182
 msgid "minutes"
 msgstr "minuta"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "jezičak za pretragu"
 
-#: 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:497
+#: 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/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: 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"
@@ -792,22 +827,15 @@ 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:222
 msgid "Source"
 msgstr "Izvor"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -875,141 +903,141 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:361
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Adresa _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Adresa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "Godi_šnjica:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Pomoćnik"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "Rođenda_n"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Blogče"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalendar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Mesto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Naredba:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor.c:271
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
 #: 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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Urednik kontakata"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Držav_a:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "O_delenje:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "URL za s_lobodan/zauzet:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Puno _ime..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Kuća"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#, fuzzy
+msgid "Home Page:"
+msgstr "Lična stranica"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Job title:"
 msgstr "Naziv _posla:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: calendar/gui/e-itip-control.c:936
 msgid "Location:"
 msgstr "Mesto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN glasnik"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-adresa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Upravnik"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Nadimak:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "Be_leške:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novel Grupvajz"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Drugo"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Poštanski broj:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1037,9 +1065,9 @@ msgstr "Veb stranica:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Posao"
@@ -1072,23 +1100,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+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:319
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 msgid "Address"
 msgstr "Adresa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: addressbook/gui/contact-editor/e-contact-editor.c:292
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Može se menjati"
 
@@ -2061,91 +2105,109 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: 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.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "DŽaber"
 
-#: 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:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: 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-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:347
+#: addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Yahoo"
 msgstr "Jahu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/widgets/eab-contact-display.c:344
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "Grupvajz"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Izvorni adresar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Odredišni adresar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Je novi kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Polja za upis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Promenjen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "Uređivač kategorija nije dostupan."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Ovaj kontakt pripada ovim kategorijama"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Molim izaberite od sledećih opcija"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Sledeće veze su trenutno aktivne:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2738
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nisam mogao da pronađem pomoć đa polje: `%s'"
 
+#: 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"
@@ -2163,22 +2225,6 @@ msgstr "_Puno ime:"
 msgid "E-_mail:"
 msgstr "E-_pošta:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-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:319
-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:"
@@ -2324,8 +2370,8 @@ msgstr "urednik-kontakt-liste"
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:215
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Knjiga"
 
@@ -2386,812 +2432,806 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-msgid "No contacts"
-msgstr "Nema kontakta"
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr "(mapa)"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "%d kontakt"
-msgstr[1] "%d kontakta"
-msgstr[2] "%d kontakata"
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr "mapa"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#: addressbook/gui/widgets/e-minicard-view.c:467
-msgid "Query"
-msgstr "Upit"
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "Ispiši članove"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "Greška kod učitavanja pregleda adresara"
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "E-pošta"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "Model"
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organizacija"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "Greška pri izmeni karte"
+#: addressbook/gui/widgets/eab-contact-display.c:341
+msgid "Position"
+msgstr "Položaj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
-msgid "Name begins with"
-msgstr "Ime počinje sa"
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Groupwise"
+msgstr "Grupvajz"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
-msgid "Email begins with"
-msgstr "E-pošta počinje sa"
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr "Video konferencije"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
-msgid "Category is"
-msgstr "Kategorija je"
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr "Telefon"
 
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
-msgid "Any field contains"
-msgstr "Polje koje sadrži"
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr "Faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Advanced..."
-msgstr "Napredno..."
+#: addressbook/gui/widgets/eab-contact-display.c:354
+msgid "work"
+msgstr "posao"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "Tip"
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr "Beb"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
-msgid "Address Book"
-msgstr "Adresar"
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Blogče"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
-msgstr "Sačuvaj kao VCard"
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobilni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
-msgid "New Contact..."
-msgstr "Nov kontakt..."
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "personal"
+msgstr "lično"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
-msgid "New Contact List..."
-msgstr "Nova lista kontakata..."
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Napomena"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
-msgid "Go to Folder..."
-msgstr "Idi u direktorijum..."
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Uloga na poslu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
-msgid "Import..."
-msgstr "Uvezi..."
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "E-pošta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
-msgid "Search for Contacts..."
-msgstr "Tražim kontakte..."
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Lična stranica"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
-msgid "Address Book Sources..."
-msgstr "Izvori adresara..."
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Uspeh"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
-msgid "Pilot Settings..."
-msgstr "Podešavanja pilota"
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Prosledi kontakt"
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Arhiva nije na mreži"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-msgid "Send Message to Contact"
-msgstr "Pošalji kontaktu poruku"
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "Address Book does not exist"
+msgstr "Adresar ne postoji"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 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"
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Nova kontakt lista"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-msgid "Print Envelope"
-msgstr "Štampaj koverat"
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Permission denied"
+msgstr "Zabranjen pristup"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
-msgid "Copy to Address Book..."
-msgstr "Umnoži u adresar..."
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "Kontakt nije pronađen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
-msgid "Move to Address Book..."
-msgstr "Prebaci u adresar..."
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr "IB kontakta već postoji"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Iseci"
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "Protokol nije podržan"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Umnoži"
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Ubaci"
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Ne mogu da otvorim izvor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: filter/libfilter-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"
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Prijava neuspela"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
-msgid "Current View"
-msgstr "Trenutan pogled"
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Prijava obavezna"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Osnovni proces adresara za\n"
-"%s\n"
-"je pao. Moraćete da ponovo pokrenete Evoluciju kako bi nastavili\n"
-"da je koristite"
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr "TLS nije dostupan"
 
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
-#: calendar/gui/cal-search-bar.c:362
-msgid "Any Category"
-msgstr "Bilo koja kategorija"
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:68
+#, fuzzy
+msgid "No such source"
+msgstr "Nema takve poruke"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "Pomoćnik"
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Druga greška"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Telefon asistenta"
+#: addressbook/gui/widgets/eab-gui-util.c:103
+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/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Poslovni faks"
+#: 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 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/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "Telefon na poslu"
+#: addressbook/gui/widgets/eab-gui-util.c:115
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution you must compile the program from the CVS "
+"sources after retrieving OpenLDAP from the link below."
+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/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "Telefon na poslu 2"
+#: addressbook/gui/widgets/eab-gui-util.c:124
+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/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "Povratni telefon"
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr "Ne mogu da otvorim adresar"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "Telefon u kolima"
+#: addressbook/gui/widgets/eab-gui-util.c:162
+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/e-addressbook-view.etspec.h:8
-msgid "Categories"
-msgstr "Kategorije"
+#: addressbook/gui/widgets/eab-gui-util.c:168
+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/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "Telefon firme"
+#: addressbook/gui/widgets/eab-gui-util.c:174
+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/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "E-pošta"
+#: addressbook/gui/widgets/eab-gui-util.c:177
+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/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "E-pošta 2"
+#: addressbook/gui/widgets/eab-gui-util.c:180
+msgid "This query did not complete successfully."
+msgstr "Ovaj upit nije uspešno završen."
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "E-pošta 3"
+#: addressbook/gui/widgets/eab-gui-util.c:206
+msgid "Do you want to save changes?"
+msgstr "Želite li da sačuvate promene?"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Family Name"
-msgstr "Prezime"
+#: addressbook/gui/widgets/eab-gui-util.c:208
+msgid "_Discard"
+msgstr "_Odbaci"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "File As"
-msgstr "Smesti kao"
+#: addressbook/gui/widgets/eab-gui-util.c:229
+msgid "Error adding list"
+msgstr "Greška kod dodavanja liste"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Given Name"
-msgstr "Dato ime"
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+msgid "Error adding contact"
+msgstr "Greška kod dodavanja kontakta"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "Kućni faks"
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Greška kod izmene liste"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "Kućni telefon"
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Greška pri izmeni kontakta"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone 2"
-msgstr "Kućni telefon 2"
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "Greška kod uklanjanja liste"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "ISDN Phone"
-msgstr "ISDN telefon"
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr "Greška kod uklanjanja kontakta"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Journal"
-msgstr "Dnevnik"
+# bug: plural-forms
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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/e-addressbook-view.etspec.h:22
-msgid "Manager"
-msgstr "Upravnik"
+#: addressbook/gui/widgets/eab-gui-util.c:360
+#, 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/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Mobilni telefon"
+#: addressbook/gui/widgets/eab-gui-util.c:364
+msgid "Overwrite"
+msgstr "Prepiši"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "Nadimak"
+#: addressbook/gui/widgets/eab-gui-util.c:400
+#, c-format
+msgid "Error saving %s: %s"
+msgstr "Greška kod čuvanja %s: %s"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Napomena"
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:437
+msgid "card.vcf"
+msgstr "karta.vcf"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "Kancelarija"
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "lista"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organizacija"
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Premesti kontakt u"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "Drugi faks"
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Umnoži kontakt u"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Drugi telefon"
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Premesti kontakte u"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "Pejdžer"
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Umnoži kontakte u"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "Glavni telefon"
+#: addressbook/gui/widgets/eab-gui-util.c:716
+msgid "Select target addressbook."
+msgstr "Izaberite odredišni adresar."
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Radio"
-msgstr "Radio"
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Višestruke VCards"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Uloga"
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard za %s"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Spouse"
-msgstr "Supružnik"
+#.
+#. * 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/e-addressbook-view.etspec.h:35
-msgid "TTYTDD"
-msgstr "TTYTDD"
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Osnovna E-pošta"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Telex"
-msgstr "Teleks"
+#: 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/e-addressbook-view.etspec.h:37
-msgid "Title"
-msgstr "Naziv"
+#: 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/e-addressbook-view.etspec.h:38
-msgid "Unit"
-msgstr "Jedinica"
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Odaberi akciju"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Web Site"
-msgstr "Internet adresa"
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Unesi novi kontakt \"%s\""
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:137
-msgid "Width"
-msgstr "Širina"
+#: 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/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:144
-msgid "Height"
-msgstr "Visina"
+#: addressbook/gui/widgets/eab-popup-control.c:870
+msgid "Querying Address Book..."
+msgstr "Pretražujem adresar..."
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:152
-msgid "Has Focus"
-msgstr "Ima fokus"
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Promeni podatke o kontaktu"
 
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Polje"
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Spoji elektronske adrese"
 
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Ime polja"
+#: 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/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Model teksta"
+#: 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/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Najveća dužina imena polja"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Širina kolone"
-
-#: addressbook/gui/widgets/e-minicard-view.c:142
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Nema stavki koje sada treba prikazati.\n"
-"\n"
-"Kliknite dva puta da napravite novi kontakt."
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Prikaži sažetu vizit kartu"
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"Nema šta da se pokaže u ovom pogledu."
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Sačuvaj u adresaru"
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
-msgid "Adapter"
-msgstr "Adapter"
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+msgid "No contacts"
+msgstr "Nema kontakta"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Odabrano"
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d kontakt"
+msgstr[1] "%d kontakta"
+msgstr[2] "%d kontakata"
 
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Ima kursor"
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+msgid "Query"
+msgstr "Upit"
 
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr "(mapa)"
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "Greška kod učitavanja pregleda adresara"
 
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr "mapa"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+msgid "Model"
+msgstr "Model"
 
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "Ispiši članove"
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Greška pri izmeni karte"
 
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "E-pošta"
+#: addressbook/gui/widgets/e-addressbook-view.c:161
+msgid "Name begins with"
+msgstr "Ime počinje sa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:301
-msgid "Position"
-msgstr "Položaj"
+#: addressbook/gui/widgets/e-addressbook-view.c:162
+msgid "Email begins with"
+msgstr "E-pošta počinje sa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-msgid "Groupwise"
-msgstr "Grupvajz"
+#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: calendar/gui/cal-search-bar.c:57
+msgid "Category is"
+msgstr "Kategorija je"
 
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr "Video konferencije"
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: calendar/gui/cal-search-bar.c:50
+msgid "Any field contains"
+msgstr "Polje koje sadrži"
 
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr "Telefon"
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+msgid "Advanced..."
+msgstr "Napredno..."
 
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr "Faks"
+#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Tip"
 
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr "posao"
+#: addressbook/gui/widgets/e-addressbook-view.c:506
+msgid "Address Book"
+msgstr "Adresar"
 
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr "Beb"
+#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Save as VCard..."
+msgstr "Sačuvaj kao VCard"
 
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Blogče"
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
+msgid "New Contact..."
+msgstr "Nov kontakt..."
 
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr "lično"
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+msgid "New Contact List..."
+msgstr "Nova lista kontakata..."
 
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Uloga na poslu"
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
+msgid "Go to Folder..."
+msgstr "Idi u direktorijum..."
 
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Lična stranica"
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
+msgid "Import..."
+msgstr "Uvezi..."
 
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Uspeh"
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
+msgid "Search for Contacts..."
+msgstr "Tražim kontakte..."
 
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
+msgid "Address Book Sources..."
+msgstr "Izvori adresara..."
 
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Arhiva nije na mreži"
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
+msgid "Pilot Settings..."
+msgstr "Podešavanja pilota"
 
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Address Book does not exist"
-msgstr "Adresar ne postoji"
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Prosledi kontakt"
 
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Nova kontakt lista"
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+msgid "Send Message to Contact"
+msgstr "Pošalji kontaktu poruku"
 
-#. 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"
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 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"
 
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Kontakt nije pronađen"
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
+msgid "Print Envelope"
+msgstr "Štampaj koverat"
 
-#. 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"
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
+msgid "Copy to Address Book..."
+msgstr "Umnoži u adresar..."
 
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protokol nije podržan"
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
+msgid "Move to Address Book..."
+msgstr "Prebaci u adresar..."
 
-#. 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-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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"
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Iseci"
 
-#. 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"
+#: addressbook/gui/widgets/e-addressbook-view.c:1084
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Umnoži"
 
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Prijava neuspela"
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Ubaci"
 
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Prijava obavezna"
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1277
+msgid "Current View"
+msgstr "Trenutan pogled"
 
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr "TLS nije dostupan"
+#: addressbook/gui/widgets/e-addressbook-view.c:1309
+#, c-format
+msgid ""
+"The addressbook backend for\n"
+"%s\n"
+"has crashed. You will have to restart Evolution in order to use it again"
+msgstr ""
+"Osnovni proces adresara za\n"
+"%s\n"
+"je pao. Moraćete da ponovo pokrenete Evoluciju kako bi nastavili\n"
+"da je koristite"
 
-#. 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"
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
+#: calendar/gui/cal-search-bar.c:362
+msgid "Any Category"
+msgstr "Bilo koja kategorija"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Druga greška"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "Pomoćnik"
 
-#: addressbook/gui/widgets/eab-gui-util.c:102
-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/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "Telefon asistenta"
 
-#: 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 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/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "Poslovni faks"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
-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/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "Telefon na poslu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:123
-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/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "Telefon na poslu 2"
 
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Ne mogu da otvorim adresar"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "Povratni telefon"
 
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "Telefon u kolima"
 
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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/e-addressbook-view.etspec.h:8
+msgid "Categories"
+msgstr "Kategorije"
 
-#: addressbook/gui/widgets/eab-gui-util.c:173
-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/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr "Telefon firme"
 
-#: addressbook/gui/widgets/eab-gui-util.c:176
-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/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Prezime"
 
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr "Ovaj upit nije uspešno završen."
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "File As"
+msgstr "Smesti kao"
 
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Želite li da sačuvate promene?"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Given Name"
+msgstr "Dato ime"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Odbaci"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Kućni faks"
 
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Greška kod dodavanja liste"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "Kućni telefon"
 
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Greška kod dodavanja kontakta"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr "Kućni telefon 2"
 
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Greška kod izmene liste"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "ISDN Phone"
+msgstr "ISDN telefon"
 
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Greška pri izmeni kontakta"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Journal"
+msgstr "Dnevnik"
 
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Greška kod uklanjanja liste"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "Upravnik"
 
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Greška kod uklanjanja kontakta"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Nadimak"
 
-# bug: plural-forms
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "Kancelarija"
 
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, 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/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Drugi faks"
 
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Prepiši"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "Drugi telefon"
 
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Greška kod čuvanja %s: %s"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Pejdžer"
 
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr "karta.vcf"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "Glavni telefon"
 
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "lista"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Radio"
 
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Premesti kontakt u"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Uloga"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Umnoži kontakt u"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Spouse"
+msgstr "Supružnik"
 
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Premesti kontakte u"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+msgid "TTYTDD"
+msgstr "TTYTDD"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Umnoži kontakte u"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "Teleks"
 
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr "Izaberite odredišni adresar."
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "Naziv"
 
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Višestruke VCards"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+msgid "Unit"
+msgstr "Jedinica"
 
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard za %s"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Web Site"
+msgstr "Internet adresa"
 
-#.
-#. * 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/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
+msgid "Width"
+msgstr "Širina"
 
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Osnovna E-pošta"
+#: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
+msgid "Height"
+msgstr "Visina"
 
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Odaberi akciju"
+#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
+msgid "Has Focus"
+msgstr "Ima fokus"
 
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Unesi novi kontakt \"%s\""
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Odabrano"
 
-#: 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/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Ima kursor"
 
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Pretražujem adresar..."
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "Polje"
 
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Promeni podatke o kontaktu"
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "Ime polja"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Spoji elektronske adrese"
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "Model teksta"
 
-#: 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/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "Najveća dužina imena polja"
 
-#: 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/e-minicard-view.c:142
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Nema stavki koje sada treba prikazati.\n"
+"\n"
+"Kliknite dva puta da napravite novi kontakt."
 
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Prikaži sažetu vizit kartu"
+#: addressbook/gui/widgets/e-minicard-view.c:145
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Nema šta da se pokaže u ovom pogledu."
 
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Sačuvaj u adresaru"
+#: addressbook/gui/widgets/e-minicard-view.c:453
+msgid "Adapter"
+msgstr "Adapter"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Širina kolone"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3232,13 +3272,8 @@ msgid "Evolution VCard importer"
 msgstr "Evolucija VCard uvoznik"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-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"
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
 
 #: addressbook/printing/e-contact-print.c:998
 msgid "Print contacts"
@@ -3249,6 +3284,11 @@ 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"
@@ -3433,16 +3473,6 @@ 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:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
-msgid "Can not open file"
-msgstr "Ne mogu da otvorim datoteku"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Ne mogu da učitam adresu"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Navedite izlaznu datoteku umesto standardnog izlaza"
@@ -3501,6 +3531,16 @@ 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:629
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+msgid "Can not open file"
+msgstr "Ne mogu da otvorim datoteku"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+msgid "Can not load URI"
+msgstr "Ne mogu da učitam adresu"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Greška kod učitavanja predefinisanog adresara."
@@ -3513,11 +3553,12 @@ msgstr "Ulazna datoteka"
 msgid "No filename provided."
 msgstr "Ime datoteke nije dato."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Lista bez imena"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Unesite lozinku"
 
@@ -3549,117 +3590,55 @@ msgstr "Predefinisan prioritet:"
 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 "Calendar and Tasks"
-msgstr "Kalendar i zadaci"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Kalendari"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-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:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolucija kalendar i zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Kontrola podešavanja Evolucija kalendara"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Preglednik zakazanih poruka Evolucija kalendara"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Preglednik Evolucija kalendara"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Urednik Evolucija kalendara/zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Preglednik Evolucija 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:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-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:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Pokrećem:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Obustavljam:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolucija alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm na %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "Z_atvori"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Dre_maj"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Vreme dremanja (minuti)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Izmeni sastanak"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "Dre_maj"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Otvori"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Odbaci"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Odbaci sve"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Nema opisa."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3672,12 +3651,12 @@ msgstr ""
 "Počinje u %s\n"
 "Završava se u %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: calendar/gui/alarm-notify/alarm-queue.c:1073
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3689,7 +3668,7 @@ msgstr ""
 "podsetnik podešen da pošalje poruku. Evolucija će\n"
 "umesto toga pokazati normalan prozor za dijalog."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3706,19 +3685,19 @@ msgstr ""
 "\n"
 "Sigurno hoćete da pokrenete ovaj program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovo za ovaj program."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: 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"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Nisam mogao da učitam  gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Nisam mogao da pokrenem stvaranje servisa za alarm obaveštenja"
 
@@ -3827,56 +3806,42 @@ msgid "Weekday the week starts on"
 msgstr "Dan u nedelji kojim počinje nedelja"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Whether or not to use the notification tray for display alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Da li da tražim potvrdu pre brisanja sastanaka"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Da li da tražim potvrdu pre uklanjanja direktorijuma"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Da li da sakrivam izvršena zaduženja"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "Da li da postavim podrazumevani podsetnik za događaje"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Da li da prikazujem vreme u 24č obliku umesto am/pm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 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:51
-msgid "Summary contains"
-msgstr "Sažetak sadrži"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Opis sadrži"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Komentar sadrži"
-
-#: calendar/gui/cal-search-bar.c:56
-msgid "Location contains"
-msgstr "Putanja sadrži"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Neraspodeljeno"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
+#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/gnome-cal.c:1703
 #: camel/providers/groupwise/camel-gw-listener.c:304
 #: camel/providers/groupwise/camel-gw-listener.c:327
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -3887,118 +3852,128 @@ msgstr ""
 "\n"
 "Stvarno da brišem ove zadatke?"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Obriši događaje starije od"
 
-#: calendar/gui/calendar-commands.c:362
+#: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
 #: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
 msgid "days"
 msgstr "dana"
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
+#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:509
+#: calendar/gui/calendar-component.c:514 calendar/gui/calendar-component.c:516
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
+#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-component.c:528 calendar/gui/calendar-component.c:535
+#: calendar/gui/calendar-component.c:541 calendar/gui/calendar-component.c:543
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:464
+#: calendar/gui/calendar-commands.c:465 calendar/gui/calendar-component.c:533
 #: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Kalendar „%s“ će biti uklonjen. Sigurno želite da nastavite?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Osobine..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Učitavam kalendar..."
 
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Ne mogu da otvorim kalendar „%s“ radi pravljenja događaja i sastanaka"
 
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:929
 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:836
+#: 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:1095
+#: 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
 msgid "New appointment"
 msgstr "Novi zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "Zakazani _sastanak"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Zakaži sastanak"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Sačini novi zahtev za sastanak"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "Novi celodnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Celo_dnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Sačini novi celodnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "K_alendar"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Napravi novi kalendar"
 
@@ -4028,15 +4003,35 @@ msgstr "Nedeljni pregled"
 msgid "Month View"
 msgstr "Mesečni pregled"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Sažetak sadrži"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Opis sadrži"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Komentar sadrži"
+
+#: calendar/gui/cal-search-bar.c:56
+msgid "Location contains"
+msgstr "Putanja sadrži"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Neraspodeljeno"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Greška kod otvaranja kalendara"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Metod nije podržan kod otvaranja kalendara"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Zabranjen pristup kalendaru"
 
@@ -4045,19 +4040,6 @@ msgstr "Zabranjen pristup kalendaru"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Nisam mogao da otvorim direktorijum u '%s"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI koju će kalendar pokazati"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Tip pogleda za prikaz"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Opcije za zvučni alarm"
@@ -4124,7 +4106,7 @@ msgstr "pokaži još na svakih"
 msgid "hours"
 msgstr "sati"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Dejstvo/pokreni"
 
@@ -4143,71 +4125,166 @@ msgstr "Osnove"
 msgid "Date/Time:"
 msgstr "Datum/Vreme:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Pokaži poruku"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Pusti zvuk"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Podsetnici"
+#: calendar/gui/dialogs/alarm-page.glade.h:5 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
+msgid "Run a program"
+msgstr "Pokreni program"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8 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:927 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Zaključak:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+msgid "_Options..."
+msgstr "_Opcije..."
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+msgid "after"
+msgstr "nakon"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:12
+msgid "before"
+msgstr "pre"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "dan(a)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+msgid "end of appointment"
+msgstr "kraj zakazanog sastanka"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "hour(s)"
+msgstr "sat(a)"
+
+# bug: plural-forms
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:21
+msgid "minute(s)"
+msgstr "minut(a)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17
+msgid "start of appointment"
+msgstr "početak zakazanog sastanka"
+
+#: calendar/gui/dialogs/calendar-setup.c:170
+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:178
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Putanja izvora „%s“ nije ispravnog oblika."
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, 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:265
+#, 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:278
+#, 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
+msgid "Calendar Properties"
+msgstr "Osobine kalendara"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "Pokreni program"
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+msgid "Pick a color"
+msgstr "Izaberite boju"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr "Pošalji elektronsku poruku"
+#: calendar/gui/dialogs/calendar-setup.glade.h:8
+msgid "Remote"
+msgstr "Udaljeni"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Zaključak:"
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "Task List Properties"
+msgstr "Osobine spiska zaduženja"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Opcije..."
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Dodaj novi kalendar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
-msgid "after"
-msgstr "nakon"
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Dodaj grupu..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
-msgid "before"
-msgstr "pre"
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+msgid "_Refresh Interval:"
+msgstr "_Vreme između osvežavanja:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
-msgid "day(s)"
-msgstr "dan(a)"
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Osveži"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
-msgid "end of appointment"
-msgstr "kraj zakazanog sastanka"
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
+msgid "_Source URL:"
+msgstr "_Izvorna adresa:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
-msgid "hour(s)"
-msgstr "sat(a)"
+#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#, fuzzy
+msgid "_Type:"
+msgstr "Tip:"
 
-# bug: plural-forms
-#: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
-msgid "minute(s)"
-msgstr "minut(a)"
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "_Adresa:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
-msgid "start of appointment"
-msgstr "početak zakazanog sastanka"
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "nedelje"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
 msgid "Enabled"
 msgstr "Omogućeno"
 
@@ -4221,19 +4298,19 @@ msgstr "Ne uklanjaj"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
 msgid "Disable"
 msgstr "Onemogući"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
 msgid "Enable"
 msgstr "Omogući"
 
@@ -4259,162 +4336,174 @@ msgid "60 minutes"
 msgstr "60 minuta"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Upozorenja"
+msgid "<b>Alerts</b>"
+msgstr "<b>Uzbune</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Podsetnici</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "<b>Task List</b>"
+msgstr "<b>Spisak zaduženja</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Onda</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "<b>Radna nedelja</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Podešavanja kalendara i zaduženja"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Boja neizvršenih zaduženja"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Color for tasks due today"
 msgstr "Boja zaduženja za danas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Kraj _dana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Dani"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Prikaži"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "O_mogući"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+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/e-itip-control.c:563
 msgid "Friday"
 msgstr "Petak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Sati"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minuti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Ponedeljak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "N_ed"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Subota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "Po_kaži podsetnik"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Pokaži _brojeve nedelja u navigatoru za datume"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Nedelja"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "Z_adaci za danas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "U_to"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Spisak zaduženja"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Četvrtak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Vreme"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Vremenska zona:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Format za vreme:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "Početak n_edelje:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Sreda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Radna nedelja"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Radni dani:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 očasovni (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24-očasovni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "Dodaj _adresu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Traži potvrdu za brisanje podataka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Skupi nedelje u mesečni prikaz"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "Početak _dana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Prikaži"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
 #: mail/mail-config.glade.h:160 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
@@ -4424,138 +4513,45 @@ msgstr "_Prikaži"
 msgid "_Edit"
 msgstr "_Izmeni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr "_Objava stanja slobodan/zauzet"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "_Fri"
-msgstr "_Pet"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Opšte"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "_Hide completed tasks after"
-msgstr "_Sakrij ispunjena zaduženja nakon"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Mon"
-msgstr "_Pon"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "_Overdue tasks:"
-msgstr "_Neispunjena zaduženja:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "_Sat"
-msgstr "_Sub"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "_Show appointment end times in week and month views"
-msgstr "_Pokaži završetke zakazanih sastanaka u nedeljnim i mesečnim prikazima"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "_Time divisions:"
-msgstr "Podela _vremena:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "_Tue"
-msgstr "_Uto"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-msgid "_Wed"
-msgstr "_Sre"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "before every appointment"
-msgstr "pre svakog zakazanog sastanka"
-
-#: calendar/gui/dialogs/calendar-setup.c:166
-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:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Putanja izvora „%s“ nije ispravnog oblika."
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, 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:234
-#, 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:247
-#, 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:5
-msgid "Calendar Properties"
-msgstr "Osobine kalendara"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Udaljeni"
+msgid "_Fri"
+msgstr "_Pet"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Osobine spiska zaduženja"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "_Hide completed tasks after"
+msgstr "_Sakrij ispunjena zaduženja nakon"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Dodaj novi kalendar"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+msgid "_Mon"
+msgstr "_Pon"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Dodaj grupu..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "_Overdue tasks:"
+msgstr "_Neispunjena zaduženja:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Vreme između osvežavanja:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+msgid "_Sat"
+msgstr "_Sub"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Osveži"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "_Show appointment end times in week and month views"
+msgstr "_Pokaži završetke zakazanih sastanaka u nedeljnim i mesečnim prikazima"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Izvorna adresa:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+msgid "_Time divisions:"
+msgstr "Podela _vremena:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
-#, fuzzy
-msgid "_Type:"
-msgstr "Tip:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+msgid "_Tue"
+msgstr "_Uto"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "_Adresa:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+msgid "_Wed"
+msgstr "_Sre"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "nedelje"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+msgid "before every appointment"
+msgstr "pre svakog zakazanog sastanka"
 
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
@@ -4637,81 +4633,81 @@ 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-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/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Nisam mogao da osvežim promenama objekat"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Izmeni zakazani sastanak"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zakazani sastanak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Zaduženje - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Unos u dnevnik - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Nema sažetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Sačuvaj kao..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: calendar/gui/dialogs/comp-editor.c:1479
+#: calendar/gui/dialogs/comp-editor.c:1514
+#: calendar/gui/dialogs/comp-editor.c:1540
 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 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"
@@ -4835,27 +4831,27 @@ msgstr "Delegiraj za:"
 msgid "Enter Delegate"
 msgstr "Unesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Zakazani sastanak"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Podsetnik"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Povraćaj"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Zakazivanje"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: 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
 msgid "Meeting"
 msgstr "Sastanak"
 
@@ -4867,7 +4863,7 @@ msgstr "Događaj bez početnog datuma"
 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:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Početni datum je pogrešan"
 
@@ -4953,10 +4949,10 @@ 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:3
-#: calendar/gui/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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:1559
+#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
 #: 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
@@ -4975,15 +4971,15 @@ msgstr "Zahteva organizator."
 msgid "At least one attendee is required."
 msgstr "Najmanje jedan prisutni je potreban."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Delegiraj za..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
+#: mail/em-folder-tree.c:2557 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
@@ -5257,24 +5253,19 @@ msgstr "_Zanemari promene"
 msgid "Save Event"
 msgstr "Sačuvaj događaj"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
-msgid "Select source"
-msgstr "Izaberite izvor"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
+#: calendar/gui/dialogs/select-source-dialog.c:65
+#, fuzzy
+msgid "Select destination"
 msgstr "Izaberite odredište %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "kalendar"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+#, fuzzy
+msgid "_Destination"
+msgstr "Odredišni direktorijum:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
-msgstr "spisak zaduženja"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Spisak zaduženja"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5302,38 +5293,44 @@ msgid "% _Complete"
 msgstr "% _gotovo"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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
 msgid "Completed"
 msgstr "Gotovo"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Visok"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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/print.c:2343
 msgid "In Progress"
 msgstr "U toku"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Nizak"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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:957
 msgid "Normal"
 msgstr "Običan"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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
 msgid "Not Started"
 msgstr "Nije pokrenut"
 
@@ -5368,11 +5365,11 @@ msgstr "_Veb stranica:"
 msgid "Assignment"
 msgstr "Zadatak"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Datum za završetak je pogrešan"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ne mogu da otvorim zaduženja u „%s“."
@@ -5381,8 +5378,9 @@ msgstr "Ne mogu da otvorim zaduženja u „%s“."
 msgid "Con_fidential"
 msgstr "Pov_erljivo"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-cal-component-preview.c:268
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Opis:"
@@ -5531,101 +5529,53 @@ msgstr "%s na %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretača"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Javno"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Lično"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Poverljivo"
-
-#: 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"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-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-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "Kliknite da otvorite %s"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "J"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Bez imena"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "I"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Datum početka:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "Z"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Datum završetka:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-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"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Stanje:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+msgid "Priority:"
+msgstr "Važnost:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ne"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Veb stranica:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 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:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Nepoznato"
+#: 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-model.c:872
-msgid "Recurring"
-msgstr "Povratno"
+#: 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-model.c:874
-msgid "Assigned"
-msgstr "Dodeljeno"
+#: 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-calendar-table.c:396
 msgid "0%"
@@ -5671,17 +5621,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: 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
 msgid "Deleting selected objects"
 msgstr "Brišem izabrane objekte"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Otvori"
 
@@ -5690,41 +5649,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
+#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
+#: calendar/gui/e-calendar-view.c:1374 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:124
+#: 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:1282 calendar/gui/e-calendar-view.c:1325
+#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
+#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
+#: mail/message-list.c:1644 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
+#: calendar/gui/e-calendar-view.c:1372 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Umet_ni"
 
@@ -5779,75 +5739,154 @@ msgstr "Prioritet"
 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
 msgid "Task sort"
 msgstr "Razvrstana zaduženja"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Nov zakazan _sastanak..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _događaj"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Novo zaduženje"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Izaberi _nit"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Izaberi..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi slobodan/zauzet informaciju"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 msgid "Cop_y to Calendar..."
 msgstr "Kop_iraj u kalendar..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 msgid "Mo_ve to Calendar..."
 msgstr "Prene_si u kalendar..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Prosledi kao iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Idi na _danas"
 
-#: calendar/gui/e-calendar-view.c:1333
-msgid "_Go to Date..."
-msgstr "_Idi na datum..."
+#: calendar/gui/e-calendar-view.c:1348
+msgid "_Go to Date..."
+msgstr "_Idi na datum..."
+
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+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:967 calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-meeting-list-view.c:144
+#: calendar/gui/e-meeting-list-view.c:158 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:168 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:169 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:629
+msgid "E"
+msgstr "I"
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "_Podešavanja..."
+#: 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
@@ -5872,36 +5911,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: 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: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"
 
 #. 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-top-item.c:690 calendar/gui/e-day-view.c:1572
+#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
 #: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: 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:821 calendar/gui/e-week-view.c:596
-#: 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"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6019,10 +6058,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Ništa</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Stanje:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6052,7 +6087,7 @@ msgstr "Ažuriraj"
 #: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
 #: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
 #: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6265,59 +6300,55 @@ msgstr "Prilog ne sadrži ispravnu poruku za kalendar"
 msgid "The attachment has no viewable calendar items"
 msgstr "Prilog nema delove kalendara koji se mogu pregledati"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Datoteka kalendara nije mogla biti ažurirana\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Ažuriranje završeno\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 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:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 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:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Objekat nije mogao biti pronađen\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Ažurirano stanje prisutnog\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Stanje prisutnog nije moglo biti ažurirano!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Uklanjanje završeno"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Unos poslat!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Unos nije mogao biti poslat!\n"
 
@@ -6434,28 +6465,6 @@ 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:2060
-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:2093 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"
@@ -6516,7 +6525,34 @@ msgstr "_Početno vreme sastanka:"
 msgid "Meeting _end time:"
 msgstr "_Krajnje vreme sastanka:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6525,24 +6561,22 @@ msgstr ""
 "Greška na %s:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
-#, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
+#, fuzzy, c-format
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 "Mašinerija zaduženja za \n"
 "%s\n"
 " je pukla."
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otvaram zaduženja u %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6551,38 +6585,47 @@ msgstr ""
 "Greška pri otvaranju %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "Učitavam zaduženja"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Ispunjavam zaduženja..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Brišem izabrane objekte..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Izbacujem"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
+#: calendar/gui/tasks-component.c:648 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:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Učitavam zakazane sastanke sa %s"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Učitavam zaduženja sa %s"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaram %s"
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
@@ -6590,18 +6633,60 @@ msgstr ""
 "%s\n"
 " je pukla"
 
-#: calendar/gui/gnome-cal.c:1953
-#, fuzzy, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-"Mašinerija zaduženja za \n"
-"%s\n"
-" je pukla."
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 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"
@@ -6747,6 +6832,23 @@ msgstr "Rođendani i godišnjice"
 msgid "On The Web"
 msgstr "Na vebu"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:737
+#, fuzzy, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "Ne mogu da otvorim kalendar „%s“."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Ne mogu da otvorim zaduženja u „%s“."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1."
@@ -6966,7 +7068,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:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Štampaj prikaz"
 
@@ -6978,69 +7080,81 @@ msgstr "Štampaj unos"
 msgid "Print Setup"
 msgstr "Podesi štampu"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "Spisak zaduženja „%s“ će biti ukloljen. Sigurno želite da nastavite?"
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Novi spisak zaduženja"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d karata"
+msgstr[1] "%d karata"
+msgstr[2] "%d karata"
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "%d izabranih"
+msgstr[1] "%d izabranih"
+msgstr[2] "%d izabranih"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Učitavam zaduženja"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Ne mogu da otvorim spisak zaduženja „%s“ radi dodavanja novih događaja i "
 "sastanaka"
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr "Nijedan kalendar nije dostupan za dodavanje zaduženja"
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Novo zaduženje"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Zaduženje"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Unesi novo zaduženje"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Diskusione grupe"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Grupa spiska zaduženja"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Unesi novo zaduženje"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "Adresa direktorijuma zaduženja za prikaz"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Nisam mogao da učitam zaduženja u `%s"
-
-#: calendar/gui/tasks-control.c:478
+#: calendar/gui/tasks-control.c:367
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -7052,11 +7166,11 @@ msgstr ""
 "\n"
 "Stvarno da brišem ove zadatke?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Ne pitaj me ponovo."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Štampaj zaduženja"
 
@@ -8704,7 +8818,7 @@ msgstr "Umnoži sadržaj direktorijuma u lokalu za nepovezani rad"
 msgid "Downloading new messages for offline mode"
 msgstr "Preuzimam nove poruke u nepovezanom režimu"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Pripremam direktorijum '%s' za rad bez mreže"
@@ -8797,33 +8911,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-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Ne mogu da prosledim izraz za pretragu: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Greška kod izvršavanja izraza za pretragu: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(odgovara-sve) zahteva samo jedan logički rezultat"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Izvršavam pretragu na nepoznato zaglavlje: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8855,7 +8942,52 @@ msgstr "Učenje đubreta i ne-đubreta od poruka"
 msgid "Filtering new message(s)"
 msgstr "Filtriram nove poruke"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Ne mogu da prosledim izraz za pretragu: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Greška kod izvršavanja izraza za pretragu: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(odgovara-sve) zahteva samo jedan logički rezultat"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
+msgid "(match-threads) requires a match type string"
+msgstr ""
+
+#: camel/camel-folder-search.c:785
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(odgovara-sve) zahteva samo jedan logički rezultat"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(odgovara-sve) zahteva samo jedan logički rezultat"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Izvršavam pretragu na nepoznato zaglavlje: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8866,15 +8998,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Nisam mogao da pročitam gpg userid podsetnik."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nisam mogao da pročitam zahtev za gpg lozinkom"
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8883,27 +9015,27 @@ msgstr ""
 "Potrebna vam je lozinka za otključavanje ključa\n"
 "korisnika: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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 mail/mail-ops.c:706
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Poništeno."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 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:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočekivan odgovor od GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nisam mogao da šifriram: nisu označeni ispravni primaoci. "
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8914,82 +9046,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nisam mogao da primenim GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 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:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
+#: camel/camel-gpg-context.c:1753
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nisam mogao da izvršim gpg: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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
 msgid "Failed to execute gpg."
 msgstr "Nisam mogao da izvršim gpg."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Ovo je deo poruke sa digitalnim potpisom"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ne mogu da proverim potpis poruke: neispravan oblik poruke"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, 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:1493
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "Nisam mogao da obrazujem podatke za šifrovanje: %s"
-
-#: camel/camel-gpg-context.c:1551
-msgid "This is a digitally encrypted message part"
-msgstr "Ovo je digitalno šifrovan deo poruke"
-
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
-msgid "Encrypted content"
-msgstr "Šifrovan sadržaj"
-
-#: camel/camel-gpg-context.c:1652
-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
+#: camel/camel-gpg-context.c:1506
 #, c-format
-msgid "Could not lock '%s'"
-msgstr "Nisam mogao da zaključam '%s"
+msgid "Could not generate encrypting data: %s"
+msgstr "Nisam mogao da obrazujem podatke za šifrovanje: %s"
+
+#: camel/camel-gpg-context.c:1564
+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
+msgid "Encrypted content"
+msgstr "Šifrovan sadržaj"
+
+#: camel/camel-gpg-context.c:1680
+msgid "Unable to parse message content"
+msgstr "Ne mogu da raščlanim sadržaj poruke"
 
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
@@ -9013,6 +9124,27 @@ 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"
@@ -9263,7 +9395,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Loš odgovor na prijavu od servera."
 
@@ -9463,7 +9595,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "Sertifikat za ši_frovanje:"
 
 #: camel/camel-smime-context.c:360
@@ -9480,7 +9612,7 @@ msgstr "Nisam mogao da napravim S/MIME kontekst za dešifriranje."
 msgid "Failed to add data to CMS encoder"
 msgstr "Neuspešno dodavanje u lokalni direktorijum Poslato: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Nisam mogao da se prijavim.\n"
@@ -9546,99 +9678,99 @@ msgstr "Ne mogu da napravim direktorijum: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Ne mogu da dobijem poruku %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Neuspeo potpis sertifikata"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Ispravan potpis"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Potpisao: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "Neuspela DATA komanda"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Nisam mogao da nađem sertifikat za \"%s\"."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Nisam mogao da nađem opšti bulk algoritam."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Na_pravi pravilo od poruke"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: 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:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Neuspešno slanje korisničkog imena serveru"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Komanda nije podržana"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9655,16 +9787,26 @@ msgstr "Ne mogu da napravim direktorijum „%s“: direktorijum postoji"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne mogu da napravim direktorijum: neispravna operacija"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Ne mogu da napravim direktorijum „%s“: direktorijum postoji"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne mogu da obrišem direktorijum: %s: neispravna operacija"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Ne mogu da promenim ime  direktorijumu: %s: neispravna operacija"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Smeće"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Đubre"
@@ -9785,7 +9927,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:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9798,11 +9940,11 @@ msgstr ""
 "Oznaka:       %s\n"
 "Potpis:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "DOBAR"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "LOŠ"
 
@@ -9826,7 +9968,7 @@ msgstr ""
 "Želite li svejedno da prihvatite?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9841,158 +9983,449 @@ msgstr ""
 "\n"
 "Želite li da prihvatite?"
 
-#: camel/camel-tcp-stream-ssl.c:885
-#, c-format
-msgid ""
-"Certificate problem: %s\n"
-"Issuer: %s"
-msgstr ""
-"Problem sa sertifikatom: %s\n"
-"Izdavač: %s"
+#: camel/camel-tcp-stream-ssl.c:879
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+"Problem sa sertifikatom: %s\n"
+"Izdavač: %s"
+
+#: camel/camel-tcp-stream-ssl.c:931
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+"Loš domen sertifikata: %s\n"
+"Izdavač: %s"
+
+#: camel/camel-tcp-stream-ssl.c:949
+#, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr ""
+"Istekao sertifikat: %s\n"
+"Izdavač: %s"
+
+#: camel/camel-tcp-stream-ssl.c:966
+#, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr ""
+"Istekla lista priznatih sertifikata: %s\n"
+"Izdavač: %s"
+
+#: camel/camel-url.c:290
+#, c-format
+msgid "Could not parse URL `%s'"
+msgstr "Nisam mogao da obradim URL `%s"
+
+#: camel/camel-vee-folder.c:633
+#, c-format
+msgid "Error storing `%s': %s"
+msgstr "Greška kod smeštanja `%s': %s"
+
+#: camel/camel-vee-folder.c:675
+#, c-format
+msgid "No such message %s in %s"
+msgstr "Nema takve poruke %s u %s"
+
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Ne mogu da kopiram ili premestim poruke u virtuelni direktorijum"
+
+#: camel/camel-vee-store.c:377
+#, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Ne mogu da obrišem direktorijum: %s: nema takvog direktorijuma"
+
+#: camel/camel-vee-store.c:398
+#, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Ne mogu da promenim ime  direktorijumu: %s: nema takvog direktorijuma"
+
+#: camel/camel-vtrash-folder.c:44
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Ne mogu kopirati poruke u direktorijum za smeće"
+
+#: camel/camel-vtrash-folder.c:46
+msgid "Cannot copy messages to the Junk folder"
+msgstr "Ne mogu kopirati poruke u direktorijum za đubre"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
+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
+msgid "Check for new messages in all folders"
+msgstr "Proveri za nove poruke u svim direktorijumima"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:59
+msgid "Apply filters to new messages in Inbox on this server"
+msgstr "Primeni filtere na nove poruke u Inbox-u ovog servera"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:62
+#: camel/providers/imap/camel-imap-provider.c:70
+msgid "Automatically synchronize remote mail locally"
+msgstr "Automatski uskladi udaljenu poštu sa lokalnom"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+msgid "Address Book And Calendar"
+msgstr "Adresar i kalendar"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:69
+msgid "Post Office Agent SOAP Port:"
+msgstr "Posrednik za SOAP port za poštu:"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:80
+msgid "Novell GroupWise"
+msgstr "Novel Grupvajz"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
+msgid "For accessing Novell Groupwise servers"
+msgstr "Za pristup Novel Grupvajz serverima"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/imap4/camel-imap4-provider.c:70
+#: camel/providers/imap/camel-imap-provider.c:93
+#: 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:105
+msgid "Password"
+msgstr "Lozinka"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/imap/camel-imap-provider.c:95
+#: camel/providers/imapp/camel-imapp-provider.c:67
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
+"Ova opcija će povezati na IMAP server korišćenjem lozinke u običnom tekstu."
+
+#: camel/providers/groupwise/camel-gw-listener.c:305
+#: camel/providers/groupwise/camel-gw-listener.c:328
+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:429
+#, 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:431
+#, 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:140
+#: 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:815
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Povezivanje poništeno"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/providers/imap4/camel-imap4-store.c:261
 #, c-format
 msgid ""
-"Bad certificate domain: %s\n"
-"Issuer: %s"
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
 msgstr ""
-"Loš domen sertifikata: %s\n"
-"Izdavač: %s"
+"Nisam mogao da se povežem na IMAP server %s u bezbednom režimu: server ne "
+"podržava STARTTLS"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/providers/imap4/camel-imap4-store.c:286
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, c-format
-msgid ""
-"Certificate expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"Istekao sertifikat: %s\n"
-"Izdavač: %s"
+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:1109
+msgid "Unknown error"
+msgstr "Nepoznata greška"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/providers/imap4/camel-imap4-store.c:373
 #, c-format
 msgid ""
-"Certificate revocation list expired: %s\n"
-"Issuer: %s"
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 msgstr ""
-"Istekla lista priznatih sertifikata: %s\n"
-"Izdavač: %s"
+"Nisam mogao da se prijavim na IMAP server %s pomoću mehanizma prijave „%s“"
 
-#: camel/camel-url.c:290
+#: camel/providers/imap4/camel-imap4-store.c:418
 #, c-format
-msgid "Could not parse URL `%s'"
-msgstr "Nisam mogao da obradim URL `%s"
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sUnesite IMAP lozinku korisnika „%s“ na računaru %s"
 
-#: camel/camel-vee-folder.c:614
+#: camel/providers/imap4/camel-imap4-store.c:492
 #, c-format
-msgid "Error storing `%s': %s"
-msgstr "Greška kod smeštanja `%s': %s"
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Nisam mogao da se prijavim na IMAP server %s pomoću %s"
 
-#: camel/camel-vee-folder.c:654
-#, c-format
-msgid "No such message %s in %s"
-msgstr "Nema takve poruke %s 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/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "Ne mogu da kopiram ili premestim poruke u virtuelni direktorijum"
+#: camel/providers/imap4/camel-imap4-store.c:782
+#: camel/providers/imap/camel-imap-store.c:1857
+#: camel/providers/imap/camel-imap-store.c:2235
+#, 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/camel-vee-store.c:377
+#: camel/providers/imap4/camel-imap4-store.c:826
 #, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "Ne mogu da obrišem direktorijum: %s: nema takvog direktorijuma"
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Ne mogu da napravim direktorijum „%s“: neispravno ime sandučeta"
 
-#: camel/camel-vee-store.c:390
+#: camel/providers/imap4/camel-imap4-store.c:831
 #, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Ne mogu da promenim ime  direktorijumu: %s: neispravna operacija"
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Ne mogu da napravim direktorijum „%s“: loša naredba"
 
-#: camel/camel-vee-store.c:398
+#: camel/providers/imap4/camel-imap4-store.c:859
 #, c-format
-msgid "Cannot rename folder: %s: No such folder"
-msgstr "Ne mogu da promenim ime  direktorijumu: %s: nema takvog direktorijuma"
-
-#: camel/camel-vtrash-folder.c:44
-msgid "Cannot copy messages to the Trash folder"
-msgstr "Ne mogu kopirati poruke u direktorijum za smeće"
-
-#: camel/camel-vtrash-folder.c:46
-msgid "Cannot copy messages to the Junk folder"
-msgstr "Ne mogu kopirati poruke u direktorijum za đubre"
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Ne mogu da obrišem direktorijum „%s“: naročiti direktorijum"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:53
-msgid "Checking for new mail"
-msgstr "Proveravam za nove poruke"
+#: 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/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap/camel-imap-provider.c:45
-msgid "Check for new messages in all folders"
-msgstr "Proveri za nove poruke u svim direktorijumima"
+#: 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/groupwise/camel-groupwise-provider.c:59
-msgid "Apply filters to new messages in Inbox on this server"
-msgstr "Primeni filtere na nove poruke u Inbox-u ovog servera"
+#: 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/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:70
-msgid "Automatically synchronize remote mail locally"
-msgstr "Automatski uskladi udaljenu poštu sa lokalnom"
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Naredba:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-msgid "Address Book And Calendar"
-msgstr "Adresar i kalendar"
+#: 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/groupwise/camel-groupwise-provider.c:69
-msgid "Post Office Agent SOAP Port:"
-msgstr "Posrednik za SOAP port za poštu:"
+#: 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/groupwise/camel-groupwise-provider.c:80
-msgid "Novell GroupWise"
-msgstr "Novel Grupvajz"
+#: 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/groupwise/camel-groupwise-provider.c:82
-msgid "For accessing Novell Groupwise servers"
-msgstr "Za pristup Novel Grupvajz serverima"
+#: 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/groupwise/camel-groupwise-provider.c:97
-#: camel/providers/imap/camel-imap-provider.c:93
-#: 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:105
-msgid "Password"
-msgstr "Lozinka"
+#: 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/groupwise/camel-groupwise-provider.c:99
-#: camel/providers/imap/camel-imap-provider.c:95
-#: camel/providers/imapp/camel-imapp-provider.c:67
-msgid "This option will connect to the IMAP 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-utils.c:108
+msgid "No data"
+msgstr "Nema podataka"
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
-msgid "Checklist"
-msgstr "Popis"
+#: 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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operacija obustavljena"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, 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/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1089
-msgid "Unknown error"
-msgstr "Nepoznata greška"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10037,21 +10470,21 @@ msgstr "Nisam mogao da napravim direktorijum %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Nisam mogao da učitam sažetak za %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Direktorijum je uništen i ponovo na serveru napravljen."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Tragam za promenjenim porukama"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Ne mogu da pokupim poruku: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: camel/providers/imap/camel-imap-folder.c:1977
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -10067,25 +10500,25 @@ msgstr ""
 "Ne mogu da dobijem poruku: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: camel/providers/imap/camel-imap-folder.c:1977
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Nema takve poruke"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Ova poruke nije trenutno dostupna"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Prikupljam sažetu informaciju za nove poruke"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Nisam mogao da pronađem tekst poruke u FETCH odgovoru."
 
@@ -10124,23 +10557,6 @@ msgstr "Koristi proizvoljnu naredbu za povezivanje sa serverom"
 msgid "Command:"
 msgstr "Naredba:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Direktorijumi"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Pokaži samo odabrane direktorijume"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Premosti format imena direktorijuma koje daje server"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-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"
@@ -10161,85 +10577,43 @@ 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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP servis za %s na %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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:547
-#: 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:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Povezivanje poništeno"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, 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:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS ekstenzija nije podržana."
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL pregovori nisu uspeli"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Niste uneli lozinku."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10250,25 +10624,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Nema takvog direktorijuma %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, 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:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10276,7 +10643,7 @@ msgstr "Glavni direktorijum ne može sadržati direktorijume u sebi"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Ne mogu da napravim direktorijum „%s“: direktorijum postoji."
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nepoznati glavni direktorijum: %s"
@@ -10386,58 +10753,58 @@ msgstr ""
 "Takođe se može koristiti za čitanje stabla direktorijuma u Elm, Pine, ili "
 "Mutt stilu."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:253
 #: camel/providers/local/camel-mbox-store.c:356
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Ostava root %s nije apsolutna putanja"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Ostava root %s nije regularan direktorijum"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:166
+#: camel/providers/local/camel-local-store.c:264
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne mogu da dobijem direktorijum: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Lokalne ostave nemaju sanduče."
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokalna datoteka pošte %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nisam mogao da preimenujem direktorijum %s u %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nisam mogao da preimenujem '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: camel/providers/local/camel-local-store.c:423
 #: camel/providers/local/camel-mbox-store.c:284
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nisam mogao da obrišem sažetak direktorijuma `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: camel/providers/local/camel-local-store.c:433
 #: camel/providers/local/camel-mbox-store.c:296
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nisam mogao da obrišem indeks datoteku direktorijuma `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10503,7 +10870,7 @@ msgstr "Nisam mogao da obrišem direktorijum `%s': %s"
 msgid "not a maildir directory"
 msgstr "nije maildir direktorijum"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10836,7 +11203,7 @@ msgstr "Server je odbio korisnika/lozinku"
 
 # Ovo je bilo "korisnik poništen", ali mislim da je ovo ipak ispravnije
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: camel/providers/nntp/camel-nntp-folder.c:263
 #: camel/providers/pop3/camel-pop3-folder.c:262
 #: camel/providers/pop3/camel-pop3-folder.c:430
 #: camel/providers/pop3/camel-pop3-folder.c:491
@@ -10845,8 +11212,8 @@ msgid "User cancelled"
 msgstr "Korisnik poništio"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10855,46 +11222,46 @@ msgstr "Korisnik poništio"
 msgid "Cannot get message %s: %s"
 msgstr "Ne mogu da dobijem poruku %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: camel/providers/nntp/camel-nntp-folder.c:188
+#: camel/providers/nntp/camel-nntp-folder.c:228
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Unutrašnja greška: KIB u neispravnom obliku: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: camel/providers/nntp/camel-nntp-folder.c:201
 #, c-format
 msgid "Could not get article %s from NNTP server"
 msgstr "Nisam mogao da preuzmem članak %s sa NNTP servera."
 
-#: camel/providers/nntp/camel-nntp-folder.c:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr "Server ne dozvoljava slanje članaka"
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: camel/providers/nntp/camel-nntp-folder.c:373
 #, c-format
 msgid "Failed to send newsgroups header: %s: message not posted"
 msgstr "Neuspešno slanje zaglavlja grupa: %s: poruka nije poslata"
 
-#: camel/providers/nntp/camel-nntp-folder.c:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: camel/providers/nntp/camel-nntp-folder.c:413
+#: camel/providers/nntp/camel-nntp-folder.c:426
 #, c-format
 msgid "Error posting to newsgroup: %s: message not posted"
 msgstr "Greška pri slanja u grupu: %s: poruka nije poslata"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:438
 msgid "Error reading response to posted message: message not posted"
 msgstr "Greška pri čitanju odgovora na poslatu poruku: poruka nije poslata"
 
-#: camel/providers/nntp/camel-nntp-folder.c:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr "Greška pri slanja poruke: %s: poruka nije poslata"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Ne možete poslati NNTP poruke dok niste povezani!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ne možete kopirati poruke iz NNTP direktorijuma!"
 
@@ -11020,7 +11387,8 @@ msgstr "Nisam mogao da dobijem grupu: %s"
 
 # bug: s/unspecificed/unspecified/
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+#, fuzzy
+msgid "Could not get messages: unspecified error"
 msgstr "Nisam mogao da preuzmem poruke: nenaznačena greška"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11073,8 +11441,8 @@ msgstr "Nema poruka sa uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Preuzimam POP poruku %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Nepoznat razlog"
 
@@ -11518,49 +11886,149 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:451
-msgid "Remove selected items from the attachment list"
-msgstr "Ukloni odabrane predmete sa liste priloga"
+#: composer/e-msg-composer-attachment-bar.c:451
+msgid "Remove selected items from the attachment list"
+msgstr "Ukloni odabrane predmete sa liste priloga"
+
+#: composer/e-msg-composer-attachment-bar.c:491
+msgid "Add attachment..."
+msgstr "Dodaj prilog..."
+
+#: composer/e-msg-composer-attachment-bar.c:492
+msgid "Attach a file to the message"
+msgstr "Dodaj datoteku poruci"
+
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Ne mogu da priložim datoteku %s: %s"
+
+#: composer/e-msg-composer-attachment.c:177
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "Ne mogu da dodam datoteku %s: nije regularna datoteka"
+
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Attachment Properties"
+msgstr "Osobine priloga"
+
+#: composer/e-msg-composer-attachment.glade.h:4
+msgid "File name:"
+msgstr "Naziv datoteke:"
+
+#: composer/e-msg-composer-attachment.glade.h:5
+msgid "MIME type:"
+msgstr "MIME tip:"
+
+#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-select-file.c:74
+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-attachment-bar.c:491
-msgid "Add attachment..."
-msgstr "Dodaj prilog..."
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Autogenerisan"
 
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Attach a file to the message"
-msgstr "Dodaj datoteku poruci"
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Potpis:"
 
-#: composer/e-msg-composer-attachment.c:169
-#: composer/e-msg-composer-attachment.c:185
+#: composer/e-msg-composer.c:2298
 #, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Ne mogu da priložim datoteku %s: %s"
+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-attachment.c:177
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Ne mogu da dodam datoteku %s: nije regularna datoteka"
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Sakrij _traku priloga (ovde prevucite priloge)"
 
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "Osobine priloga"
+#: 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-attachment.glade.h:4
-msgid "File name:"
-msgstr "Naziv datoteke:"
+#: 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-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "MIME tip:"
+#: 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-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:74
-msgid "Suggest automatic display of attachment"
-msgstr "Predloži automatsko otvaranje priloga"
+#: 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"
@@ -11642,214 +12110,135 @@ 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:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"Ne mogu da potpišem odlazeću poruku: nije postavljen sertifikat za "
-"potpisivanje na ovom nalogu"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-"Ne mogu da šifrujem odlazeću poruku: nije postavljen sertifikat za "
-"šifrovanje na ovom nalogu"
-
-#: composer/e-msg-composer.c:1273
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Could not open file"
-msgstr "Ne mogu da otvorim datoteku"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Ne mogu da povratim poruku iz urednika"
-
-#: composer/e-msg-composer.c:1551
-msgid "Untitled Message"
-msgstr "Neimenovana poruka"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Otvori datoteku"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Autogenerisan"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Potpis:"
-
-#: composer/e-msg-composer.c:2288
-#, 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:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Sakrij _traku priloga (ovde prevucite priloge)"
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Prikaži _traku priloga (ovde prevucite priloge)"
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Sastavi poruku"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Dodaj datoteku poruci"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Nisam mogao da napravim prozor za sastavljanje:\n"
-"Ne mogu da pokrenem kontrolu biranja adresa."
 
-#: composer/e-msg-composer.c:3165
-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"
+#. 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."
 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:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Nisam mogao da napravim prozor za sastavljanje:\n"
-"Ne mogu da aktiviram komponentu HTML urednika."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 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/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Sigurno želite da obrišete ovaj neimenovani zakazani sastanak"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Nepročitanih poruka"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Želite li da sačuvate promene?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Nisam mogao da napravim vezu: %s"
+msgid "Don't Recover"
+msgstr "Ne uklanjaj"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Nisam mogao da sačuvam potpis: %s"
+msgid "Recover"
+msgstr "Ukloni"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Nisam mogao da sačuvam potpis: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Zanemari promene"
-
-#: composer/mail-composer-errors.xml.in.h:12
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Želite li da sačuvate promene?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Greška kod čuvanja prečica."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Ne uklanjaj"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Upozorenje: izmenjena poruka"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Greška kod čuvanja prečica."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Sigurno želite da obrišete ovaj neimenovani zakazani sastanak"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Ukloni"
+msgid "Discard Changes"
+msgstr "_Zanemari promene"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Sačuvaj poruku..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Nisam mogao da napravim vezu: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
+#. mail-composer:no-build-message secondary
+#: composer/mail-composer-errors.xml.h:34
+msgid "Because \"${0}\", you may need to select different mail options."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Nepročitanih poruka"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Nisam mogao da sačuvam potpis: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Upozorenje: izmenjena poruka"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Dodaj datoteku poruci"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
 msgid "You need to configure an account before you can compose mail."
 msgstr "Morate da podesite nalog pre sastavljanja poruke."
 
@@ -11979,7 +12368,8 @@ msgstr ""
 "Datoteka sa tim imenom već postoji.\n"
 "Da je prepišem?"
 
-#: e-util/e-dialog-utils.c:251
+#. system:ask-save-file-exists-overwrite title
+#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "Da prepišem datoteku?"
 
@@ -12159,85 +12549,101 @@ 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/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Greška u regularnom izrazu '%s':\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Datoteka '%s' ne postoji ili nije regularna datoteka."
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "<b>Pr_avila filtera</b>"
 
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Promena sastanka"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Morate da izaberete datum."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "Posebno _ime:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Morate dati ime datoteci."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "Premeštam direktorijum %s"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Datoteka '%s' ne postoji ili nije regularna datoteka."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Zadatak"
+msgid "Missing folder."
+msgstr "Premeštam direktorijum %s"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Morate odrediti direktorijum."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Nije izabran server"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Greška u regularnom izrazu '%s':\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Morate da izaberete datum."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Zadatak"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Morate dati ime ovom filteru."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Morate imenovati ovaj vfolder."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Morate dati ime datoteci."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Morate odrediti direktorijum."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+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/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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
@@ -12249,64 +12655,11 @@ msgstr "Izaberi datoteku"
 msgid "<b>Then</b>"
 msgstr "<b>Onda</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Odaberite direktorijum"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Važno"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Za uraditi"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Kasnije"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Proba"
-
-#: filter/filter-rule.c:746
-msgid "Rule name:"
-msgstr "Ime pravila:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Bez imena"
-
-#: filter/filter-rule.c:773
-msgid "<b>If</b>"
-msgstr "<b>Ako</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Izvrši akcije"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "Ako su svi uslovi zadovoljeni"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "ako je bilo koji uslov zadovoljen"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "dolazeći"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "odlazeći"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12396,6 +12749,75 @@ msgstr "sa svim lokalnim direktorijumima"
 msgid "years"
 msgstr "godine"
 
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
+#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+msgid "Important"
+msgstr "Važno"
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
+#: mail/mail-config.glade.h:145
+msgid "To Do"
+msgstr "Za uraditi"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
+#: mail/mail-config.glade.h:94
+msgid "Later"
+msgstr "Kasnije"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Proba"
+
+#: filter/filter-rule.c:790
+msgid "Rule name:"
+msgstr "Ime pravila:"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr "<b>Ako</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "Ako su svi uslovi zadovoljeni"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "ako je bilo koji uslov zadovoljen"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Izvrši akcije"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegirano"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Primaoci"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Odgovori na %s"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Uključi:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "dolazeći"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "odlazeći"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12525,7 +12947,7 @@ msgstr "nije označen"
 msgid "Junk Test"
 msgstr "Provera đubreta"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiketa"
@@ -12562,7 +12984,7 @@ msgstr "Kroz cev do programa"
 msgid "Play Sound"
 msgstr "Pusti zvuk"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Čitaj"
 
@@ -12631,9 +13053,9 @@ msgstr "počinje sa"
 msgid "Stop Processing"
 msgstr "Prekini sa obradom"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: filter/libfilter-i18n.h:64 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:1079
 msgid "Subject"
 msgstr "Naslov"
@@ -12696,103 +13118,60 @@ msgstr "Naslov ne sadrži"
 msgid "Virtual _Folders"
 msgstr "<b>Virtuelni _direktorijumi</b>"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "VFolder izvor"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Postavke sastavljača"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-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:3
-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:4
-msgid "Configure your email accounts here"
-msgstr "Podesite vaše naloge za poštu ovde"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolucija pošta"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Kontrola podešavanja Evolucija naloga za poštu"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Komponenta Evolucija pošte"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Sastavljač Evolucija pošte"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Kontrola podešavanja Evolucija sastavljača"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Preglednik za direktorijume Evolucija pošte"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Kontrola osobina Evolucija pošte"
-
-# 48x48/emblems/emblem-mail.icon.in.h:1
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Pošta"
-
-#: 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:96
-msgid "Mail Preferences"
-msgstr "Osobine pošte"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Predefinisano]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Ime naloga"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokol"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Bez imena"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "_Dodaj potpis"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Potpis(i)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Prosleđena poruka --------"
+
+#: mail/em-composer-utils.c:1499
+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:1509
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "U %a, %d. %m. %Y u %H:%M %%+05d, %%s napisa:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Napravi _Virtuelni direktorijum iz pretrage..."
 
@@ -12826,264 +13205,438 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Navedite gde da napravim direktorijum:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Napravi direktorijum"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Ime direktorijuma:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VFolder-i"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr "NEPOKLOPLjEN"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Sanduče"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Učitavam..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premeštam direktorijum %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr "Umnožavam direktorijum %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premeštam poruke u direktorijum %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiram poruke u direktorijum %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 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:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+msgid "_Copy to Folder"
+msgstr "_Kopiraj u direktorijum"
+
+#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+msgid "_Move to Folder"
+msgstr "_Premesti u direktorijum"
+
+#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
+#: mail/message-list.c:1645
+msgid "_Move"
+msgstr "Pre_mesti"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Otkaži zaduženje"
+
+#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Umnoži"
+
+#: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Pravim direktorijum „%s“"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Napravi direktorijum"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj direktorijum „%s“ u:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Preimenuj direktorijum"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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:35
 msgid "_View"
 msgstr "P_regled"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Otvori u _novom prozoru"
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr "Pre_mesti"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Novi direktorijum..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "Preimenu_j"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Osobine..."
+#: mail/em-folder-tree.c:2561 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:889
+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:778
+msgid "Loading..."
+msgstr "Učitavam..."
+
+# 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:551
+msgid "Mail"
+msgstr "Pošta"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Štampaj"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Odgovori _Svima"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Prosl_edi"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Pr_ati..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Označ_i završene"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: mail/em-folder-view.c:787 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "O_znači kao pročitano"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Označi kao _nepročitano"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Onači kao _važno"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "_Označi kao nevažno"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Označi kao _đubre"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Označi da _nije đubre"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "Poniš_ti brisanje"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Prene_si u direktorijum..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj u direktorijum..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Dodaj pošiljaoca u adresa_r"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Pri_meni filtere"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr "F_iltriraj đubre"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Na_pravi pravilo od poruke"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VFolder na _Naslov"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "VFolder na P_ošiljaoca"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "VFolder na _Primaoce"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VFolder na dopisnu _listu"
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr "VFolder za nit"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filtriraj prema naslo_vu"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filtriraj prema p_ošiljaocu"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filtriraj prema p_rimaocu"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filtriraj prema _dopisnoj listi"
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr "Filtriraj prem _niti"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Podrazumevani"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Štampaj poruku"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "_Umnoži adresu veze"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite da pošaljete %s"
 
-#: mail/em-folder-view.c:2214
+#: 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: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:1584 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Diskusione grupe"
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Click to open %s"
-msgstr "Kliknite da otvorite %s"
+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
@@ -13092,22 +13645,14 @@ msgstr "Kliknite da otvorite %s"
 msgid "Matches: %d"
 msgstr "Poklapanja: %d"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr "Nepotpisana"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 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:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "Ispravan potpis"
-
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13115,11 +13660,7 @@ 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:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "Neispravan potpis"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13127,11 +13668,11 @@ msgstr ""
 "Potpis ove poruke nije mogao biti proveren, možda je izmenjena prilikom "
 "prenosa."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr "Ispravan potpis, ne mogu da proverim pošiljaoca"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13139,11 +13680,7 @@ msgstr ""
 "Poruka je potpisana ispravnim potpisom, ali pošiljalac poruke nije mogao "
 "biti proveren."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "Nešifrovano"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13152,11 +13689,7 @@ msgstr ""
 "Ova poruka nije šifrovana.  Njen sadržaj je moguće videti prilikom prenosa "
 "preko Interneta."
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr "Šifrovana, slabo"
-
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:654
 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 "
@@ -13165,11 +13698,7 @@ 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:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "Šifrovana"
-
-#: mail/em-format-html-display.c:657
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13177,11 +13706,7 @@ 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:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr "Šifrovana, dobro"
-
-#: mail/em-format-html-display.c:658
+#: mail/em-format-html-display.c:656
 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 "
@@ -13190,179 +13715,61 @@ 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:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "Po_gledaj sertifikat"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Ovaj sertifikat se ne može pregledati"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Završeno: %d. %B, %Y. %k:%M"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Prekoračeno:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "do %d. %B, %Y. %k:%M"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "Po_gledaj unutar"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Strana %d od %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Preuzimam „%s“"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Loše složen spoljni deo."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pokazivač na FTP adresu (%s)"
-
-#: mail/em-format-html.c:884
-#, 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:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "pokazivač na lokalnu datoteku (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pokazivač na mrežni podatak (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pokazivač na napoznati spoljni podatak (\"%s\" tipa)"
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "Oblikujem poruku"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Od"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Odgovor-za"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Kome"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc (kopija)"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc (nevidljiva kopija)"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Pošiljalac"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-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:1576
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr "Diskusione grupe"
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s prilog"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Ne mogu da obradim S/MIME poruku: nepoznata greška"
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Nepodržana vrsta šifrovanja za multipart/encrypted"
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Nisam mogao da obradim MIME poruku. Pokazujem kao izvor."
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "Nepodržan oblik potpisa"
-
-#: mail/em-format.c:1347
-msgid "Error verifying signature"
-msgstr "Greška pri proveri potpisa"
-
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "Nepoznata greška pri proveri potpisa"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Ubica-spama (ugrađen)"
 
 # slično kao za mesece i nedelje
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr "Svaki put"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr "Jednom dnevno"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr "Jednom nedeljno"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr "Jednom mesečno"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13374,25 +13781,55 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenese vaše direktorijume..."
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Neuspešan prenos ostave KIB-ova za POP3: %s"
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Ne mogu da napravim direktorijum „%s“: %s"
+
+#: mail/em-migrate.c:1532
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Ne mogu da kopiram opis datoteke: %s\n"
+"%s"
+
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Ne mogu da sačuvam datoteku sa spiskom grupa za %s: %s"
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Nisam mogao da se prijavim na POP server %s: %s"
+
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "Neuspešno pravljenje direktorijuma „%s“: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Neuspešan prenos stanja raširenosti direktorijuma: %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
 msgstr "Neuspešno pravljenje direktorijuma „%s“: %s"
 
-#: mail/em-migrate.c:2350
-#, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Neuspešno otvaranje smeštaja za „%s“: %s"
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"Ne mogu da napravim izlaznu datoteku: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13403,88 +13840,74 @@ msgstr "Sačuvaj kao..."
 msgid "untitled_image.%s"
 msgstr "neimenovana_slika.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "Postavi na _pozadinu"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "_Otvori vezu u čitaču"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "Pošalji _poruku..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "Dodaj u _adresar"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvori u %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ovaj smeštaj ne podržava pretplate, ili nisu omogućene."
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Pretplati se"
 
-#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Direktorijum"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Molim izaberite server."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Nije izabran server"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Ne pokazuj ponovo ovu poruku."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filteri"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Prosleđena poruka --------"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "U %a, %d. %m. %Y u %H:%M %%+05d, %%s napisa:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "poruka"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Sačuvaj poruku..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Dodaj adresu"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr "Poruke od %s"
@@ -13503,12 +13926,14 @@ msgstr "Proveri da li je pristigla pošta đubre"
 
 # bug: British or American English?
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+#, fuzzy
+msgid "Citation highlight color"
 msgstr "Boja isticanja citata"
 
 # bug: British or American English?
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+#, fuzzy
+msgid "Citation highlight color."
 msgstr "Boja isticanja citata."
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13613,14 +14038,20 @@ msgstr "Poslednje vreme pražnjenja smeća"
 
 # bug: American English or British?
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+#, fuzzy
+msgid "List of Labels and their associated colors"
 msgstr "Spisak oznaka i odgovarajućih boja"
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "Spisak naloga"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "Spisak naloga"
+
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13628,28 +14059,33 @@ msgstr ""
 "Spisak naloga koje poznaje poštanski deo Evolucije. Spisak sadrži niske koje "
 "imenuju podkategorije u odnosu na /apps/evolution/mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr "Spisak proizvoljnih zaglavlja i da li su uključena."
 
 # bug: American or British English?
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
+#, fuzzy
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 "Spisak oznaka koje poznaje poštanski deo Evolucije. Spisak sadrži niske koje "
 "sadrže ime:boja gde boja koristi HTML heksadekadni zapis."
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Spisak vrsti datoteka za pronalaženje Bonobo pregledača"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "Učitaj slike za HTML poruke preko HTTP-a"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
@@ -13659,89 +14095,89 @@ msgstr ""
 "ne učitavaj poruke preko mreže, 1 — učitaj poruke ako je pošiljalac u "
 "adresaru, 2 — uvek učitaj slike preko mreže"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "Beleži dejstvo filtera"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "Beleži dejstvo filtera u navedenu datoteku dnevnika."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "Dnevnik u koji da beleži dejstvo filtera"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "Dnevnik u koji da beleži dejstvo filtera."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "Označi kao viđenu nakon određenog vremena"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "Označi kao viđenu nakon određenog vremena."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označi citate u pregledu poruke"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označi citate u pregledu poruke."
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Podrazumevana visina prozora za poruku"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr "Podrazumevana širina prozora za poruku"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Stil prikaza poruke (običan, sva zaglavlja, izvorni)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Najmanje dana između pražnjenja smeća po izlasku"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Najmanje vreme između pražnjenja smeća po izlasku, u danima."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "Zvuk za obaveštenje o novoj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "Vrsta obaveštenja o novoj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "Upitaj kada je tema prazna"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Upitaj korisnika kada želi da isprazni direktorijum."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Upitaj korisnika kada pokuša da pošalje poruku bez teme."
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr "Upitaj pri pražnjenju"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr "Upitaj kada korisnik uputi samo nevidljivu kopiju"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13749,35 +14185,27 @@ msgstr ""
 "Upitaj kada korisnik pokuša da pošalje HTML poruke primaocima koji možda ne "
 "žele da primaju HTML poštu."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Upitaj korisnika kada pokuša da pošalje poruku bez navođenja kome ili kopije."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Upitaj kada korisnik pokuša da pošalje neželjeni HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr "Prepoznaj veze u tekstu i zameni ih."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Prepoznaj smeške u tekstu i zameni ih slikama."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr "Proveri da dolazeća pošta nije đubre"
 
-#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
-msgstr "t4jN4 0pCij4"
-
-#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
-msgstr "t4jN4 0pCij4."
-
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Podrazumevano šalji HTML poštu"
@@ -13824,7 +14252,7 @@ msgstr "Istovremena provera pravopisa"
 
 #: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
-msgid "Subscribe dialog default hight"
+msgid "Subscribe dialog default height"
 msgstr "Podrazumevana visina prozora za poruku"
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -13969,33 +14397,63 @@ msgstr "port za pokretanje korisnikovog spamd-a"
 msgid "spamd port"
 msgstr "port spamd-a"
 
-#: 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:1
+msgid "*Control*F1"
+msgstr ""
 
-#: 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:2
+msgid "Composer Preferences"
+msgstr "Postavke 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: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/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:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Podesite proveru pravopisa, potpise, i sastavljač poruke ovde"
 
-#: 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:5
+msgid "Configure your email accounts here"
+msgstr "Podesite vaše naloge za poštu ovde"
 
-#: 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:6
+msgid "Evolution Mail"
+msgstr "Evolucija pošta"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: 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/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Sastavljač Evolucija pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Kontrola podešavanja Evolucija sastavljača"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Kontrola osobina Evolucija pošte"
+
+#: 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:96
+msgid "Mail Preferences"
+msgstr "Osobine pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Pošta:"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14003,15 +14461,15 @@ msgstr "Evolucija uvozi vašu staru Elm poštu"
 
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Uvozim..."
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Molim sačekajte"
 
@@ -14040,18 +14498,46 @@ msgid "Select folder to import into"
 msgstr "Izaberite direktorijum u koji da uvezem"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Uvozim „%s“"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Uvozim poštansko sanduče"
 
-#: mail/importers/mail-importer.c:354
+#: 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"
 msgstr "Pretražujem %s"
@@ -14061,7 +14547,7 @@ msgstr "Pretražujem %s"
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetni filter \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: mail/importers/netscape-importer.c:662
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -14086,7 +14572,7 @@ msgstr ""
 "prioriteta. Proverite uvežene filtere da se uverite\n"
 "da li sve radi kao što bi trebalo."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14098,7 +14584,7 @@ msgstr ""
 "opciju, koju Evolucija ne podržava.\n"
 "Ovi filteri neće ostati."
 
-#: mail/importers/netscape-importer.c:692
+#: mail/importers/netscape-importer.c:703
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -14112,23 +14598,23 @@ msgstr ""
 "su promenjeni da mogu da provere da li taj niz jeste\n"
 "ili nije sadržan u telu poruke."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolucija uvozi vaše stare Netscape podatke"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Uvozim podatke iz Netskejpa"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Postavke"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Filteri pošte"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14161,124 +14647,136 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Urednik Evolucija naloga"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "Saglasnost ključa"
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Domaćin:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "Korisničko_ime"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Putanja:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Naslove je %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s dopisna lista"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "Odgovori na %s"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo filtriranja"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d izabranih"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d neposlatih"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Priprema"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d poslatih"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d neposlatih"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d ukupno"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d neposlatih"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d izabranih"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Nova poruka"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "Novi direktorijum sa poštom"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "_Direktorijum sa poštom"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "Napravi novi direktorijum sa poštom"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
-msgstr "Adresa izvora pošte koji će biti prikazani u pregledu"
+#: mail/mail-component.c:795
+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:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Ličnost"
 
-#: mail/mail-config-druid.c:366
+#: mail/mail-config-druid.c:364
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14288,12 +14786,12 @@ msgstr ""
 "moraju biti popunjena, osim ako ne želite da ove podatke uključite u poruke "
 "koje šaljete."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Primanje pošte"
 
-#: mail/mail-config-druid.c:374
+#: mail/mail-config-druid.c:372
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -14301,15 +14799,15 @@ msgstr ""
 "Molim unesite podatke o vašem dolazećem serveru za poštu. Ako niste sigurni, "
 "pitajte sistem administratora ili ponuđača Internet servisa."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Molim izaberite od sledećih opcija"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Slanje pošte"
 
-#: mail/mail-config-druid.c:386
+#: mail/mail-config-druid.c:384
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14317,11 +14815,11 @@ msgstr ""
 "Molim unesite podatke o načinu na koji ćete slati poštu. Ako niste sigurni, "
 "pitajte sistem administratora ili ponuđača Internet servisa."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Upravljanje nalozima"
 
-#: mail/mail-config-druid.c:393
+#: mail/mail-config-druid.c:391
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -14334,14 +14832,6 @@ 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:888
-msgid "Checking Service"
-msgstr "proveravam servis"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Povezujem se na server..."
-
 #: mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "_Proveri podržane vrste "
@@ -14632,7 +15122,8 @@ msgstr "Izvrši komandu..."
 
 # bug: space too much?
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "U_tvrđene-širine:"
 
 #: mail/mail-config.glade.h:82
@@ -14938,353 +15429,458 @@ msgstr "boja"
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
-"Direktorijum sa imenom „%s“ već postoji. Molim koristite neko drugo ime."
+msgid "Invalid authentication"
+msgstr "Identifikacija"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP server %s ne podržava traženi tip autorizacije %s."
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Sigurno želite da obrišete ovaj nalog?"
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:4
-#, fuzzy
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Sigurno želite da otvorite svih %d poruka u posebnim prozorima?"
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
+#, fuzzy
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Sigurno želite da ponovo pošaljete svih %d poruka?"
 
-#: mail/mail-errors.xml.in.h:5
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Trajno ukloni sve obrisane poruke iz svih direktorijuma"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Šaljete poruku u HTML obliku. Proverite da li \n"
+"naredni primaoci žele i mogu da prime HTML poštu:\n"
+"%sSvakako pošalji?"
 
-#: mail/mail-errors.xml.in.h:6
+#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
 #, fuzzy
-msgid "Are you sure you want to send a message in HTML format?"
-msgstr "Sigurno želite da ponovo pošaljete svih %d poruka?"
+msgid "_Send"
+msgstr "Pošalji"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "Sigurno želite da ponovo pošaljete svih %d poruka?"
 
-#: mail/mail-errors.xml.in.h:8
+#. mail:ask-send-no-subject secondary
+#: mail/mail-errors.xml.h:19
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+
+#. mail:ask-send-only-bcc-contact primary
+#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 #, fuzzy
-msgid "Are you sure you want to send a message without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Sigurno želite da ponovo pošaljete svih %d poruka?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. mail:ask-send-only-bcc-contact secondary
+#: mail/mail-errors.xml.h:24
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. mail:ask-send-only-bcc secondary
+#: mail/mail-errors.xml.h:31
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. mail:send-no-recipients primary
+#: mail/mail-errors.xml.h:34
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. mail:send-no-recipients secondary
+#: mail/mail-errors.xml.h:36
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Ne mogu da kopiram direktorijum: %s"
+msgid "Use default drafts folder?"
+msgstr "Putanja do podrazumevanog direktorijuma kontakata"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Ne mogu da napravim direktorijum: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Ne mogu da otvorim direktorijum sa pripremom za ovaj nalog.\n"
+"Želite li da koristite predefinisani direktorijum sa pripremom?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Nisam mogao da napravim privremeni direktorijum: %s"
+msgid "Use _Default"
+msgstr "Podrazumevani"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr ""
-"Ne mogu da napravim direktorijum\n"
-"%s\n"
-"Greška: %s"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Sigurno želite da otvorite svih %d poruka u posebnim prozorima?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. mail:ask-expunge secondary
+#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
+msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
-"Ne mogu da obrišem direktorijum:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Ne mogu da obrišem lokalni direktorijum „%s“."
+msgid "_Expunge"
+msgstr "Izba_ci"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Ne mogu da preuzmem direktorijum „%s“: direktorijum ne postoji."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Trajno ukloni sve obrisane poruke iz svih direktorijuma"
 
-#: mail/mail-errors.xml.in.h:20
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Ne mogu da premestim direktorijum: %s"
+msgid "_Empty Trash"
+msgstr "Izbaci _smeće"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Ne mogu da otvorim izvor"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Imate neposlate poruke, želite li svejedno da izađete?"
+
+#. mail:exit-unsaved secondary
+#: mail/mail-errors.xml.h:55
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr ""
+
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
+msgid ""
+"The message was sent via the \"sendmail\" external application.  Sendmail "
+"reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors "
+"and resend."
+msgstr ""
+
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Ne mogu da otvorim izvor"
+msgid "Error while {0}."
+msgstr ""
+"Greška tokom '%s':\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
+
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Ne mogu da otvorim poruku"
+msgid "Error while performing operation."
+msgstr ""
+"Greška tokom operacije:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+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/mail-errors.xml.in.h:25
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Ne mogu da preimenujem lokalni direktorijum „%s“."
+msgid "Enter password."
+msgstr "Unesite lozinku"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"Greška kod učitavanja podataka filtera:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Nisam mogao da napravim direktorijum %s: %s."
 
-#: mail/mail-errors.xml.in.h:28
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "Ne mogu da sačuvam u `%s'\n"
 " %s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "_Dodaj potpis"
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
+"Ne mogu da napravim direktorijum\n"
+"%s\n"
+"Greška: %s"
 
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Nisam mogao da sačuvam potpis: %s"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Obriši „%s“"
-
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Delete account?"
-msgstr "Obriši odabrane kontakte"
+msgid "Cannot create temporary save directory."
+msgstr "Nisam mogao da napravim privremeni direktorijum: %s"
 
-#: mail/mail-errors.xml.in.h:34
-#, fuzzy
-msgid "Discard changed?"
-msgstr "_Zanemari promene"
+#. mail:no-create-tmp-path secondary
+#: 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/mail-errors.xml.in.h:35
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Želite li da sačuvate promene?"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Ne briši"
+msgid "File exists but cannot overwrite it."
+msgstr "Datoteka postoji, da je prepišem?"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Enter password."
-msgstr "Unesite lozinku"
+msgid "File exists but is not a regular file."
+msgstr "Datoteka '%s' ne postoji ili nije regularna datoteka."
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error loading filter definitions."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Greška kod učitavanja podataka filtera:\n"
+"Ne mogu da obrišem direktorijum:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"Greška tokom operacije:\n"
-"%s"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Ne mogu da obrišem lokalni direktorijum „%s“."
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
+msgid ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
-"Greška tokom '%s':\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Datoteka postoji, da je prepišem?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Ne mogu da preimenujem lokalni direktorijum „%s“."
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Datoteka '%s' ne postoji ili nije regularna datoteka."
+msgid "Delete \"{0}\"?"
+msgstr "Obriši „%s“"
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Zaista da brišem direktorijum „%s“, i sve njegove poddirektorijume?"
 
-#: mail/mail-errors.xml.in.h:44
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. mail:no-rename-folder-exists primary
+#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:no-rename-folder-exists secondary
+#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
+#, fuzzy
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr ""
+"Direktorijum sa imenom „%s“ već postoji. Molim koristite neko drugo ime."
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Identifikacija"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Ne mogu da premestim direktorijum: %s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "Ne mogu da otvorim izvor"
 
-#: mail/mail-errors.xml.in.h:49
-msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+#, fuzzy
+msgid "Cannot open target \"{2}\"."
+msgstr "Ne mogu da otvorim poruku"
 
-#: mail/mail-errors.xml.in.h:50
-msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
-msgstr ""
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+#, fuzzy
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Ne mogu da kopiram direktorijum: %s"
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Ne mogu da napravim direktorijum: %s: %s"
+
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "Ne mogu da otvorim izvor"
+
+#. mail:account-incomplete primary
+#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+msgid "Cannot save changes to account."
 msgstr ""
-"Šaljete poruku u HTML obliku. Proverite da li \n"
-"naredni primaoci žele i mogu da prime HTML poštu:\n"
-"%sSvakako pošalji?"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Niste uneli sve potrebne podatke."
+
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Ne možete otvoriti dva naloga sa istim imenom."
+
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Zaista da brišem direktorijum „%s“, i sve njegove poddirektorijume?"
+msgid "Delete account?"
+msgstr "Obriši odabrane kontakte"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
-msgstr ""
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Sigurno želite da obrišete ovaj nalog?"
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient."
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:55
-#, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
-msgstr ""
-"Sledeći vFolder(i):\n"
-"%sKoristili su uklonjeni direktorijum:\n"
-"    '%s'\n"
-"Potom su osveženi."
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Ne briši"
 
-#: mail/mail-errors.xml.in.h:56
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"Sledeći vFolder(i):\n"
-"%sKoristili su uklonjeni direktorijum:\n"
-"    '%s'\n"
-"Potom su osveženi."
+msgid "Could not save signature file."
+msgstr "Nisam mogao da sačuvam potpis: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "_Dodaj potpis"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "_Zanemari promene"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP server %s ne podržava traženi tip autorizacije %s."
+msgid "Do you wish to save your changes?"
+msgstr "Želite li da sačuvate promene?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15292,85 +15888,97 @@ msgstr ""
 "\n"
 "Želite li da sačuvate promene?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Ne mogu da otvorim direktorijum sa pripremom za ovaj nalog.\n"
-"Želite li da koristite predefinisani direktorijum sa pripremom?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Podrazumevani"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Zanemari promene"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Putanja do podrazumevanog direktorijuma kontakata"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Niste uneli sve potrebne podatke."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Imate neposlate poruke, želite li svejedno da izađete?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Ne možete otvoriti dva naloga sa istim imenom."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Ne mogu da preuzmem direktorijum „%s“: direktorijum ne postoji."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. mail:vfolder-notexist secondary
+#: mail/mail-errors.xml.h:188
+msgid ""
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "_Zanemari promene"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Izbaci _smeće"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Sledeći vFolder(i):\n"
+"%sKoristili su uklonjeni direktorijum:\n"
+"    '%s'\n"
+"Potom su osveženi."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "Izba_ci"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "Pošalji"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Sledeći vFolder(i):\n"
+"%sKoristili su uklonjeni direktorijum:\n"
+"    '%s'\n"
+"Potom su osveženi."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:ask-migrate-existing secondary
+#: mail/mail-errors.xml.h:212
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Prepiši"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Pošalji"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingujem %s"
@@ -15379,20 +15987,20 @@ msgstr "Pingujem %s"
 msgid "Working"
 msgstr "Radim"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtriram direktorijum"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Uzimam poštu"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neuspešna primena odlazećih filtera: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15401,102 +16009,102 @@ msgstr ""
 "Neuspešno dodavanje u %s: %s\n"
 "Dodajem u lokalni direktorijum Poslato."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Neuspešno dodavanje u lokalni direktorijum Poslato: %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
 
 # bug: plural-forms
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Nisam uspeo da pošaljem %d od %d poruka"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Gotovo."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Čuvam poruku u direktorijum"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Premeštam poruke u %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram poruke u %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pretražujem direktorijume u \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Prosleđene poruke"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otvaram direktorijum %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Otvaram ostavu %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Uklanjam direktorijum %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštam direktorijum '%s'"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Čistim i smeštam nalog „%s“"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Smeštam nalog „%s“"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Osvežavam direktorijum"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Izbacujem direktorijum"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Praznim smeće u '%s'"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Lokalni direktorijumi"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Učitavam poruku %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -15504,7 +16112,7 @@ msgstr[0] "Učitavam %d poruku"
 msgstr[1] "Učitavam %d poruke"
 msgstr[2] "Učitavam %d poruka"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -15512,7 +16120,7 @@ msgstr[0] "Čuvam %d poruku"
 msgstr[1] "Čuvam %d poruke"
 msgstr[2] "Čuvam %d poruka"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15521,7 +16129,7 @@ msgstr ""
 "Ne mogu da napravim izlaznu datoteku: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15530,11 +16138,11 @@ msgstr ""
 "Greška kod čuvanja poruka u: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Čuvam prilog"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15543,17 +16151,17 @@ msgstr ""
 "Ne mogu da napravim izlaznu datoteku: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisam mogao da upišem: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Prekidam vezu sa %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponovo se povezujem na %s"
@@ -15617,24 +16225,24 @@ msgstr "Osvežavam..."
 msgid "Waiting..."
 msgstr "Čekam..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Korisnik je poništio operaciju."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Unesite lozinku"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
@@ -15674,89 +16282,94 @@ msgstr "Prosleđena poruka"
 msgid "Invalid folder: `%s'"
 msgstr "Neispravan direktorijum %s"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Postavljam vfolder: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Osvežavam vdirektorijume za adresu: %s"
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "Osvežavam vdirektorijume za adresu: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vFolders-i"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Izmeni VFolder-e"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Novi VFolder"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Neviđeno"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Viđeno"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Odgovoreno"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Višestruke neviđene poruke"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Višestruke poruke"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Najniže"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Niže"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Više"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Najviše"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Danas %k:%M "
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Juče %k:%M "
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M "
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M "
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Pravim listu poruka"
 
@@ -15788,43 +16401,43 @@ msgstr "Primljeno"
 msgid "Size"
 msgstr "Veličina"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Poziv"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Ne prosledi"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Sledi"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "Za vašu informaciju"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Prosledi"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Nije neophodan odgovor"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Odgovori"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
+#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Odgovori svima"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Pročitaj"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Označi za praćenje"
 
@@ -15868,51 +16481,31 @@ msgstr "Pretp_lati se"
 msgid "_Unsubscribe"
 msgstr "Odjavi pretplatu"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolucija konzola"
-
-#: 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"
 msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr "Podrazumevana grupa prečice"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "Podrazumevana širina površi sa direktorijumima"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr "Podrazumevana širina površi sa prečicama"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "Podrazumevana visina prozora"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "Podrazumevana širina prozora"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr "Izdanje alata za podešavanje Evolucije"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "IB ili nadimak dela koji se uobičajeno prikazuje po pokretanju."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: shell/apps_evolution_shell.schemas.in.in.h:7
 msgid ""
 "If set to true, Evolution will start up in offline mode instead of online "
 "mode."
@@ -15920,7 +16513,7 @@ msgstr ""
 "Ako je postavljeno, Evolucija će se pokrenuti u nepovezanom režimu umesto u "
 "povezanom režimu."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
 "If set to true, the warning dialog in development versions of Evolution is "
 "not displayed."
@@ -15928,61 +16521,21 @@ msgstr ""
 "Ako je postavljeno, prozorče sa upozorenjem u razvojnim izdanjima Evolucije "
 "se neće prikazivati."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Spisak putanja direktorijuma koji se usklađuju nadisku za nepovezanu upotrebu"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr "Putanja do podrazumevanog direktorijuma kalendara"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr "Putanja do podrazumevanog direktorijuma kontakata"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr "Putanja do podrazumevanog direktorijuma pošte"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr "Putanja do podrazumevanog direktorijuma zaduženja"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr "Fizička adresa do podrazumevanog direktorijuma kalendara"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr "Fizička adresa do podrazumevanog direktorijuma kontakata"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr "Fizička adresa do podrazumevanog direktorijuma pošte"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr "Fizička adresa do podrazumevanog direktorijuma zaduženja"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Da li se Evolucija pokreće u nepovezanom režimu"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether to show the folder bar"
-msgstr "Da li se prikazuje površ sa direktorijumima"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
-msgstr "Da li se prikazuje površ sa prečicama"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr "Da li da preskoči prozorče sa upozorenjem o razvoju"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "mail"
 msgstr "pošta"
 
@@ -15990,6 +16543,32 @@ msgstr "pošta"
 msgid "Brought to you by"
 msgstr "Omogućili su"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Nepoznata greška"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Neispravni argumenti"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Ne mogu da se registruje na OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Baza sa podešavanjima nije nađena"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Opšta greška"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Bezimeno)"
@@ -16127,11 +16706,11 @@ msgstr "Nisam mogao da pokrenem uvoznika."
 msgid "_Import"
 msgstr "U_voz"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Zatvaram veze..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Podešavanja Evolucije"
 
@@ -16173,11 +16752,35 @@ 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-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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:343
+#, 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:349
+#, 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:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Pošta za %s"
+
+#: shell/e-shell-window-commands.c:64
 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."
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Greška kod pokretanja %s."
@@ -16191,14 +16794,15 @@ msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne može da se pokrene."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "O Ximian Evoluciji"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Na mreži"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Nije na mreži"
 
@@ -16206,52 +16810,6 @@ msgstr "_Nije na mreži"
 msgid "Work Offline"
 msgstr "Radi bez mreže"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian 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:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Upozorenje: Evolucija ne može da dogradi sve vaše podatke iz izdanja %d.%d.%"
-"d.\n"
-"Vaši podaci nisu obrisani, ali neće biti prikazani u ovom izdanju "
-"Evolucije.\n"
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Neispravni argumenti"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Ne mogu da se registruje na OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Baza sa podešavanjima nije nađena"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Opšta greška"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Kućica"
@@ -16318,9 +16876,46 @@ msgstr "Aktivne veze"
 msgid "Active Connections"
 msgstr "Aktivne veze"
 
-#: 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/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/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "K_alendar"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, 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:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "_Vrsta direktorijuma:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Otvori direktorijum drugog korisnika"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Nalog:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Ime direktorijuma:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Korisnik:"
 
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
@@ -16364,6 +16959,18 @@ 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/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/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Pritisnite \"Uvezi\" da započnete sa uvozom datoteke u Evoluciju. "
@@ -16423,13 +17030,13 @@ 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:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"This version of Evolution is not yet complete. It is getting close,\n"
 "but some features are either unfinished or do not work properly.\n"
 "\n"
 "If you want a stable version of Evolution, we urge you to uninstall\n"
@@ -16458,57 +17065,48 @@ 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:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Hvala\n"
 "Tim Ximian Evolucije\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Nemoj mi ponovo reći"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Ne mogu da pristupim konzoli Ximian Evolucije"
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Ne mogu da pokrenem konzolu Ximian Evolucije: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Pokreni Evoluciju uz navedeni deo"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Počni sa radom bez mreže"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Počni sa radom na mreži"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Silom ugasi sve delove evolucije"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Primoraj ponovni prenos podataka iz Evolucije 1.4"
 
-#: shell/main.c:511
+#: shell/main.c:510
 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:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16517,13 +17115,79 @@ msgstr ""
 "%s: --online i --offline se ne mogu koristiti zajedno.\n"
 "  Koristite %s --help za više podataka.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+#: shell/shell-errors.xml.h:15
+#, fuzzy
+msgid "Continue"
+msgstr "Povezujem se"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Ne mogu da pristupim konzoli Ximian Evolucije"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Pomoćnik za naloge Evolucije"
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
 msgstr "Izaberite sertifikat za uvoz..."
 
 #: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Ime sertifikata"
 
@@ -16752,11 +17416,6 @@ msgstr "Držite ove sertifikate koji određuju ove osobe:"
 msgid "Your Certificates"
 msgstr "Vaši sertifikati"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "Sertifikat već postoji"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d. %m. %Y."
@@ -16947,6 +17606,11 @@ 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:605
+msgid "Certificate already exists"
+msgstr "Sertifikat već postoji"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 lozinka datoteke"
@@ -16986,12 +17650,12 @@ msgstr "Predefinisan naslov poruke."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Nisam mogao da izvršim „%s“: %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Gasim %s (%s)\n"
@@ -17056,7 +17720,8 @@ msgid "Select all contacts"
 msgstr "Izaberi sve kontakte"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Pošalji poruku izabranim kontaktima."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17087,8 +17752,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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "_Akcije"
@@ -17106,7 +17771,8 @@ msgid "_Preview Pane"
 msgstr "_Prostor za pregled"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Sačuvaj kao VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17233,10 +17899,20 @@ msgstr "Pregledaj tekući zakazani sastanak"
 msgid "Week"
 msgstr "Nedelja"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Radna nedelja"
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Otvori zakazani sastanak"
 
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:1
+msgid "C_lose"
+msgstr "Z_atvori"
+
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -17556,6 +18232,16 @@ msgstr "_Obrni izbor"
 msgid "_Threaded Message List"
 msgstr "Lista poruka prema _niti razgovora"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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:26
+msgid "_Close"
+msgstr "_Zatvori"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Dodaj _pošiljaoca u adresar"
@@ -17793,7 +18479,8 @@ msgid "Open the selected message in a new window"
 msgstr "Otvori izabranu poruku u novom prozoru"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Otvori izabranu poruku radi ponovnog slanja"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -17909,58 +18596,46 @@ msgstr "Prividni direktorijum na _naslov..."
 msgid "_Attached"
 msgstr "_Priloženo"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Kopiraj u direktorijum"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Napravi filter od poruke"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Idi na"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "Unutar"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Veće"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "Prikaz _poruke"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Premesti u direktorijum"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Sledeća poruka"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "Normalan pri_kaz"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Otvori poruku"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Prethodna poruka"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "Ponovo poša_lji..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "Ala_ti"
@@ -17969,16 +18644,6 @@ msgstr "Ala_ti"
 msgid "_Undelete"
 msgstr "_Povrati"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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:26
-msgid "_Close"
-msgstr "_Zatvori"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Priloži"
@@ -18368,6 +19033,11 @@ msgstr "_Kratki podsetnik"
 msgid "_Send / Receive"
 msgstr "_Pošalji / primi"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "Pro_zor"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Prema _preduzeću"
@@ -18435,10 +19105,6 @@ msgstr "Datum završetka:"
 msgid "With _Status"
 msgstr "Dodeli status"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Zaduženja"
-
 # Univerzalno vreme, ili UT
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
@@ -18597,6 +19263,34 @@ msgstr "Drugo..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Greška Evolucije"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolucija pošta"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Informacija o sastanku"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolucija sažetak"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<span weight=\"bold\">Fontovi za štampu</span>"
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Razgranati"
@@ -18711,6 +19405,35 @@ msgstr "Tekst"
 msgid "Find _Now"
 msgstr "Nađi _sada"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
+#, fuzzy
+msgid "Do you wish to overwrite it?"
+msgstr ""
+"%s već postoji\n"
+"Želite li da prepišete novim unosom?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Ne mogu da sačuvam u `%s'\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Ne mogu da sačuvam u `%s'\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18721,12 +19444,153 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% završeno)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Preglednik direktorijuma Evolucija adresara"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "Adresa _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Blogče"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Preglednik Evolucija kalendara"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Preglednik Evolucija zaduženja"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Nisam mogao da učitam  gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Nisam mogao da otvorim direktorijum u '%s"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI koju će kalendar pokazati"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Tip pogleda za prikaz"
+
+#~ msgid "Display a message"
+#~ msgstr "Pokaži poruku"
+
+#~ msgid "Alerts"
+#~ msgstr "Upozorenja"
+
+#~ msgid "Time"
+#~ msgstr "Vreme"
+
+#~ msgid "_General"
+#~ msgstr "_Opšte"
+
+#~ msgid "Select source"
+#~ msgstr "Izaberite izvor"
+
+#~ msgid "calendar"
+#~ msgstr "kalendar"
+
+#~ msgid "task list"
+#~ msgstr "spisak zaduženja"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Datoteka kalendara nije mogla biti ažurirana\n"
+
 #~ msgid ""
-#~ "Address book '%s' will be removed. Are you sure you want to continue?"
-#~ msgstr "Adresar „%s“ će biti uklonjen. Sigurno želite da nastavite?"
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed."
+#~ msgstr ""
+#~ "Mašinerija zaduženja za \n"
+#~ "%s\n"
+#~ " je pukla."
 
-#~ msgid "New Address Book"
-#~ msgstr "Novi adresar"
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "Adresa direktorijuma zaduženja za prikaz"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Nisam mogao da učitam zaduženja u `%s"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Preglednik za direktorijume Evolucija pošte"
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "VFolder za nit"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "Filtriraj prem _niti"
+
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Neuspešan prenos ostave KIB-ova za POP3: %s"
+
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Neuspešan prenos stanja raširenosti direktorijuma: %s"
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Neuspešno otvaranje smeštaja za „%s“: %s"
+
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "t4jN4 0pCij4"
+
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "t4jN4 0pCij4."
+
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "Adresa izvora pošte koji će biti prikazani u pregledu"
+
+#~ msgid "Default shortcut group"
+#~ msgstr "Podrazumevana grupa prečice"
+
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Podrazumevana širina površi sa prečicama"
+
+#~ msgid "Path to the default calendar folder"
+#~ msgstr "Putanja do podrazumevanog direktorijuma kalendara"
+
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Putanja do podrazumevanog direktorijuma kontakata"
+
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Putanja do podrazumevanog direktorijuma pošte"
+
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Putanja do podrazumevanog direktorijuma zaduženja"
+
+#~ msgid "Physical URI to the default calendar folder"
+#~ msgstr "Fizička adresa do podrazumevanog direktorijuma kalendara"
+
+#~ msgid "Physical URI to the default contacts folder"
+#~ msgstr "Fizička adresa do podrazumevanog direktorijuma kontakata"
+
+#~ msgid "Physical URI to the default mail folder"
+#~ msgstr "Fizička adresa do podrazumevanog direktorijuma pošte"
+
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Fizička adresa do podrazumevanog direktorijuma zaduženja"
+
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Da li se prikazuje površ sa direktorijumima"
+
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Da li se prikazuje površ sa prečicama"
+
+#~ msgid ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+#~ msgstr ""
+#~ "Upozorenje: Evolucija ne može da dogradi sve vaše podatke iz izdanja %d.%"
+#~ "d.%d.\n"
+#~ "Vaši podaci nisu obrisani, ali neće biti prikazani u ovom izdanju "
+#~ "Evolucije.\n"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Ne mogu da pokrenem konzolu Ximian Evolucije: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "Ponovo poša_lji..."
 
 #~ msgid "UID of the contacts source that the view will display"
 #~ msgstr "KIB izvora kontakata koji će biti prikazani u pregledu"
@@ -18898,9 +19762,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "S_pouse:"
 #~ msgstr "S_upružnik:"
 
-#~ msgid "_Add"
-#~ msgstr "_Dodaj"
-
 #~ msgid "_Business:"
 #~ msgstr "_Posao:"
 
@@ -19023,15 +19884,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Due date is before start date!"
 #~ msgstr "Datum završetka je pre datuma početka!"
 
-#~ msgid "Start Date:"
-#~ msgstr "Datum početka:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Datum završetka:"
-
-#~ msgid "Priority:"
-#~ msgstr "Važnost:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19062,13 +19914,6 @@ msgstr "%s (%d%% završeno)"
 #~ "Ne mogu da skratim datoteku: %s\n"
 #~ "%s"
 
-#~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ne mogu da kopiram opis datoteke: %s\n"
-#~ "%s"
-
 #~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
@@ -19215,9 +20060,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "The view showing when the calendar starts"
 #~ msgstr "Pregled koji prikazuje kada počinje kalendar"
 
-#~ msgid "Enter the password for %s"
-#~ msgstr "Unesite lozinku za „%s“"
-
 #~ msgid "New task list"
 #~ msgstr "Novi spisak zaduženja"
 
@@ -19274,30 +20116,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Ne mogu da nađem navedeni deljeni direktorijum."
 
-#~ msgid "C_alendar:"
-#~ msgstr "K_alendar"
-
-#~ 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 "_Account:"
-#~ msgstr "_Nalog:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Ime direktorijuma:"
-
-#~ msgid "_User:"
-#~ msgstr "_Korisnik:"
-
 #~ msgid "Create a new window"
 #~ msgstr "Napravi novi prozor"
 
@@ -19319,75 +20137,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "_Go To Today"
 #~ msgstr "_Idi na danas"
 
-#~ msgid "Unexpected response from IMAP server %s: %s"
-#~ msgstr "Neočekivan odgovor od IMAP servera %s: %s"
-
-#~ msgid "Cannot select folder `%s': Invalid mailbox name"
-#~ msgstr "Ne mogu da izaberem direktorijum „%s“: neispravno ime sandučeta"
-
-#~ msgid "Cannot select folder `%s': Bad command"
-#~ msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
-
-#~ msgid "IMAP server %s unexpectedly disconnected: %s"
-#~ msgstr "Veza sa IMAP serverom %s je neočekivano prekinuta: %s"
-
-#~ msgid "Got BYE response"
-#~ msgstr "Primih odgovor BYE"
-
-#~ 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"
-
-#~ 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“"
-
-#~ msgid "%sPlease enter the IMAP password for %s on host %s"
-#~ msgstr "%sUnesite IMAP lozinku korisnika „%s“ na računaru %s"
-
-#~ msgid "Cannot authenticate to IMAP server %s using %s"
-#~ msgstr "Nisam mogao da se prijavim na IMAP server %s pomoću %s"
-
-#~ msgid "Cannot create folder `%s': Invalid mailbox name"
-#~ msgstr "Ne mogu da napravim direktorijum „%s“: neispravno ime sandučeta"
-
-#~ msgid "Cannot create folder `%s': Bad command"
-#~ msgstr "Ne mogu da napravim direktorijum „%s“: loša naredba"
-
-#~ msgid "Cannot delete folder `%s': Special folder"
-#~ msgstr "Ne mogu da obrišem direktorijum „%s“: naročiti direktorijum"
-
-#~ msgid "Cannot delete folder `%s': Invalid mailbox name"
-#~ msgstr "Ne mogu da obrišem direktorijum „%s“: neispravno ime sandučeta"
-
-#~ msgid "Cannot delete folder `%s': Bad command"
-#~ msgstr "Ne mogu da obrišem direktorijum „%s“: loša naredba"
-
-#~ msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-#~ msgstr ""
-#~ "Ne mogu da se pretplatim na direktorijum „%s“: neispravno ime sandučeta"
-
-#~ msgid "Cannot subscribe to folder `%s': Bad command"
-#~ msgstr "Ne mogu da se pretplatim na direktorijum „%s“: loša naredba"
-
-#~ msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-#~ msgstr ""
-#~ "Ne mogu da se odjavim sa direktorijuma „%s“: neispravno ime sandučeta"
-
-#~ msgid "Cannot unsubscribe from folder `%s': Bad command"
-#~ msgstr "Ne mogu da se odjavim sa direktorijuma „%s“: loša naredba"
-
-#~ msgid "Unexpected token in response from IMAP server %s: "
-#~ msgstr "Neočekivani element u odgovoru IMAP servera %s: "
-
-#~ msgid "No data"
-#~ msgstr "Nema podataka"
-
 #~ msgid "<b>Filter Rules</b>"
 #~ msgstr "<b>Pravila filtera</b>"
 
@@ -19403,9 +20152,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "[script]"
 #~ msgstr "[skripta]"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Sledeće veze su trenutno aktivne:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Potraži kontakte"
 
@@ -19946,9 +20692,6 @@ msgstr "%s (%d%% završeno)"
 #~ "This message is digitally signed but can not be proven to be authentic."
 #~ msgstr "Ova poruka je digitalno potpisana ali ne može biti proverena."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Greška Evolucije"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -20046,15 +20789,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "<b>Alarm Sound</b>"
 #~ msgstr "<b>Zvuk alarma</b>"
 
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "<b>Podsetnici</b>"
-
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>Uzbune</b>"
-
-#~ msgid "<b>Task List</b>"
-#~ msgstr "<b>Spisak zaduženja</b>"
-
 #~ msgid "<b>Classification</b>"
 #~ msgstr "<b>Klasifikacija</b>"
 
@@ -20753,9 +21487,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "No cards"
 #~ msgstr "Nema karata"
 
-#~ msgid "%d cards"
-#~ msgstr "%d karata"
-
 #~ msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #~ msgstr ",123,a,b,v,g,d,đ,ž,z,i,j,k,l,lj,m,n,nj,o,p,r,s,t,ć,u,f,h,c,č,dž,š"
 
@@ -21092,9 +21823,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Configure the appearance of the Evolution Summary here"
 #~ msgstr "Podesite ovde izgled Evolucija sažetka"
 
-#~ msgid "Evolution Summary"
-#~ msgstr "Evolucija sažetak"
-
 #~ msgid "Evolution Summary component"
 #~ msgstr "Komponenta Evolucija sažetka"
 
-- 
cgit v1.2.3