*** empty log message ***

svn path=/trunk/; revision=25216
author: Denis Lackovic <delacko@src.gnome.org> 2004-03-29 06:46:57 +0800
committer: Denis Lackovic <delacko@src.gnome.org> 2004-03-29 06:46:57 +0800
commit: 9fab86cb59bf7ca18e5f00c0b6c31a4b24ba390d (patch)
tree: d65773be605618334978b266529ae8f869cd8a3a /po
parent: 53167c89e32be8da8b3dcad4224664a1e0c445f0 (diff)
download: gsoc2013-evolution-9fab86cb59bf7ca18e5f00c0b6c31a4b24ba390d.tar
gsoc2013-evolution-9fab86cb59bf7ca18e5f00c0b6c31a4b24ba390d.tar.gz
gsoc2013-evolution-9fab86cb59bf7ca18e5f00c0b6c31a4b24ba390d.tar.bz2
gsoc2013-evolution-9fab86cb59bf7ca18e5f00c0b6c31a4b24ba390d.tar.lz
gsoc2013-evolution-9fab86cb59bf7ca18e5f00c0b6c31a4b24ba390d.tar.xz
gsoc2013-evolution-9fab86cb59bf7ca18e5f00c0b6c31a4b24ba390d.tar.zst
gsoc2013-evolution-9fab86cb59bf7ca18e5f00c0b6c31a4b24ba390d.zip
2 files changed, 2386 insertions, 2982 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 170180d807..f1d752e3ec 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-28  Robert Sedak  <robert.sedak@sk.htnet.hr>
+
+	* hr.po: Updated Croatian translation.
+
 2004-03-28  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
 	* es.po: Updated Spanish translation.
diff --git a/po/hr.po b/po/hr.po
index a716c0c7a7..189d10f319 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,17 +1,52 @@
 # Translation of evolution to Croatiann
 # Copyright (C) Croatiann team
-# Translators: Automatski Prijevod <>,Boris Tudan <boris.tudan@ka.htnet.hr>,Danijel Studen <dstuden@vuka.hr>,Denis Lackovic <delacko@fly.srk.fer.hr>,Diana Ćorluka <dina@iskrameco.hr>,Igor Jagec <igorm5@yahoo.com>,Ivan Knežević <kn3z@lycos.com>,Jerko Bakotin <jere_b@lycos.com>,Mato Kutlić <mate@iskraemeco.hr>,Nikola Planinac <>,pr pr <delacko@192.168.0.1>,Robert Avilov <ravilov@linux.hr>,Robert Sedak <robert.sedak@sk.tel.hr>,Robert Vuković <robi@surfer.hr>,Sasa Poznanovic <sasa.poznanovic@vuka.hr>,Tanja Minarik <tanja@finte.net>,Vedran Vyroubal <vedran.vyroubal@inet.hr>,Vlatko Kosturjak <kost@linux.hr>,
+# Translators: Automatski Prijevod <>,Boris Tudan <boris.tudan@ka.htnet.hr>,Danijel Studen <dstuden@vuka.hr>,Denis Lackovic <delacko@fly.srk.fer.hr>,Diana Ćorluka <dina@iskrameco.hr>,Igor Jagec <igorm5@yahoo.com>,Ivan Knežević <kn3z@lycos.com>,Jerko Bakotin <jere_b@lycos.com>,Željko Brajdić <zorz@iskon.hr>,Mato Kutlić <mate@iskraemeco.hr>,Nikola Planinac <>,pr pr <delacko@192.168.0.1>,Robert Avilov <ravilov@linux.hr>,Robert Sedak <robert.sedak@sk.tel.hr>,Robert Vuković <robi@surfer.hr>,Sasa Poznanovic <sasa.poznanovic@vuka.hr>,Tanja Minarik <tanja@finte.net>,Vedran Vyroubal <vedran.vyroubal@inet.hr>,Vladimir Žderić <vz@piksel.hr>,Vlatko Kosturjak <kost@linux.hr>,
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
-"PO-Revision-Date: 2004-02-01 16:52+CET\n"
+"POT-Creation-Date: 2004-03-29 00:22+0200\n"
+"PO-Revision-Date: 2004-03-29 00:45+CEST\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: TransDict server\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: a11y/addressbook/ea-addressbook-view.c:94
+#: a11y/addressbook/ea-addressbook-view.c:103
+#: a11y/addressbook/ea-minicard-view.c:119
+msgid "evolution addressbook"
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:101
+msgid "current addressbook folder "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "have "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+msgid " cards"
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+msgid " card"
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr ""
 
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
@@ -40,9 +75,10 @@ msgid "Configure autocomple here"
 msgstr "Ovdje podesite automatsko nadopunjavanje"
 
 #. 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);
+#.  can not get name, should be a bug of e-book.Anyway, should set a default name.
+#. 
+#.  name = e_book_get_name (book);
+#.  Create the contacts group
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:363
@@ -86,19 +122,18 @@ msgid "Manager your S/Mime certificates here"
 msgstr "Upravljanje vašim S/Mime certifikatima"
 
 #: addressbook/gui/component/addressbook-component.c:225
-#, fuzzy, c-format
+#, , c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Adresar '%s' će biti uklonjen. Jeste li sigurni da želite nastaviti?"
 
-#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/addressbook-component.c:313
 #: addressbook/gui/component/ldap-config.glade.h:29
-#, fuzzy
 msgid "New Address Book"
 msgstr "Novi adresar"
 
-#: addressbook/gui/component/addressbook-component.c:309
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
-#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:314
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -106,32 +141,32 @@ msgstr "Novi adresar"
 msgid "Delete"
 msgstr "Obriši"
 
-#: addressbook/gui/component/addressbook-component.c:310
-#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:315
+#: calendar/gui/calendar-component.c:435 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Postavke..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "New Contact"
 msgstr "Novi kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "Create a new contact"
 msgstr "Unesi novi kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:566
 msgid "New Contact List"
 msgstr "Nova lista kontakata"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "Contact _List"
 msgstr "Kontakt _lista"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Create a new contact list"
 msgstr "Napravi novi kontakt popis"
 
@@ -175,30 +210,32 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Lokacija hijerarhije Evolution mape kontakata se promijenila od inačice "
-"Evolutiona 1.x.\n"
+"Lokacija hijerarhije Evolution mape kontakata se promijenila od inačice Evolutiona 1.x.\n"
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
 #: calendar/gui/migration.c:175 mail/em-migrate.c:1112
-#, c-format
 msgid "Migrating `%s':"
 msgstr "Migriram `%s':"
 
 #. create the local source group
+#.  On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:509
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr "Na ovom računalu"
 
 #. Create the default Person addressbook
+#.  Create the default Person calendar
+#.  Create the default Person task list
+#.  orange
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:517
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Osobni podaci"
 
@@ -212,9 +249,8 @@ msgid "LDAP Servers"
 msgstr "Mijenjaj LDAP poslužitelje"
 
 #: addressbook/gui/component/addressbook-migrate.c:673
-#, fuzzy
 msgid "Autocompletion Settings"
-msgstr "Automatsko dovršavanje"
+msgstr "Postavke automatskog dopunjavanja"
 
 #: addressbook/gui/component/addressbook.c:275
 msgid ""
@@ -236,10 +272,8 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 "Vrijeme za izvršavanje ovog upita prekoračuje ograničenje poslužitelja ili\n"
-"ograničenje koje ste postavili za ovaj adresar. Molim, preciznije "
-"postavite \n"
-"upit ili povećajte vremensko ograničenje u postavkama poslužitelja "
-"direktorija\n"
+"ograničenje koje ste postavili za ovaj adresar. Molim, preciznije postavite \n"
+"upit ili povećajte vremensko ograničenje u postavkama poslužitelja direktorija\n"
 "za ovaj adresar."
 
 #: addressbook/gui/component/addressbook.c:287
@@ -259,34 +293,32 @@ msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
 msgstr ""
-"Ne mogu otvoriti adresar. Molim provjerite postoji li putanja i imate li "
-"dozvole pristupiti joj."
+"Ne mogu otvoriti adresar. Molim provjerite postoji li putanja i "
+"imate li dozvole pristupiti joj."
+""
 
 #: addressbook/gui/component/addressbook.c:601
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
-"Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni "
-"URI, ili je LDAP poslužitelj nedostupan."
+"Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni URI, "
+"ili je LDAP poslužitelj nedostupan."
 
 #: addressbook/gui/component/addressbook.c:606
 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 Evolutiona nema ugrađenu podršku za LDAP. Ako LDAP ipak želite "
-"koristiti u Evolutionu, morate kompajlirati program iz CVS izvornih kodova "
-"nakon što skinete OpenLDAP sa donjeg linka."
+msgstr "Ova verzija Evolutiona nema ugrađenu podršku za LDAP. Ako LDAP ipak želite koristiti u Evolutionu, morate kompajlirati program iz CVS izvornih kodova nakon što skinete OpenLDAP sa donjeg linka."
 
 #: addressbook/gui/component/addressbook.c:615
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
-"Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni "
-"URI, ili je poslužitelj nedostupan"
+"Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni URI, "
+"ili je poslužitelj nedostupan"
 
 #: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
@@ -301,7 +333,6 @@ msgid "Failed to authenticate.\n"
 msgstr "Neuspjela prijava.\n"
 
 #: addressbook/gui/component/addressbook.c:791
-#, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sUnesite zaporku za %s (korisnik %s)"
 
@@ -310,9 +341,8 @@ msgid "UID of the contacts source that the view will display"
 msgstr "UID izvora kontakata koje će pregled ispisati"
 
 #: addressbook/gui/component/addressbook.c:1121
-#, fuzzy
 msgid "The URI that the address book will display"
-msgstr "URI koju će kalendar pokazati"
+msgstr "URI koji će prikazati adresar"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -336,7 +366,6 @@ msgstr "URI mape koja je zadnja korištena u dijalogu za izbor imena"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
 msgid "\n"
 msgstr "\n"
 
@@ -359,7 +388,7 @@ msgstr " P_rikaži podržane baze "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
+#: 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
@@ -391,22 +420,19 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-#, fuzzy
 msgid "Address Book Creation Assistant"
 msgstr "Pomoćnik za stvaranje adresara"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
 msgid "Address Book Properties"
-msgstr "Svojstva adresara"
+msgstr "Postavke knjige adresara"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
 msgid "Address Book Sources"
-msgstr "Podešavanja adresara"
+msgstr "Izvori adresara"
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Uvijek"
 
@@ -415,16 +441,15 @@ msgid "Anonymously"
 msgstr "Anonimno"
 
 #: addressbook/gui/component/ldap-config.glade.h:16
-#, fuzzy
 msgid ""
 "Congratulations, you are\n"
 "\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
-"Čestitamo, završili ste s postavljanjem kalendara.\n"
+"Čestitamo, završili ste s podešavanjem adresara.\n"
 "\n"
-"Molim kliknite gumb \"Primjeni\" kako biste spremili postavke koje ste ovdje "
+"Kliknite gumb \"Primjeni\" kako biste spremili postavke koje ste ovdje "
 "unijeli."
 
 #: addressbook/gui/component/ldap-config.glade.h:20
@@ -444,8 +469,7 @@ msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution će koristiti ovaj DN za prijavljivanje na server"
 
 #: addressbook/gui/component/ldap-config.glade.h:24
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
+msgid "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution će koristiti ovu adresu e-pošte za prijavljivanje na server"
 
 #: addressbook/gui/component/ldap-config.glade.h:25
@@ -455,7 +479,7 @@ msgstr "Završeno"
 
 #: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Općenito"
@@ -466,7 +490,7 @@ msgid "Group:"
 msgstr "Grupa:"
 
 #: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Nikada"
 
@@ -479,8 +503,8 @@ msgid ""
 "your connection. Ask your system administrator if your LDAP server uses "
 "these protocols."
 msgstr ""
-"Sada morate odrediti kako se želite povezati na LDAP poslužitelj. SSL "
-"(Secure Sockets Layer)\n"
+"Sada morate odrediti kako se želite povezati na LDAP poslužitelj. SSL (Secure "
+"Sockets Layer)\n"
 "i TLS (Transport Layer Security) protokole neki poslužitelji koriste u svrhu "
 "kriptografske zaštite\n"
 "veze. Pitajte svog administratora sustava koristi li vaš LDAP poslužitelj "
@@ -524,7 +548,8 @@ msgid ""
 msgstr ""
 "Odabiranje ove opcije znači da će Evolution pokušati da koristi samo SSL/TLS "
 "ako okruženje \n"
-"nije sigurno. Na primjer, ako je vaš LDAP server iza vatrozida na poslu,\n"
+"nije sigurno. Na primjer, ako je vaš LDAP server iza vatrozida na "
+"poslu,\n"
 "onda nema potrebe da Evolution koristi SSL/TLS jer je vaša veza već\n"
 "sigurna."
 
@@ -547,18 +572,20 @@ msgid ""
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
-"Odabiranje ove opcije omogućiti će promjenu promjenu uobičajenih "
-"postavkiLDAP\n"
+"Odabiranje ove opcije omogućiti će promjenu promjenu uobičajenih postavki"
+"LDAP\n"
 "Evolution pretraživanja i  upisivanja i mijenjanja kontakata. "
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
 msgid ""
 "Specifying a\n"
 "\t\t\t  display name and group is the first step in setting\n"
 "\t\t\t  up an address book."
 msgstr ""
-"Određivanje prikazanog imena i grupe je prvi korak u podešavanju adresara."
+"Određivanje \n"
+"\t\t\t  prikazanog imena i grupe je prvi korak\n"
+"\t\t\t  u podešavanju adresara."
+""
 
 #: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
@@ -593,8 +620,7 @@ msgid ""
 "if you\n"
 "need to change these options."
 msgstr ""
-"Opcije na ovoj strani kontroliraju broj unosa uključenih u pretragu, i "
-"koliko\n"
+"Opcije na ovoj strani kontroliraju broj unosa uključenih u pretragu, i koliko\n"
 "pretraga uzima vremena. Kontaktirajte vašeg sistem administratora \n"
 "za promijenu ovih opcija."
 
@@ -624,7 +650,6 @@ msgstr ""
 "Opseg pretrage \"one\" će uključiti samo unose jedan nivo ispod vaše baze.\n"
 
 #: addressbook/gui/component/ldap-config.glade.h:66
-#, fuzzy
 msgid ""
 "This assistant will help you\n"
 "\t      create a new address book. \n"
@@ -633,7 +658,7 @@ msgid ""
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
-"Pomoćnik će vam pomoću u stvaranju novog adresara. \n"
+"Pomoćnik će vam pomoći u stvaranju novog adresara. \n"
 "\n"
 "Ovisno o vrsti adresara, možda će biti potrebni dodatni parametri.\n"
 "Molim kontaktirajte administratora vašeg sustava ako trebate pomoć\n"
@@ -646,7 +671,6 @@ msgid ""
 msgstr "Puno ime vašeg LDAP servera. Na primjer, \"ldap.mojafirma.com\"."
 
 #: addressbook/gui/component/ldap-config.glade.h:73
-#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -661,8 +685,9 @@ msgid ""
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
-"Metoda koju će Evolution koristiti za vašu prijavu.Postavka \"Email Address"
-"\" zahtijeva anonimni pristup na vaš LDAP poslužitelj."
+"Metoda koju će Evolution koristiti za vašu prijavu."
+"Postavka \"Email Address\" zahtijeva anonimni pristup na vaš LDAP "
+"poslužitelj."
 
 #: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
@@ -678,9 +703,7 @@ msgstr ""
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
 "display purposes only. "
-msgstr ""
-"Ovo je ime koje će se prikazati u list mapa Evolutiona. Ovo je samo za "
-"potrebe prikaza."
+msgstr "Ovo je ime koje će se prikazati u list mapa Evolutiona. Ovo je samo za potrebe prikaza."
 
 #: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
@@ -710,7 +733,7 @@ msgid "Using email address"
 msgstr "Koristim adresu elektronske pošte"
 
 #: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Kada je moguće"
 
@@ -721,9 +744,8 @@ msgid ""
 "log in information. Please ask your system administrator if you are unsure "
 "of this information."
 msgstr ""
-"Odlučili ste podesiti LDAP poslužitelj. Prvi korak u tom postupku je dati "
-"ime poslužitelja i i podatke za prijavu. Molim kontaktirajte administratora "
-"vašeg sustava\n"
+"Odlučili ste podesiti LDAP poslužitelj. Prvi korak u tom postupku je dati ime poslužitelja i "
+"i podatke za prijavu. Molim kontaktirajte administratora vašeg sustava\n"
 "ako ne znate ove podatke."
 
 #: addressbook/gui/component/ldap-config.glade.h:89
@@ -737,8 +759,8 @@ msgstr "Limit za _preuzimanje:"
 
 #: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -811,7 +833,7 @@ msgid "Send HTML Mail?"
 msgstr "Pošalji HTML poruku?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:330
-#: addressbook/gui/widgets/eab-popup-control.c:1002
+#: addressbook/gui/widgets/eab-popup-control.c:1001
 msgid "Add to Contacts"
 msgstr "Dodaj kontaktima"
 
@@ -894,7 +916,7 @@ msgstr "Suradnja"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1997
 msgid "Contact Editor"
 msgstr "Sva polja"
 
@@ -903,7 +925,7 @@ msgid "D_epartment:"
 msgstr "O_djel:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalji"
@@ -929,8 +951,8 @@ msgid ""
 "If this person has the ability to participate in a video conference, enter "
 "their address here."
 msgstr ""
-"Ako ova osoba ima mogućnost sudjelovati u video konferenciji, unesite njenu "
-"adresu ovdje."
+"Ako ova osoba ima mogućnost sudjelovati u video konferenciji, unesite "
+"njenu adresu ovdje."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid ""
@@ -988,13 +1010,13 @@ msgstr "_Kategorije..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1057 calendar/gui/e-calendar-table.c:1075
+#: calendar/gui/e-calendar-view.c:1335 calendar/gui/e-calendar-view.c:1366
+#: mail/em-folder-tree.c:2504 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:35
+#: 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:19
 msgid "_Delete"
 msgstr "_Obriši"
 
@@ -1039,22 +1061,22 @@ msgid "_Web page address:"
 msgstr "Adresa _stranice na Internetu:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 msgid "Address"
 msgstr "Adresa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: 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:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: 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:182
+#: addressbook/gui/widgets/e-minicard.c:173
 msgid "Editable"
 msgstr "Može se uređivati"
 
@@ -2031,14 +2053,13 @@ msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#, fuzzy
 msgid "Novell Groupwise"
-msgstr "Novell GroupWise"
+msgstr "Novell Groupwise"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2813
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2051,20 +2072,21 @@ msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2816
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr "ICQ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 msgid "Service"
 msgstr "Servis"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 msgid "Location"
 msgstr "Lokacija"
 
@@ -2073,113 +2095,95 @@ msgid "Username"
 msgstr "Korisničko ime"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2481
+#: addressbook/gui/contact-editor/e-contact-editor.c:2777
 msgid "Home"
 msgstr "Polazno"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
+#: addressbook/gui/contact-editor/e-contact-editor.c:2781
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Posao"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2482
+#: addressbook/gui/contact-editor/e-contact-editor.c:2785
 msgid "Other"
 msgstr "Ostalo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 msgid "Source Book"
 msgstr "Izvorišna knjiga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr "Odredišna knjiga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 msgid "Is New Contact"
 msgstr "Je novi kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr "Upisna polja"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
 msgstr "Promijenjen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "Ime računa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1463
 msgid "Category editor not available."
 msgstr "Uređivač kategorija nije dostupan."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1471
 msgid "This contact belongs to these categories:"
 msgstr "Ovaj kontakt pripada sljedećim kategorijama:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1695
 msgid "Save Contact as VCard"
 msgstr "Spremi kontakt kao VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Sigurni ste da želite\n"
-"obrisati ove kontakte?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Sigurni ste da želite\n"
-"obrisati ovaj kontakt?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2480
 msgid "Business"
 msgstr "Posao"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2815
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:2817
 msgid "GroupWise"
-msgstr "Novell GroupWise"
+msgstr "Grupa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
-#, c-format
+#: addressbook/gui/contact-editor/e-contact-editor.c:3104
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nisam mogao pronać element za polje: `%s'"
 
@@ -2192,6 +2196,7 @@ msgid "_Edit Full"
 msgstr "_Uredi potpuno"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
 msgstr "_Puno ime:"
 
@@ -2199,6 +2204,22 @@ 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 ""
+"Sigurni ste da želite\n"
+"obrisati ove kontakte?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Sigurni ste da želite\n"
+"obrisati ovaj kontakt?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "_Adresa 2:"
@@ -2301,21 +2322,20 @@ msgid "_Title:"
 msgstr "_Naslov:"
 
 #: addressbook/gui/contact-editor/im.glade.h:2
-msgid "Account name:"
-msgstr "Ime korisničkog računa:"
-
-#: addressbook/gui/contact-editor/im.glade.h:3
 msgid "Add IM Account"
 msgstr "Dodaj IM korisnički račun"
 
+#: addressbook/gui/contact-editor/im.glade.h:3
+msgid "_Account name:"
+msgstr "_Ime korisničkog računa:"
+
 #: addressbook/gui/contact-editor/im.glade.h:4
-msgid "IM Service:"
-msgstr "IM servis:"
+msgid "_IM Service:"
+msgstr "Servis _IM:"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
-msgid "Location:"
-msgstr "Lokacija:"
+msgid "_Location:"
+msgstr "_Lokacija:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Members"
@@ -2337,8 +2357,8 @@ msgstr "_Unesite elektronsku adresu ili prevucite kontakt u donji popis:"
 msgid "contact-list-editor"
 msgstr "urednik-kontakt-liste"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:147
-#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:209
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
@@ -2346,16 +2366,16 @@ msgstr "urednik-kontakt-liste"
 msgid "Book"
 msgstr "Knjiga"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 msgid "Is New List"
 msgstr "Je li novi popis"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:211
 msgid "Contact List Editor"
 msgstr "Urednik kontakt liste"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431
 msgid "Save List as VCard"
 msgstr "Spremi popis kao VCard"
 
@@ -2406,16 +2426,14 @@ msgstr "Napredna pretraga"
 msgid "No contacts"
 msgstr "Nema kontakata"
 
+#. plural form
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-msgid "1 contact"
-msgstr "1 kontakt"
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:154
-#, c-format
-msgid "%d contacts"
-msgstr "%d kontakata"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:305
+#: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
 #: addressbook/gui/widgets/e-addressbook-view.c:223
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
@@ -2423,7 +2441,7 @@ msgstr "%d kontakata"
 msgid "Query"
 msgstr "Upit"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr "Greška kod učitavanja pregleda adresara"
 
@@ -2460,108 +2478,101 @@ msgstr "Napredno..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:230
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: 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/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:497
 msgid "Address Book"
 msgstr "Adresar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:838
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
-#: addressbook/gui/widgets/e-addressbook-view.c:2016
+#: addressbook/gui/widgets/e-addressbook-view.c:841
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:2019
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Spremi kao VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1048
 msgid "New Contact..."
 msgstr "Novi kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "New Contact List..."
 msgstr "Nova lista kontakata..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Go to Folder..."
 msgstr "Idi u mapu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 msgid "Import..."
 msgstr "Uvezi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Search for Contacts..."
 msgstr "Tražim kontakte..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:1056
 msgid "Address Book Sources..."
-msgstr "Podešavanja adresara"
+msgstr "Izvori adresara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "Pilot Settings..."
 msgstr "Podešavanja pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Prosljedi kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Send Message to Contact"
 msgstr "Pošalji kontaktu poruku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
+#: addressbook/gui/widgets/e-addressbook-view.c:1064 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:80
 msgid "Print"
 msgstr "Ispis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Print Envelope"
 msgstr "Ispiši omotnicu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:1070
 msgid "Copy to Address Book..."
-msgstr "Adresar..."
+msgstr "Kopiraj u adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 msgid "Move to Address Book..."
-msgstr "Adresar..."
+msgstr "Premjesti u adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Izreži"
 
-#. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: calendar/gui/calendar-component.c:372
-#: calendar/gui/dialogs/copy-source-dialog.c:159
-#: 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: calendar/gui/calendar-component.c:432 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 "Kopiraj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1076
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Umetni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1078
-#: calendar/gui/e-cal-view.c:1269
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: calendar/gui/e-calendar-view.c:1302
 msgid "Current View"
 msgstr "Trenutačni pogled"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
-#, c-format
+#: addressbook/gui/widgets/e-addressbook-view.c:1270
 msgid ""
 "The addressbook backend for\n"
 "%s\n"
@@ -2569,11 +2580,11 @@ msgid ""
 msgstr ""
 "Osnovni proces adresara za\n"
 "%s\n"
-"je pao. Morat ćete ponovo pokreneti Evolution kako bi nastavilida je "
-"koristite"
+"je pao. Morat ćete ponovo pokreneti Evolution kako bi nastavili"
+"da je koristite"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:1610
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
@@ -2607,8 +2618,6 @@ msgid "Car Phone"
 msgstr "Telefon (u autu)"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kategorije"
 
@@ -2617,7 +2626,7 @@ msgid "Company Phone"
 msgstr "Telefon poduzeća"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-pošta"
 
@@ -2668,6 +2677,7 @@ msgid "Manager"
 msgstr "Upravitelj"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
@@ -2676,7 +2686,7 @@ msgid "Nickname"
 msgstr "Nadimak"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr "Bilješka"
 
@@ -2685,7 +2695,7 @@ msgid "Office"
 msgstr "Ured"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "Organizacija"
 
@@ -2741,19 +2751,20 @@ msgid "Web Site"
 msgstr "Web-lokacija"
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:145
+#: addressbook/gui/widgets/e-minicard.c:136
 msgid "Width"
 msgstr "Širina"
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard.c:143
 msgid "Height"
 msgstr "Visina"
 
 #: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:160
+#: addressbook/gui/widgets/e-minicard.c:151
 msgid "Has Focus"
-msgstr "Sadrži Fokus"
+msgstr """"
+"Sadrži Fokus"
 
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
@@ -2803,184 +2814,179 @@ msgstr ""
 msgid "Adapter"
 msgstr "Kartica"
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 msgid "Selected"
 msgstr "Odabrano"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 msgid "Has Cursor"
 msgstr "Sadrži Pokazivač"
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
-msgstr ""
+msgstr "(map)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
-msgstr ""
+msgstr "karta"
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 msgid "List Members"
 msgstr "Popis članova"
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
-#, fuzzy
+#: addressbook/gui/widgets/eab-contact-display.c:298
 msgid "E-mail"
 msgstr "E-pošta"
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-#, fuzzy
-msgid "work"
-msgstr "Posao"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#, fuzzy
+#: addressbook/gui/widgets/eab-contact-display.c:306
 msgid "Position"
-msgstr "Opis"
+msgstr "Položaj"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
-#, fuzzy
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 msgid "Groupwise"
 msgstr "Grupa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
-#, fuzzy
+#: addressbook/gui/widgets/eab-contact-display.c:313
 msgid "Video Conferencing"
-msgstr "_Adresa za video konferenciju:"
+msgstr "Video savjetovanje"
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#, fuzzy
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 msgid "Phone"
-msgstr "Telefon (u autu)"
+msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
-msgstr ""
+msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
-#, fuzzy
-msgid "personal"
-msgstr "Osobni podaci"
+#: addressbook/gui/widgets/eab-contact-display.c:319
+msgid "work"
+msgstr "posao"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
-msgstr ""
+msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+msgid "personal"
+msgstr "osobno"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 msgid "Job Title"
 msgstr "Poslovna titula"
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Home page"
 msgstr "Početna stranica"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "Uspjeh"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap-store.c:288
 #: camel/providers/pop3/camel-pop3-store.c:538
 #: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1071
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr "Arhiva nije na mreži"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "Pristup odbijen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Contact not found"
 msgstr "Kontakt nije nađen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Contact ID already exists"
 msgstr "Identifikator kontakta već postoji"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "Protokol nije podržan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2350 camel/camel-service.c:728
+#: 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 "Otkazano"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr "Provjera vjerodostojnosti neuspješna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr "Zahtijev za autentifikaciju obavezan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr "TLS nije dostupan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
-#, fuzzy
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Address Book does not exist"
 msgstr "Adresar ne postoji"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Druga greška"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "Želite li spremiti promjene?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr "_Odbaci"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "Greška kod dodavanja popisa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
-#: addressbook/gui/widgets/eab-gui-util.c:524
+#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:525
 msgid "Error adding contact"
 msgstr "Greška prilikom dodavanja kontakta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "Greška kod izmjene popisa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying contact"
 msgstr "Greška prilikom mijenjanja kontakta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "Greška kod uklanjanja popisa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
-#: addressbook/gui/widgets/eab-gui-util.c:482
+#: addressbook/gui/widgets/eab-gui-util.c:126
+#: addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Error removing contact"
 msgstr "Greška pri uklanjanju kontakta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
-#, c-format
+#: addressbook/gui/widgets/eab-gui-util.c:208
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
@@ -2988,7 +2994,7 @@ msgstr ""
 "Otvaranje %d kontakata će otvoriti %d novih prozora.\n"
 "Da li doista želite prikazati sve ove kontakte?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2996,114 +3002,105 @@ msgid ""
 msgstr ""
 "%s već postoji\n"
 "Želite li  prepisati preko njega?"
+""
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "Prebriši"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
-#, c-format
+#: addressbook/gui/widgets/eab-gui-util.c:274
 msgid "Error saving %s: %s"
 msgstr "Greška kod spremanja %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:310
+#: addressbook/gui/widgets/eab-gui-util.c:311
 msgid "card.vcf"
 msgstr "karta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:443
+#: addressbook/gui/widgets/eab-gui-util.c:444
 msgid "list"
 msgstr "popis"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 msgid "Move contact to"
 msgstr "Premjesti kontakt u"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Copy contact to"
 msgstr "Kopiraj kontakt u "
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 msgid "Move contacts to"
 msgstr "Premjesti kontakte u"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Copy contacts to"
 msgstr "Kopiraj kontakte u "
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
-#, fuzzy
+#: addressbook/gui/widgets/eab-gui-util.c:589
 msgid "Select target addressbook."
-msgstr "Spremi u adresaru"
+msgstr "Odaberite odredišni adresar."
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "Višestruke VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
-#, c-format
+#: addressbook/gui/widgets/eab-gui-util.c:771
 msgid "VCard for %s"
 msgstr "VCard za %s"
 
-#.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
+#.  * addresses (and *only* the e-mail addresses) associated with an existing
+#.  * contact.
 #: addressbook/gui/widgets/eab-popup-control.c:188
 msgid "(none)"
 msgstr "(niti jedan) "
 
 #: addressbook/gui/widgets/eab-popup-control.c:450
 msgid "Primary Email"
-msgstr "Glavna email adresa\r"
+msgstr "Glavna email adresa
+"
 
 #: addressbook/gui/widgets/eab-popup-control.c:586
 msgid "Select an Action"
 msgstr "Odaberi akciju"
 
 #: addressbook/gui/widgets/eab-popup-control.c:594
-#, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Unesi novi kontakt \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:610
-#, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Dodaj adresu postojećim kontaktima \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-#, fuzzy
 msgid "Querying Address Book..."
 msgstr "Pretražujem adresar..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Promjeni podatke o kontaktu"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "Spoji elektronske adrese"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
-#, c-format
-msgid "and %d other contacts."
-msgstr "i %d ostalih kontakata"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:142
+#. plural form
+#: addressbook/gui/widgets/eab-vcard-control.c:139
 msgid "and one other contact."
-msgstr "i još jedan kontakt."
+msgid_plural "and %d other contacts."
+msgstr[0] ""
+msgstr[1] ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:225
-#: addressbook/gui/widgets/eab-vcard-control.c:275
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
 msgid "Show Full VCard"
 msgstr "Prikaži potpun VCard"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "Prikaži kompaktan VCard"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "Spremi u adresaru"
 
@@ -3115,42 +3112,39 @@ msgstr "Kartični pogled"
 msgid "GTK Tree View"
 msgstr "Pogled GTK stabla"
 
-#: addressbook/gui/widgets/test-reflow.c:106
+#: addressbook/gui/widgets/test-reflow.c:119
 msgid "Reflow Test"
 msgstr "Test slanja"
 
-#: addressbook/gui/widgets/test-reflow.c:107
+#: addressbook/gui/widgets/test-reflow.c:120
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:109
+#: addressbook/gui/widgets/test-reflow.c:122
 msgid "This should test the reflow canvas item"
 msgstr "Ovo bi trebalo testirati element toka platna"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-#, fuzzy
 msgid "Evolution LDIF importer"
-msgstr "Evolution Elm uvoznik"
+msgstr "Evolucija LDIF uvoznik"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
 msgid "LDAP Data Interchange Format (.ldif)"
-msgstr ""
+msgstr "LDAP format razmjene podataka"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-#, fuzzy
 msgid "Evolution VCard Importer"
-msgstr "Evolution iCalendar uvoznik"
+msgstr "Evolucija VCard uvoznik"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-#, fuzzy
 msgid "Evolution VCard importer"
-msgstr "Evolution vCalendar uvoznik"
+msgstr "Evolucija VCard uvoznik"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
 msgid "VCard (.vcf, .gcrd)"
-msgstr ""
+msgstr "VCard (.vcf, .gcrd)"
 
 #: addressbook/printing/e-contact-print-envelope.c:212
 #: addressbook/printing/e-contact-print-envelope.c:233
@@ -3254,7 +3248,7 @@ msgstr "Margine"
 msgid "Number of columns:"
 msgstr "Broj stupaca:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Odrednice"
 
@@ -3385,22 +3379,17 @@ msgid "Export in asynchronous mode "
 msgstr "Izvoz u asinhronom načinu rada"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
-msgstr ""
-"Broj kartica u jednoj izlaznoj datoteci u asinhronom načinu rada, uobičajena "
-"veličina je 100."
+msgid "The number of cards in one output file in asychronous mode,default size 100."
+msgstr "Broj kartica u jednoj izlaznoj datoteci u asinhronom načinu rada, uobičajena veličina je 100."
 
 #: addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
 msgstr "NUMBER"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-"Greška kod argumenata u naredbenoj liniji, molim koristite --help da biste "
-"vidjeli način korištenja."
+msgid "Command line arguments error, please use --help option to see the usage."
+msgstr """Greška kod argumenata u naredbenoj liniji, molim koristite --help da biste vidjeli "
+"način korištenja."
 
 #: addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
@@ -3435,7 +3424,7 @@ msgid "Unnamed List"
 msgstr "Lista bez imena"
 
 #: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Upišite lozinku"
 
@@ -3512,7 +3501,7 @@ msgid "Evolution's Tasks component"
 msgstr "Komponenta zadataka Evolutiona"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1139 calendar/gui/print.c:1819
 #: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
@@ -3535,7 +3524,6 @@ msgid "Evolution Alarm"
 msgstr "Evolution alarm"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
-#, c-format
 msgid "Alarm on %s"
 msgstr "Alarm na %s"
 
@@ -3558,27 +3546,24 @@ msgstr "Vrijeme drijemanja (u minutama)"
 msgid "_Edit appointment"
 msgstr "_Promijeni sastanak"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: calendar/gui/alarm-notify/alarm-queue.c:906
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Otvori"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
-#, fuzzy
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
-msgstr "_Odbaci"
+msgstr "Odbaci"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
-#, fuzzy
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
 msgstr "Otpusti _sve"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr "Opis ne postoji."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
-#, c-format
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 msgid ""
 "Alarm on %s\n"
 "%s\n"
@@ -3590,12 +3575,12 @@ msgstr ""
 "Počinje u %s\n"
 "Završava u %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
-#: calendar/gui/alarm-notify/alarm-queue.c:1106
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1086
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3607,8 +3592,7 @@ msgstr ""
 "podsjetnik podešen za slanje poruke. Evolucija će\n"
 "umjesto toga pokazati normalan prozor za dijalog."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1112
-#, c-format
+#: calendar/gui/alarm-notify/alarm-queue.c:1119
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
 "configured to run the following program:\n"
@@ -3617,14 +3601,14 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Podsjetnik Evolutions kalendara će biti pokrenut. Ovaj podsjetnik je podešen "
-"da pokrene slijedeći program:\n"
+"Podsjetnik Evolutions kalendara će biti pokrenut. Ovaj podsjetnik je podešen da "
+"pokrene slijedeći program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Sigurno želite pokrenite ovaj program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1126
+#: calendar/gui/alarm-notify/alarm-queue.c:1133
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovno za ovu aplikaciju."
 
@@ -3785,17 +3769,16 @@ msgid "Comment contains"
 msgstr "Komentar sadrži"
 
 #: calendar/gui/cal-search-bar.c:53
-#, fuzzy
 msgid "Location contains"
-msgstr "Opis sadrži"
+msgstr "Mjesto sadrži"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr "Neupariv"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
-#: camel/providers/groupwise/camel-gw-listener.c:298
-#: camel/providers/groupwise/camel-gw-listener.c:322
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1596
+#: camel/providers/groupwise/camel-gw-listener.c:302
+#: camel/providers/groupwise/camel-gw-listener.c:326
 msgid "Calendar"
 msgstr "Kalendar"
 
@@ -3804,16 +3787,14 @@ 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 "
 "events."
-msgstr ""
-"Ova operacija će trajno obrisati sve događaje starije od odabranog "
-"vremenskog trajanja. Ako nastavite, navedene događaje nećete moći vratiti."
+msgstr "Ova operacija će trajno obrisati sve događaje starije od odabranog vremenskog trajanja. Ako nastavite, navedene događaje nećete moći vratiti."
 
 #: calendar/gui/calendar-commands.c:357
 msgid "Purge events older than"
 msgstr "Izbriši događaje starije od"
 
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
 msgid "days"
 msgstr "dana"
 
@@ -3822,9 +3803,13 @@ 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.
+#.  %b = abbreviated month name. Don't use any other specifiers.
+#.  strftime format %a = abbreviated weekday name,
+#.  %d = day of month, %b = abbreviated month name.
+#.  You can change the order but don't change the
+#.  specifiers or add anything.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3839,87 +3824,83 @@ 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.
+#.  month name. You can change the order but don't
+#.  change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:464
 #: 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:313
-#, c-format
+#: calendar/gui/calendar-component.c:373
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Kalendar '%s' će biti uklonjen. Jeste li sigurni da želite nastaviti?"
 
-#: calendar/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:430
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:926
 msgid "New appointment"
 msgstr "Novi zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:927
 msgid "_Appointment"
 msgstr "_Obveza"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:928
 msgid "Create a new appointment"
 msgstr "Napravi novi sastanak"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:933
 msgid "New meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:934
 msgid "M_eeting"
 msgstr "_Sastanak"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:935
 msgid "Create a new meeting request"
 msgstr "Unesite novi zahtjev za sastankom"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:940
 msgid "New all day appointment"
 msgstr "Novi cijelodnevni sastanak"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:941
 msgid "All _Day Appointment"
 msgstr "Cijelo_dnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:942
 msgid "Create a new all-day appointment"
 msgstr "Unesite novi cjelodnevni sastanak"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:947
 msgid "New calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:948
 msgid "C_alendar"
 msgstr "_Kalendar"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:949
 msgid "Create a new calendar"
 msgstr "Kreiraj novi kalendar"
 
-#: calendar/gui/calendar-component.c:933
-#, c-format
+#: calendar/gui/calendar-component.c:1016
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "NIje moguće otvoriti kalendar %s' za kreiranje događaja i sastanaka"
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1028
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nema dostupnog kalendara za stvaranje događaja i sastanaka"
 
 #: calendar/gui/calendar-offline-handler.c:192
-#, c-format
 msgid "backend_go_offline(): %s"
 msgstr "backend_go_offline(): %s"
 
 #: calendar/gui/calendar-offline-handler.c:215
-#, c-format
 msgid "backend_go_online(): %s"
 msgstr "backend_go_online(): %s"
 
@@ -3939,10 +3920,6 @@ msgstr "Tjedni pregled"
 msgid "Month View"
 msgstr "Mjesečni pregled"
 
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr "Prikaz liste"
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Greška kod otvaranja kalendara"
@@ -3956,20 +3933,18 @@ msgid "Permission denied to open the calendar"
 msgstr "Zabranjen pristup kalendaru"
 
 #: calendar/gui/comp-editor-factory.c:474
-#, c-format
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:140
-#, c-format
+#: calendar/gui/control-factory.c:142
 msgid "Could not open the folder in '%s'"
 msgstr "Nisam mogao otvoriti direktorij u '%s"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "URI koju će kalendar pokazati"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr "Tip pogleda za prikaz"
 
@@ -4033,11 +4008,11 @@ msgstr "dialog1"
 msgid "extra times every"
 msgstr "pokaži još na svakih"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
 msgid "hours"
 msgstr "sati"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minute"
 
@@ -4060,11 +4035,11 @@ msgstr "Osnove"
 msgid "Date/Time:"
 msgstr "Datum/Vrijeme:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:463
+#: 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:459
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Odsviraj zvuk"
 
@@ -4072,17 +4047,17 @@ msgstr "Odsviraj zvuk"
 msgid "Reminders"
 msgstr "Podsjetnici"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471
+#: 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
-msgid "Send an Email"
-msgstr "Pošalji elektronsku poruku"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Pošalji e-poštu"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:938 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:164
 msgid "Summary:"
 msgstr "Sažetak:"
@@ -4113,7 +4088,7 @@ msgid "hour(s)"
 msgstr "sat(i)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:40
 msgid "minute(s)"
 msgstr "minuta(e)"
 
@@ -4122,9 +4097,9 @@ msgid "start of appointment"
 msgstr "početak zakazanog sastanka"
 
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
+#.  has "activatable" set.
+#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:493
+#: mail/em-composer-prefs.c:710 mail/em-composer-prefs.c:874
 msgid "Enabled"
 msgstr "Omogućeno"
 
@@ -4139,18 +4114,18 @@ msgstr "Nemoj ukloniti"
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
 #: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:397
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:695
+#: mail/em-composer-prefs.c:719
 msgid "Disable"
 msgstr "Onemogući"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
 #: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:401
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:695
+#: mail/em-composer-prefs.c:719
 msgid "Enable"
 msgstr "Omogući"
 
@@ -4174,7 +4149,7 @@ msgstr "30 minuta"
 msgid "60 minutes"
 msgstr "60 minuta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "Alerts"
 msgstr "Uzbune"
 
@@ -4199,7 +4174,7 @@ msgid "Days"
 msgstr "dani"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "_Omogući"
 
@@ -4308,7 +4283,7 @@ msgstr "_12 satni (AM/PM)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_24 hour"
-msgstr "_24-očasovni"
+msgstr "_24-satno"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Add URL"
@@ -4339,7 +4314,6 @@ msgid "_Fri"
 msgstr "_Pet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Općenito"
 
@@ -4365,7 +4339,7 @@ msgstr "_Pokaži završetke zakazanih sastanaka u tjednim i mjesečnim prikazima
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Time divisions:"
-msgstr "Podjela _vrijemena:"
+msgstr "Podjela _vremena:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Tue"
@@ -4384,22 +4358,18 @@ msgid "You must specify a location to get the calendar from."
 msgstr "Morate navesti lokaciju iz koje ćete dohvatiti kalendar."
 
 #: calendar/gui/dialogs/calendar-setup.c:164
-#, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Lokacija izvora '%s' nije dobro formirana."
 
 #: calendar/gui/dialogs/calendar-setup.c:179
-#, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "Lokacija izvora '%s' nije webcal izvor."
 
 #: calendar/gui/dialogs/calendar-setup.c:216
-#, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Datoteka s kodom '%s' već postoji u odabranoj grupi"
 
 #: calendar/gui/dialogs/calendar-setup.c:229
-#, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
 "from"
@@ -4451,15 +4421,16 @@ msgid ""
 "Specifying a display name and group is the first step in setting up a "
 "calendar."
 msgstr ""
-"Određivanje prikazanog imena i grupe je prvi korak u podešavanju kalendara."
+"Određivanje prikazanog imena i grupe je prvi korak u podešavanju "
+"kalendara."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:19
 msgid ""
 "Specifying a display name and group is the first step in setting up a task "
 "list."
 msgstr ""
-"Određivanje prikazanog imena i grupe je prvi korak u podešavanju popisa "
-"zadataka."
+"Određivanje prikazanog imena i grupe je prvi korak u podešavanju "
+"popisa zadataka."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "Step 2: Remote Folder Parameters"
@@ -4507,8 +4478,7 @@ msgid ""
 "requires you\n"
 "to specify additional parameters."
 msgstr ""
-"Stvarate mapu u grupi koja je spremljena na udaljenoj lokaciji. To "
-"zahtjeva \n"
+"Stvarate mapu u grupi koja je spremljena na udaljenoj lokaciji. To zahtjeva \n"
 "navođenje dodatnih parametara."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:38
@@ -4536,7 +4506,8 @@ msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
-"Obrisani zadataka je pridjeljen, želite li poslati poruku za  otkazivanje?"
+"Obrisani zadataka je pridjeljen, želite li poslati poruku za  "
+"otkazivanje?"
 
 #: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
@@ -4598,28 +4569,27 @@ msgstr "%s  Napravili ste izmjene. Odbaciti te izmjene i ažurirati uređivač?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Niste napravili nikakve izmjene. Ažurirati uređivač?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
-#, c-format
+#: calendar/gui/dialogs/comp-editor-page.c:440
 msgid "Validation error: %s"
 msgstr "Greška pri provjeri: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
 msgid " to "
 msgstr "do"
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
+#: 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:2265
+#: 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:2270
+#: 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:2272
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
 msgid "Due "
 msgstr "Due "
 
@@ -4634,19 +4604,16 @@ msgstr "Promijeni zakazani sastanak"
 
 #: calendar/gui/dialogs/comp-editor.c:882
 #: calendar/gui/dialogs/comp-editor.c:919
-#, c-format
 msgid "Appointment - %s"
 msgstr "Zakazani sastanak - %s"
 
 #: calendar/gui/dialogs/comp-editor.c:885
 #: calendar/gui/dialogs/comp-editor.c:922
-#, c-format
 msgid "Task - %s"
 msgstr "Zadatak - %s"
 
 #: calendar/gui/dialogs/comp-editor.c:888
 #: calendar/gui/dialogs/comp-editor.c:925
-#, c-format
 msgid "Journal entry - %s"
 msgstr "Stavka dnevnika - %s"
 
@@ -4655,8 +4622,9 @@ msgstr "Stavka dnevnika - %s"
 msgid "No summary"
 msgstr "Nema sažetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
+#: calendar/gui/dialogs/comp-editor.c:1360
+#: calendar/gui/e-calendar-table.c:1190 calendar/gui/e-calendar-view.c:1060
+#: composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Spremi kao..."
 
@@ -4664,44 +4632,25 @@ msgstr "Spremi kao..."
 #: calendar/gui/dialogs/comp-editor.c:1487
 #: calendar/gui/dialogs/comp-editor.c:1513
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr ""
-"Izmjene učinjene na ovoj stavki mogu biti zanemarene kod sljedećeg ažuriranja"
+msgstr "Izmjene učinjene na ovoj stavki mogu biti zanemarene kod sljedećeg ažuriranja"
 
 #: calendar/gui/dialogs/comp-editor.c:1552
 msgid "Unable to use current version!"
 msgstr "Ne mogu koristiti trenutnu inačicu!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
-#, fuzzy
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
-msgstr "Nisam mogao ažurirati objekt"
+msgstr "Ne mogu otvoriti izvor"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
-#, fuzzy
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 msgid "Could not open destination"
-msgstr "Odredište slanja"
+msgstr "Ne mogu otvoriti odredište"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
-msgstr ""
-
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, fuzzy, c-format
-msgid "Select destination %s"
-msgstr "Izaberite "
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "Kalendar"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "Novi popis zadataka"
+msgstr "Odredište je samo za čitanje"
 
 #: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Sigurno želite izbrisati ovaj zakazani sastanak `%s'?"
 
@@ -4710,7 +4659,6 @@ msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Sigurni ste da želite obrisati ovaj nenaslovljeni sastanak?"
 
 #: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Sigurni ste da želite obrisati zadatak `%s'?"
 
@@ -4719,7 +4667,6 @@ msgid "Are you sure you want to delete this untitled task?"
 msgstr "Sigurni ste da želite obrisati ovaj nenaslovljeni zadatak?"
 
 #: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Sigurno želite izbrisati ovaj unos u dnevnik `%s'?"
 
@@ -4727,20 +4674,26 @@ msgstr "Sigurno želite izbrisati ovaj unos u dnevnik `%s'?"
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Sigurno želite izbrisati ovaj neimenovani unos u dnevnik?"
 
+#. plural form
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "Sigurno želite izbrisati %d zakazanih sastanaka?"
-
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "Sigurno želite izbrisati %d zadataka?"
-
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Sigurno želite izbrisati %d unosa u dnevnik?"
+msgid "Are you sure you want to delete %d appointment?"
+msgid_plural "Are you sure you want to delete %d appointments?"
+msgstr[0] ""
+msgstr[1] ""
+
+#. plural form
+#: calendar/gui/dialogs/delete-comp.c:138
+msgid "Are you sure you want to delete %d task?"
+msgid_plural "Are you sure you want to delete %d tasks?"
+msgstr[0] ""
+msgstr[1] ""
+
+#. plural form
+#: calendar/gui/dialogs/delete-comp.c:145
+msgid "Are you sure you want to delete %d journal entry?"
+msgid_plural "Are you sure you want to delete %d journal entries?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4802,7 +4755,7 @@ msgstr "Delegiraj za:"
 msgid "Enter Delegate"
 msgstr "Unesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Obveza"
 
@@ -4827,13 +4780,12 @@ msgid "Meeting"
 msgstr "Sastanak"
 
 #: calendar/gui/dialogs/event-page.c:458
-#, fuzzy
 msgid "Event with no start date"
-msgstr "Datum isteka je prije datuma početka!"
+msgstr "Događaj bez datuma početka"
 
 #: calendar/gui/dialogs/event-page.c:461
 msgid "Event with no end date"
-msgstr ""
+msgstr "Događaj bez datuma završetka"
 
 #: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
@@ -4852,7 +4804,6 @@ msgid "End time is wrong"
 msgstr "Završno vrijeme je pogrešno"
 
 #: calendar/gui/dialogs/event-page.c:1234
-#, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nije moguće otvoriti kalendar '%s'."
 
@@ -4875,8 +4826,6 @@ msgstr "Kalendar:"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Klasifikacija"
 
@@ -4925,15 +4874,20 @@ msgid "_Start time:"
 msgstr "_Početno vrijeme:"
 
 #. an empty string is the same as 'None'
+#.  add a "None" option to the stores menu
+#.  Put the "None" and "UTC" entries at the top of the combo's list.
+#.  When "None" is selected we want the field to be cleared.
+#.  Note that we don't show this here, since by default a 'None' date
+#.  is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: mail/em-account-prefs.c:454 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1316 mail/mail-account-gui.c:1850
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Nijedan"
 
@@ -4990,13 +4944,13 @@ msgid "Member"
 msgstr "Član"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:9
 #: calendar/gui/e-meeting-list-view.c:270
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
 #: mail/message-list.etspec.h:12
@@ -5066,8 +5020,7 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Mijenjate povratni zadatak,što želite promijeniti?"
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
+msgid "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "Mijenjate povratni unos u dnevnik, što želite promijeniti?"
 
 #: calendar/gui/dialogs/recur-comp.c:72
@@ -5088,8 +5041,7 @@ msgstr "Svi unosi"
 
 #: calendar/gui/dialogs/recurrence-page.c:542
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Ovaj sastanak sadrži povratne podatke koje Evolution ne može mijenjati."
+msgstr "Ovaj sastanak sadrži povratne podatke koje Evolution ne može mijenjati."
 
 #: calendar/gui/dialogs/recurrence-page.c:816
 msgid "Recurrence date is invalid"
@@ -5218,6 +5170,25 @@ msgstr "_Zanemari promjene"
 msgid "Save Event"
 msgstr "Spremi događaj"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+msgid "Select source"
+msgstr ""
+
+#. 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"
+msgstr "Odaberite odredište %s"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+msgid "calendar"
+msgstr "kalendar"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+msgid "task list"
+msgstr "popis zadataka"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Informacija o sastanku je napravljena. Da je pošaljem?"
@@ -5232,15 +5203,13 @@ msgstr "Informacija o primljenom zadatku je sačinjena. Poslati ju?"
 
 #: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
-msgstr ""
-"Informacija o zadatku je promijenjena. Želite li poslati ažuriranu inačicu?"
+msgstr "Informacija o zadatku je promijenjena. Želite li poslati ažuriranu inačicu?"
 
 #: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Datum završetka je pogrešan"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
 msgid "% _Complete"
 msgstr "% _ dovršeno"
 
@@ -5248,7 +5217,7 @@ msgstr "% _ dovršeno"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2347
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Završeno"
 
@@ -5261,7 +5230,7 @@ msgstr "Visok"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Izvodi se"
 
@@ -5272,7 +5241,7 @@ msgid "Low"
 msgstr "Nisko"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
 #: calendar/gui/e-tasks.c:229 mail/message-list.c:938
 msgid "Normal"
 msgstr "Obično"
@@ -5280,7 +5249,7 @@ msgstr "Obično"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Nije započelo"
 
@@ -5294,8 +5263,8 @@ msgid "Undefined"
 msgstr "Neodređeno"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "_Date Completed:"
-msgstr "_Datum izvršenja:"
+msgid "_Date completed:"
+msgstr "_Datum dovršetka:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
@@ -5329,7 +5298,6 @@ msgid "Due date is before start date!"
 msgstr "Datum isteka je prije datuma početka!"
 
 #: calendar/gui/dialogs/task-page.c:810
-#, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nije moguće otvaranje zadataka u '%s'."
 
@@ -5337,9 +5305,9 @@ msgstr "Nije moguće otvaranje zadataka u '%s'."
 msgid "Con_fidential"
 msgstr "_Povjerljivo"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Opis:"
 
@@ -5348,12 +5316,12 @@ msgid "Folder:"
 msgstr "Mapa:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
-msgstr "_Početni datum"
+msgid "Sta_rt date:"
+msgstr "_Početni datum:"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
-msgstr "_Datum dospijeća:"
+msgid "_Due date:"
+msgstr "_Datum krajnjeg roka:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "Authentication Credentials for HTTP Server"
@@ -5403,137 +5371,111 @@ msgstr "Korisnik izdaje"
 msgid "Weekly"
 msgstr "Tjedno"
 
+#. plural form
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d dani"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 dan"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d tjedana"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 tjedan"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d sati"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 sat"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d minuta"
-
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 minuta"
-
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekundi"
-
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 sekunda"
-
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr "Pošalji e-poštu"
-
-#: calendar/gui/e-alarm-list.c:477
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#. plural form
+#: calendar/gui/e-alarm-list.c:400
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. plural form
+#: calendar/gui/e-alarm-list.c:405
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#. plural form
+#: calendar/gui/e-alarm-list.c:410
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#. plural form
+#: calendar/gui/e-alarm-list.c:415
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Izvršit će se nepoznata akcija"
 
-#: calendar/gui/e-alarm-list.c:489
+#: calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s prije početka sastanka"
 
-#: calendar/gui/e-alarm-list.c:492
+#: calendar/gui/e-alarm-list.c:477
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s nakon početka sastanka"
 
-#: calendar/gui/e-alarm-list.c:497
+#: calendar/gui/e-alarm-list.c:482
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s na početku sastanka"
 
-#: calendar/gui/e-alarm-list.c:506
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s prije kraja sastanka"
 
-#: calendar/gui/e-alarm-list.c:509
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s nakon završetka sastanka"
 
-#: calendar/gui/e-alarm-list.c:514
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s na kraju sastanka"
 
-#: calendar/gui/e-alarm-list.c:536
-#, c-format
+#: calendar/gui/e-alarm-list.c:521
 msgid "%s at %s"
 msgstr "%s kod %s"
 
-#: calendar/gui/e-alarm-list.c:542
-#, c-format
+#: calendar/gui/e-alarm-list.c:527
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretača"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:369
+#: 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:369
 msgid "Public"
 msgstr "Javno"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
 #: calendar/gui/e-calendar-table.c:370
 msgid "Private"
 msgstr "Privatno"
 
-#: calendar/gui/e-cal-list-view.c:266 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
 #: calendar/gui/e-calendar-table.c:371
 msgid "Confidential"
 msgstr "Povjerljivo"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
-msgstr "Opis"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Završni datum"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Start Date"
 msgstr "Datum početka"
 
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: 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 "Sažetak"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr "boja"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr "element"
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Slobodno"
@@ -5569,141 +5511,44 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 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-model-tasks.c:966 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 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"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
 #: 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:1665 camel/camel-gpg-context.c:1716
 #: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap-engine.c:1525
+#: camel/providers/imap4/camel-imap-engine.c:1552
+#: camel/providers/imap4/camel-imap-engine.c:1582
+#: camel/providers/imap4/camel-imap-engine.c:1622
+#: camel/providers/imap4/camel-imap-utils.c:290
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2130
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
-msgstr "Napoznato"
+msgstr "Nepoznato"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "Ponavljajući"
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "Dodijeljeno"
 
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "Brišem odabrane objekte"
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "Unosim promene u objekte"
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr "Novi S_astanak..."
-
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr "Novi cjelodnevni _događaj"
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
-msgstr "Novi sastanak"
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr "Novi zadatak"
-
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr "_Ispis..."
-
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr "_Zaljepi"
-
-#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "_Idi na Danas"
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr "_Idi na datum..."
-
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "_Objavi slobodnu/zauzetu informaciju"
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Otvori"
-
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
-msgstr "_Spremi Kao..."
-
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "I_zreži"
-
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "_Kopiraj"
-
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
-msgstr "_Zakaži sastanak..."
-
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
-msgstr "_Proslijedi kao iCalendar... "
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr "Obriši ovu _pojavu"
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr "Obriši _sve pojave"
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "_Postavke..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5748,10 +5593,63 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
+#: calendar/gui/e-calendar-table.c:698 calendar/gui/e-calendar-view.c:680
+msgid "Deleting selected objects"
+msgstr "Brišem odabrane objekte"
+
+#: calendar/gui/e-calendar-table.c:861 calendar/gui/e-calendar-view.c:781
+msgid "Updating objects"
+msgstr "Unosim promene u objekte"
+
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1382
+#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Otvori"
+
 #: calendar/gui/e-calendar-table.c:1038
 msgid "Open _Web Page"
 msgstr "Otvori _web stranicu"
 
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
+#: calendar/gui/e-calendar-view.c:1316 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-view.c:742 mail/em-popup.c:689 mail/em-popup.c:804
+#: ui/evolution-mail-message.xml.h:128
+msgid "_Save As..."
+msgstr "_Spremi Kao..."
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1082
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1317
+#: calendar/gui/e-calendar-view.c:1386 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
+#: ui/evolution-tasks.xml.h:23
+msgid "_Print..."
+msgstr "_Ispis..."
+
+#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
+#: calendar/gui/e-calendar-view.c:1322 calendar/gui/e-calendar-view.c:1364
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "I_zreži"
+
+#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1362
+#: mail/em-folder-tree.c:2497 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:18
+msgid "_Copy"
+msgstr "_Kopiraj"
+
+#: calendar/gui/e-calendar-table.c:1046 calendar/gui/e-calendar-table.c:1080
+#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1324
+#: calendar/gui/e-calendar-view.c:1384 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:22
+msgid "_Paste"
+msgstr "_Zaljepi"
+
 #: calendar/gui/e-calendar-table.c:1050
 msgid "_Assign Task"
 msgstr "_Dodijeli zadatak"
@@ -5773,62 +5671,119 @@ msgid "_Delete Selected Tasks"
 msgstr "_Obriši odabrane zadatke"
 
 #: calendar/gui/e-calendar-table.c:1368
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Click to add a task"
 msgstr "Kliknite ovdje za dodavanje zadatka"
 
 #: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
 msgid "% Complete"
 msgstr "% gotovo"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Alarmi"
-
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
 #: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Završi"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Completion date"
 msgstr "Datum dovršetka"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-table.etspec.h:6
+msgid "Due date"
 msgstr "Datum krajnjeg roka"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr "Geografsko mjesto"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Start date"
+msgstr "Datum početka"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Razvrstani zadaci"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/e-calendar-view.c:1287 calendar/gui/e-calendar-view.c:1374
+msgid "New _Appointment..."
+msgstr "Novi S_astanak..."
+
+#: calendar/gui/e-calendar-view.c:1288 calendar/gui/e-calendar-view.c:1376
+msgid "New All Day _Event"
+msgstr "Novi cjelodnevni _događaj"
+
+#: calendar/gui/e-calendar-view.c:1289 calendar/gui/e-calendar-view.c:1378
+msgid "New Meeting"
+msgstr "Novi sastanak"
+
+#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1380
+msgid "New Task"
+msgstr "Novi zadatak"
+
+#: calendar/gui/e-calendar-view.c:1304 calendar/gui/e-calendar-view.c:1370
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "_Idi na Danas"
+
+#: calendar/gui/e-calendar-view.c:1305 calendar/gui/e-calendar-view.c:1372
+msgid "_Go to Date..."
+msgstr "_Idi na datum..."
+
+#: calendar/gui/e-calendar-view.c:1309 ui/evolution-calendar.xml.h:40
+msgid "_Publish Free/Busy Information"
+msgstr "_Objavi slobodnu/zauzetu informaciju"
+
+#: calendar/gui/e-calendar-view.c:1328
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Kopiraj u mapu..."
+
+#: calendar/gui/e-calendar-view.c:1329
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "_Premjesti u mapu..."
+
+#: calendar/gui/e-calendar-view.c:1330
+msgid "_Schedule Meeting..."
+msgstr "_Zakaži sastanak..."
+
+#: calendar/gui/e-calendar-view.c:1331
+msgid "_Forward as iCalendar..."
+msgstr "_Proslijedi kao iCalendar... "
+
+#: calendar/gui/e-calendar-view.c:1336 calendar/gui/e-calendar-view.c:1367
+msgid "Delete this _Occurrence"
+msgstr "Obriši ovu _pojavu"
+
+#: calendar/gui/e-calendar-view.c:1337 calendar/gui/e-calendar-view.c:1368
+msgid "Delete _All Occurrences"
+msgstr "Obriši _sve pojave"
+
+#: calendar/gui/e-calendar-view.c:1390 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "_Postavke..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
+#.  strptime format of a weekday, a date and a time,
+#.  in 24-hour format.
+#.  strftime format of a weekday, a date and a
+#.  time, in 24-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
+#.  strptime format of a weekday, a date and a time,
+#.  in 12-hour format.
+#.  strftime format of a weekday, a date and a
+#.  time, in 12-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
 #: calendar/gui/e-cell-date-edit-text.c:125
-#, c-format
 msgid ""
 "The date must be entered in the format: \n"
 "\n"
@@ -5839,32 +5794,38 @@ msgstr ""
 "%s"
 
 #: calendar/gui/e-day-view-time-item.c:532
-#, c-format
 msgid "%02i minute divisions"
 msgstr "razmaci od %02i minuta"
 
 #. 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:688 calendar/gui/e-day-view.c:1350
+#.  %B = full month name. Don't use any other specifiers.
+#.  strftime format %A = full weekday name, %d = day of
+#.  month, %B = full month name. You can change the
+#.  order but don't change the specifiers or add
+#.  anything.
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1572
 #: 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:696 calendar/gui/e-day-view.c:1383
+#.  Don't use any other specifiers.
+#.  strftime format %d = day of month, %b = abbreviated
+#.  month name. You can change the order but don't
+#.  change the specifiers or add anything.
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1605
 #: 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:604 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:822 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:607 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:825 calendar/gui/e-week-view.c:596
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -5873,417 +5834,390 @@ msgstr "pm"
 msgid "Yes. (Complex Recurrence)"
 msgstr "Da. (Složeni povratak)"
 
-#: calendar/gui/e-itip-control.c:603
+#. plural form
+#: calendar/gui/e-itip-control.c:602
 msgid "Every day"
-msgstr "svakim danom"
+msgid_plural "Every %d days"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "Svakih %d dana"
-
-#: calendar/gui/e-itip-control.c:611
+#. plural form
+#: calendar/gui/e-itip-control.c:607
 msgid "Every week"
-msgstr "Svakog tjedna"
-
-#: calendar/gui/e-itip-control.c:613
-#, c-format
-msgid "Every %d weeks"
-msgstr "Svakih %d tjedana"
+msgid_plural "Every %d weeks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:616
+#. plural form
+#: calendar/gui/e-itip-control.c:609
 msgid "Every week on "
-msgstr "Svake tjedna u "
+msgid_plural "Every %d weeks on "
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "Svakih %d tjedana u "
-
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr " i"
 
-#: calendar/gui/e-itip-control.c:633
-#, c-format
+#: calendar/gui/e-itip-control.c:624
 msgid "The %s day of "
 msgstr "%s dan "
 
-#: calendar/gui/e-itip-control.c:646
-#, c-format
+#: calendar/gui/e-itip-control.c:637
 msgid "The %s %s of "
 msgstr "%s %s "
 
-#: calendar/gui/e-itip-control.c:651
+#. plural form
+#: calendar/gui/e-itip-control.c:644
 msgid "every month"
-msgstr "svaki mjesec"
+msgid_plural "every %d months"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr "svakih %d mjeseci"
-
-#: calendar/gui/e-itip-control.c:662
+#. plural form
+#: calendar/gui/e-itip-control.c:648
 msgid "Every year"
-msgstr "Svake godine"
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr "Svakih %d godina"
-
-#: calendar/gui/e-itip-control.c:676
-#, c-format
-msgid " a total of %d times"
-msgstr "ukupno %d puta"
-
-#: calendar/gui/e-itip-control.c:685
+msgid_plural "Every %d years"
+msgstr[0] ""
+msgstr[1] ""
+
+#. plural form
+#: calendar/gui/e-itip-control.c:659
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] ""
+msgstr[1] ""
+
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ", završavajući sa "
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr "<b>Početak:</b> "
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr "<b>Kraj:</b> "
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr "<b>Završeno:</b> "
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr "<b>Do:</b> "
 
-#: calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "iCalendar informacije"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr "Greška iCalendara"
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:886
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:914
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
 msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
-msgstr ""
-"<br> Molim provjerite ove podatke, te odaberite akciju iz donjeg izbornika."
+msgstr "<br> Molim provjerite ove podatke, te odaberite akciju iz donjeg izbornika."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Ništa</i>"
 
+#: calendar/gui/e-itip-control.c:930
+msgid "Location:"
+msgstr "Lokacija:"
+
 #. write status
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-tasks.c:199
+#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:199
 msgid "Status:"
 msgstr "Stanje:"
 
-#: calendar/gui/e-itip-control.c:966 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:949 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
 msgid "Accepted"
 msgstr "Prihvaćeno"
 
-#: calendar/gui/e-itip-control.c:970 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
 
-#: calendar/gui/e-itip-control.c:974 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Odbijeno"
 
-#: calendar/gui/e-itip-control.c:1033 calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1087 calendar/gui/e-itip-control.c:1100
-#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1126
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
 msgid "Choose an action:"
 msgstr "Odaberite akciju:"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Ažuriraj"
 
-#: calendar/gui/e-itip-control.c:1035 calendar/gui/e-itip-control.c:1066
-#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1102
-#: calendar/gui/e-itip-control.c:1115 calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
 #: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "U redu"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr "Prihvati"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Prihvati sa rezervom"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Odbijanje"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Pošalji slobodan/zauzet informaciju"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "Ažuriraj stanje stranke"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Pošalji najnoviju informaciju"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Odustani"
 
-#: calendar/gui/e-itip-control.c:1203
-#, c-format
+#: calendar/gui/e-itip-control.c:1186
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> je objavio podatke o sastanku."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Informacije o sastanku"
 
-#: calendar/gui/e-itip-control.c:1209
-#, c-format
+#: calendar/gui/e-itip-control.c:1192
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> traži da %s bude prisutan na sastanku."
 
-#: calendar/gui/e-itip-control.c:1211
-#, c-format
+#: calendar/gui/e-itip-control.c:1194
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> traži da budete prisutni na sastanku."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Prijedlog za sastanak"
 
-#: calendar/gui/e-itip-control.c:1216
-#, c-format
+#: calendar/gui/e-itip-control.c:1199
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> želi dodati postojećem sastanku."
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Ažuriranje sastanka"
 
-#: calendar/gui/e-itip-control.c:1221
-#, c-format
+#: calendar/gui/e-itip-control.c:1204
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> želi dobiti posljednje podatke o sastanku."
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "Zahtjev za nove podatke o sastanku"
 
-#: calendar/gui/e-itip-control.c:1229
-#, c-format
+#: calendar/gui/e-itip-control.c:1212
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> je odgovorio na zahtjev o sastanku."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
-#: calendar/gui/e-itip-control.c:1237
-#, c-format
+#: calendar/gui/e-itip-control.c:1220
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je otkazo sastanak."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Otkaz sastanka"
 
-#: calendar/gui/e-itip-control.c:1245 calendar/gui/e-itip-control.c:1313
-#: calendar/gui/e-itip-control.c:1348
-#, c-format
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> je poslao nerazumljivu poruku."
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Neispravna poruka o sastanku"
 
-#: calendar/gui/e-itip-control.c:1271
-#, c-format
+#: calendar/gui/e-itip-control.c:1254
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> je objavio podatke o zadatku."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Informacija o zadatku"
 
-#: calendar/gui/e-itip-control.c:1277
-#, c-format
+#: calendar/gui/e-itip-control.c:1260
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> traži obavljanje zadatka od %s."
 
-#: calendar/gui/e-itip-control.c:1279
-#, c-format
+#: calendar/gui/e-itip-control.c:1262
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> traži da izvršite zadatak."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Prijedlog zadatka"
 
-#: calendar/gui/e-itip-control.c:1284
-#, c-format
+#: calendar/gui/e-itip-control.c:1267
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> želi dodati postojećem zadatku."
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Ažuriranje zadatka"
 
-#: calendar/gui/e-itip-control.c:1289
-#, c-format
+#: calendar/gui/e-itip-control.c:1272
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> želi dobiti posljednje podatke o zadatku."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Zahtjev za osvježenje zadatka"
 
-#: calendar/gui/e-itip-control.c:1297
-#, c-format
+#: calendar/gui/e-itip-control.c:1280
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> je odgovorio na dodijeljeni zadatak."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Odgovor na zadatak"
 
-#: calendar/gui/e-itip-control.c:1305
-#, c-format
+#: calendar/gui/e-itip-control.c:1288
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je otkazao zadatak."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Otkazivanje zadatka"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Neispravna poruka o zadatku"
 
-#: calendar/gui/e-itip-control.c:1333
-#, c-format
+#: calendar/gui/e-itip-control.c:1316
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> je objavio podatke o dostupnosti."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Informacija slobodno/zauzeto"
 
-#: calendar/gui/e-itip-control.c:1338
-#, c-format
+#: calendar/gui/e-itip-control.c:1321
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> traži vaše podatke o dostupnosti."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Slobodan/zauzet zahtjev"
 
-#: calendar/gui/e-itip-control.c:1343
-#, c-format
+#: calendar/gui/e-itip-control.c:1326
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> je odgovorio na zahtjev o dostupnosti."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Slobodan/zauzet odgovor"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Neispravna poruka o dostupnosti"
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1407
 msgid "The message does not appear to be properly formed"
 msgstr "Čini se da poruka nije ispravno sačinjena"
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "Poruka sadrži samo nepodržane zahtjeve."
 
-#: calendar/gui/e-itip-control.c:1514
+#: calendar/gui/e-itip-control.c:1497
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Prilog ne sadrži ispravnu poruku za kalendar"
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr "Prilog nema dijelove kalendara koji se mogu pregledati"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr "Datoteka kalendara nije se mogla ažurirati!\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "Ažuriranje završeno\n"
 
-#: calendar/gui/e-itip-control.c:1807 calendar/gui/e-itip-control.c:1879
+#: calendar/gui/e-itip-control.c:1790 calendar/gui/e-itip-control.c:1862
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Stanje prisutne osobe ne može biti osvježeno jer unos više ne postoji"
 
-#: calendar/gui/e-itip-control.c:1823 calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt je neispravan i ne može biti ažuriran\n"
 
-#: calendar/gui/e-itip-control.c:1833
+#: calendar/gui/e-itip-control.c:1816
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Ovaj odgovor nije poslao trenutni sudionik. Dodati ga u sudionike?"
 
-#: calendar/gui/e-itip-control.c:1845
+#: calendar/gui/e-itip-control.c:1828
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
-"Stanje prisutne osobe nije moglo biti osvježeno zbog neispravnog stanja!\n"
+msgstr "Stanje prisutne osobe nije moglo biti osvježeno zbog neispravnog stanja!\n"
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1847
 msgid "There was an error on the CORBA system\n"
 msgstr "Nastala je greška u CORBA sustavu\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr "Objekt se ne može naći\n"
 
-#: calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1853
 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:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr "Osvježeno stanje prisutne osobe\n"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr "Stanje prisutne osobe nije moglo biti osvježeno!\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "Uklanjanje završeno"
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1978
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
 msgid "Item sent!\n"
 msgstr "Stavka poslana!\n"
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:1982
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1965
 msgid "The item could not be sent!\n"
 msgstr "Unos nije mogao biti poslan!\n"
 
@@ -6401,14 +6335,18 @@ 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.
+#.  %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.
+#.  name, %m = month number, %d = month day, %Y = full year.
+#.  This is a strftime() format string %a = abbreviated weekday name,
+#.  %m = month number, %d = month day, %Y = full year.
+#.  strptime format of a weekday and a date.
+#.  strftime format of a weekday and a date.
 #: 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
@@ -6416,9 +6354,13 @@ 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.
+#.  %d = month day, %Y = full year.
+#.  strptime format of a weekday and a date.
+#.  This is the preferred date format for the locale.
+#.  This is a strftime() format for a short date. %m = month,
+#.  %d = day of month, %Y = year (all digits).
 #: 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:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -6500,13 +6442,12 @@ msgstr "Prioritet:"
 msgid "Web Page:"
 msgstr "Internet stranica"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2176
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknite za otvaranje %s"
 
-#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
-#, c-format
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1897
 msgid ""
 "Error on %s:\n"
 " %s"
@@ -6515,68 +6456,69 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
-#, c-format
+#: calendar/gui/e-tasks.c:792
+#, c-format
 msgid ""
 "The task backend for\n"
 "%s\n"
 " has crashed."
 msgstr ""
+"Podrška zadataka za\n"
+"%s\n"
+" je prestala raditi."
 
-#: calendar/gui/e-tasks.c:868
-#, c-format
+#: calendar/gui/e-tasks.c:872
 msgid "Opening tasks at %s"
 msgstr "Otvaram zaduženja u %s"
 
-#: calendar/gui/e-tasks.c:889
-#, fuzzy, c-format
+#: calendar/gui/e-tasks.c:893
+#, , c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr ""
-"Greška na %s:\n"
+"Greška pri otvaranju %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 msgid "Loading tasks"
 msgstr "Učitavanje zadataka"
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 msgid "Completing tasks..."
 msgstr "Završavam zadatke..."
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 msgid "Deleting selected objects..."
 msgstr "Brišem odabrane objekte..."
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr "Izbacujem"
 
-#: calendar/gui/gnome-cal.c:1751
-#, fuzzy, c-format
-msgid "Loading tasks at %s"
-msgstr "Učitavanje zadataka"
-
-#: calendar/gui/gnome-cal.c:1763
-#, fuzzy, c-format
+#: calendar/gui/gnome-cal.c:1758
+#, , c-format
 msgid "Loading appointments at %s"
-msgstr "Zakazani sastanak - %s"
+msgstr "Učitavam sastanke kod %s"
+
+#: calendar/gui/gnome-cal.c:1777
+#, , c-format
+msgid "Loading tasks at %s"
+msgstr "Učitavam zadatke kod %s"
 
-#: calendar/gui/gnome-cal.c:1796
-#, fuzzy, c-format
+#: calendar/gui/gnome-cal.c:1797
 msgid "Opening %s"
-msgstr "Otvori u %s..."
+msgstr "Otvaram %s"
 
-#: calendar/gui/gnome-cal.c:1945
-#, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+#: calendar/gui/gnome-cal.c:1926
+msgid "The calendar backend for '%s' has crashed."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1938
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:2752
 msgid "Purging"
 msgstr "Brisanje"
 
@@ -6633,9 +6575,8 @@ msgid "September"
 msgstr "Rujan"
 
 #: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
 msgid "_Go To Today"
-msgstr "Idi na danas"
+msgstr "_Idi na danas"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6679,7 +6620,6 @@ msgid "Counter-proposal"
 msgstr "Kontra-prijedlog"
 
 #: calendar/gui/itip-utils.c:521
-#, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Slobodan/zauzet informacija (%s do %s)"
 
@@ -6692,7 +6632,7 @@ msgid "You must be an attendee of the event."
 msgstr "Morate biti sudionik događaja"
 
 #: calendar/gui/itip-utils.c:1157
-#, fuzzy, c-format
+#, , c-format
 msgid "Enter the password for %s"
 msgstr "Unesite lozinku za %s"
 
@@ -6703,6 +6643,9 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"Lokacija i hijerarhija Evolution zadatak je promjenjena u odnosu na Evolution 1.x.\n"
+"\n"
+"Molim pričekajte dok Evolution ne migrira vaše mape..."
 
 #: calendar/gui/migration.c:141
 msgid ""
@@ -6711,13 +6654,16 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"Lokacija i hijerarhija Evolution kalendara je promjenjena u odnosu na Evolution 1.x.\n"
+"\n"
+"Molim pričekajte dok Evolution ne migrira vaše mape..."
 
 #: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr "Rođendani i obljetnice"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446
 msgid "On The Web"
 msgstr "Na webu"
 
@@ -6874,89 +6820,82 @@ msgid "Sa"
 msgstr "Su"
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Odabrani dan (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1940 calendar/gui/print.c:1944
+#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1941
+#: calendar/gui/print.c:1940
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1945 calendar/gui/print.c:1947
-#: calendar/gui/print.c:1948
+#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
+#: calendar/gui/print.c:1947
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1952
-#, c-format
+#: calendar/gui/print.c:1951
 msgid "Selected week (%s - %s)"
 msgstr "Odabrani tjedan (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr "Odabran mjesec (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr "Odabrana godina (%Y)"
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr "Zadatak"
 
-#: calendar/gui/print.c:2357
-#, c-format
+#: calendar/gui/print.c:2356
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: calendar/gui/print.c:2374
-#, c-format
+#: calendar/gui/print.c:2373
 msgid "Priority: %s"
 msgstr "Prioritet: %s "
 
-#: calendar/gui/print.c:2386
-#, c-format
+#: calendar/gui/print.c:2385
 msgid "Percent Complete: %i"
 msgstr "Postotak završenog: %i"
 
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2397
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2412
-#, c-format
+#: calendar/gui/print.c:2411
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr "Konatkti: "
 
-#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
-#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Pogled prije ispisa"
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr "Ispiši stavku"
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "Podešavanje ispisa"
 
 #: calendar/gui/tasks-component.c:302
-#, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
-msgstr ""
-"Popis zadataka '%s' će biti uklonjen. Jeste li sigurni da želite nastaviti?"
+msgstr "Popis zadataka '%s' će biti uklonjen. Jeste li sigurni da želite nastaviti?"
 
 #: calendar/gui/tasks-component.c:558
 msgid "New task"
@@ -6983,10 +6922,8 @@ msgid "Create a new task list"
 msgstr "Stvori novi popis zadataka"
 
 #: calendar/gui/tasks-component.c:634
-#, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr ""
-"Nije moguće otvoriti listu zadataka '%s' fa kreiranje događaja i sastanaka"
+msgstr "Nije moguće otvoriti listu zadataka '%s' fa kreiranje događaja i sastanaka"
 
 #: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
@@ -6997,7 +6934,6 @@ msgid "The URI of the tasks folder to display"
 msgstr "URI za prikaz direktorija zadataka"
 
 #: calendar/gui/tasks-control.c:211
-#, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ne mogu učitati poslove u `%s"
 
@@ -7008,8 +6944,8 @@ msgid ""
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Ova operacija će trajno obrisati sve zadatke označene kao završene.Jednom "
-"obrisani, ti zadaci ne mogu biti vraćeni.\n"
+"Ova operacija će trajno obrisati sve zadatke označene kao završene."
+"Jednom obrisani, ti zadaci ne mogu biti vraćeni.\n"
 "\n"
 "Jeste li sigurni da želite obrisati zadatke?"
 
@@ -7046,9 +6982,8 @@ msgid "vCalendar files (.vcf)"
 msgstr "vCalendar datoteke (.vcf)"
 
 #: calendar/importers/icalendar-importer.c:78
-#, fuzzy
 msgid "Appointments and Meetings"
-msgstr "Izbriši stare dogovore i sastanke"
+msgstr "Obveze i sastanci"
 
 #: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
@@ -7070,11 +7005,9 @@ msgstr ""
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
-#.
 #. * These are the timezone names from the Olson timezone data.
-#. * We only place them here so gettext picks them up for translation.
-#. * Don't include in any C files.
-#.
+#.  * We only place them here so gettext picks them up for translation.
+#.  * Don't include in any C files.
 #: calendar/zones.h:7
 msgid "Africa/Abidjan"
 msgstr "Afrika/Abidjan"
@@ -8628,12 +8561,10 @@ msgid "Unable to create cache path"
 msgstr "Nisam mogao napraviti putanju za skrivenu memoriju"
 
 #: camel/camel-data-cache.c:375
-#, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nisam mogao ukloniti cache unos: %s: %s"
 
-#: camel/camel-disco-diary.c:185
-#, c-format
+#: camel/camel-disco-diary.c:194
 msgid ""
 "Could not write log entry: %s\n"
 "Further operations on this server will not be replayed when you\n"
@@ -8643,8 +8574,7 @@ msgstr ""
 "Daljnjee operacije na ovom serveru neće biti izvršene kada\n"
 "se budete ponovo povezali na mrežu."
 
-#: camel/camel-disco-diary.c:248
-#, c-format
+#: camel/camel-disco-diary.c:257
 msgid ""
 "Could not open `%s':\n"
 "%s\n"
@@ -8654,7 +8584,7 @@ msgstr ""
 "%s\n"
 "Promjene na ovom direktoriju neće biti sinhronizirane."
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr "Sinkronizovanje sa poslužiteljem"
 
@@ -8667,28 +8597,24 @@ msgid "Downloading new messages for offline mode"
 msgstr "Skidanje novih poruka za neumreženi način rada"
 
 #: camel/camel-disco-folder.c:441
-#, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Pripremam mapu '%s' za neumreženi rad"
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr "Morate biti na mreži da biste završili ovu operaciju"
 
 #: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
-#, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Neuspjelo stvaranje veze ka '%s': %s"
 
 #: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
 #: camel/camel-process.c:90
-#, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Neuspjelo stvaranje sadržanog procesa '%s': %s"
 
 #: camel/camel-filter-driver.c:754
-#, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Neispravan niz poruka primljen od %s: %s"
 
@@ -8697,12 +8623,10 @@ msgid "Syncing folders"
 msgstr "Sinkroniziram mape"
 
 #: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
-#, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Greška kod čitanja filtera: %s: %s"
 
 #: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
-#, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Greška kod primjene filtera: %s: %s"
 
@@ -8715,7 +8639,6 @@ msgid "Unable to process spool folder"
 msgstr "Nisam mogao da prođem kroz mapu sa redom"
 
 #: camel/camel-filter-driver.c:1132
-#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Primam poruku %d (%d%%)"
 
@@ -8724,7 +8647,6 @@ msgid "Cannot open message"
 msgstr "Ne mogu otvoriti poruku"
 
 #: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
-#, c-format
 msgid "Failed on message %d"
 msgstr "Greška kod poruke %d"
 
@@ -8733,12 +8655,10 @@ msgid "Syncing folder"
 msgstr "Sinkroniziram mapu"
 
 #: camel/camel-filter-driver.c:1224
-#, c-format
 msgid "Getting message %d of %d"
 msgstr "Primam poruku %d od %d"
 
 #: camel/camel-filter-driver.c:1239
-#, c-format
 msgid "Failed at message %d of %d"
 msgstr "Greška kod poruke %d od %d"
 
@@ -8755,12 +8675,10 @@ msgid "Invalid arguments to (user-tag)"
 msgstr "Neipsravni argumenti za (korisnička-oznaka)"
 
 #: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
-#, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Greška kod primjene filtera pretrage: %s: %s"
 
 #: camel/camel-folder-search.c:348
-#, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
@@ -8769,7 +8687,6 @@ msgstr ""
 "%s"
 
 #: camel/camel-folder-search.c:358
-#, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
@@ -8782,39 +8699,38 @@ msgid "(match-all) requires a single bool result"
 msgstr "(match-all) zahtijeva samo jedan logički (boolean) rezultat"
 
 #: camel/camel-folder-search.c:650
-#, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Izvršavam pretragu na nepoznatom zaglavlju: %s"
 
-#: camel/camel-folder.c:584
-#, c-format
+#: camel/camel-folder.c:586
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepodržana operacija: priključena poruka: za %s"
 
-#: camel/camel-folder.c:1164
-#, c-format
+#: camel/camel-folder.c:1177
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepodržana operacija: pretraga po izrazu: za %s"
 
-#: camel/camel-folder.c:1204
-#, c-format
+#: camel/camel-folder.c:1217
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepodržana operacija: pretraga po uid-u: za %s"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
 msgstr "Premještam poruke"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Copying messages"
 msgstr "Kopiram poruke"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1589
+msgid "Learning junk and/or non junk message(s)"
+msgstr "Učim koje su poruke neželjena pošta."
+
+#: camel/camel-folder.c:1618
 msgid "Filtering new message(s)"
 msgstr "Filtriranje novih poruka"
 
 #: camel/camel-gpg-context.c:710
-#, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
 "\n"
@@ -8833,7 +8749,6 @@ msgid "Failed to parse gpg passphrase request."
 msgstr "Nisam mogao pročitati zahtjev za gpg lozinkom"
 
 #: camel/camel-gpg-context.c:762
-#, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
@@ -8843,7 +8758,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
 #: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
-#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
+#: camel/camel-gpg-context.c:1615 mail/mail-ops.c:697
+#: mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Poništeno."
 
@@ -8852,7 +8768,6 @@ msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Nisam mogao otključati tajni ključ: date su 3 pogrešne lozinke."
 
 #: camel/camel-gpg-context.c:803
-#, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočekivan odgovor od GnuPG: %s"
 
@@ -8861,7 +8776,6 @@ msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nisam mogao dekriptirati: nisu označeni ispravni primatelji. "
 
 #: camel/camel-gpg-context.c:1124
-#, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
 "\n"
@@ -8872,18 +8786,15 @@ msgstr ""
 "%s"
 
 #: camel/camel-gpg-context.c:1129
-#, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nisam mogao primjeniti GPG %s: %s\n"
 
 #: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
-#, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Ne mogu stvoriti podatke za potpis: %s"
 
 #: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
 #: camel/camel-gpg-context.c:1715
-#, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nisam mogao izvršiti gpg: %s"
 
@@ -8905,13 +8816,10 @@ msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ne mogu provjeriti potpis poruke: Neispravan format poruke"
 
 #: camel/camel-gpg-context.c:1397
-#, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr ""
-"Ne mogu provjeriti potpis poruke: nisam mogao napraviti temp datoteku: %s"
+msgstr "Ne mogu provjeriti potpis poruke: nisam mogao napraviti temp datoteku: %s"
 
 #: camel/camel-gpg-context.c:1484
-#, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Ne mogu stvoriti podatke za kriptiranje: %s"
 
@@ -8928,79 +8836,63 @@ msgid "Unable to parse message content"
 msgstr "Nije moguća analiza sadržaja poruke"
 
 #: camel/camel-lock-client.c:100
-#, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Ne mogu kreirati pomoćni cjevovod za zaključavanje (baze podataka): %s"
 
 #: camel/camel-lock-client.c:113
-#, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Ne mogu podijeliti 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 "Ne mogu zaključati '%s': greška u protokolu s pomoćnikom zaključavanja"
 
 #: camel/camel-lock-client.c:204
-#, c-format
 msgid "Could not lock '%s'"
 msgstr "Ne mogu zaključati '%s"
 
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nisam mogao zaključati datoteku za %s: %s"
 
 #: camel/camel-lock.c:154
-#, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Isteklo je vrijeme kod pokušaja pribavljanja zaključane datoteke na %s. "
-"Pokušajte kasnije."
+msgstr """Isteklo je vrijeme kod pokušaja pribavljanja zaključane datoteke na %s. Pokušajte "
+"kasnije."
 
 #: camel/camel-lock.c:209
-#, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Nisam mogao zaključiti koristeći fcntl(2): %s"
 
 #: camel/camel-lock.c:272
-#, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nisam mogao zaključiti koristeći flock(2): %s "
 
 #: camel/camel-movemail.c:107
-#, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Nisam mogao provjeriti datoteku pošte %s: %s"
 
 #: camel/camel-movemail.c:120
-#, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nisam mogao otvoriti datoteku pošte  %s: %s"
 
 #: camel/camel-movemail.c:128
-#, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nisam mogao otvoriti privremenu datoteku pošte %s: %s"
 
 #: camel/camel-movemail.c:157
-#, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Nisam mogao smijestiti poštu u temp datoteku %s: %s"
 
 #: camel/camel-movemail.c:187
-#, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nisam mogao napraviti cjevovod: %s"
 
 #: camel/camel-movemail.c:199
-#, c-format
 msgid "Could not fork: %s"
 msgstr "Ne mogu forkati: %s"
 
 #: camel/camel-movemail.c:237
-#, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program za premeštanje pošte nije uspio: %s"
 
@@ -9009,17 +8901,14 @@ msgid "(Unknown error)"
 msgstr "(Nepoznata greška)"
 
 #: camel/camel-movemail.c:261
-#, c-format
 msgid "Error reading mail file: %s"
 msgstr "Greška kod čitanja datoteke pošte: %s"
 
 #: camel/camel-movemail.c:272
-#, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Greška kod pisanja privremene datoteke: %s"
 
 #: camel/camel-movemail.c:465 camel/camel-movemail.c:532
-#, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Greška kod kopiranja privremene datoteke: %s"
 
@@ -9044,22 +8933,18 @@ msgid "For reading mail as a query of another set of folders"
 msgstr "Za čitanje pošte kao upita drugog niza mapa"
 
 #: camel/camel-provider.c:172
-#, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Ne mogu učitati %s: ovaj sustav ne podržava učitavanje modula."
 
 #: camel/camel-provider.c:181
-#, c-format
 msgid "Could not load %s: %s"
 msgstr "Ne mogu učitati %s: %s"
 
 #: camel/camel-provider.c:189
-#, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ne mogu učitati %s: nema koda za pokretanje u modulu."
 
 #: camel/camel-provider.c:356 camel/camel-session.c:160
-#, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Nema dostupnog ponuđača za protokol `%s'"
 
@@ -9076,7 +8961,6 @@ msgid "Authentication failed."
 msgstr "Neuspjelo spajanje."
 
 #: camel/camel-sasl-anonymous.c:121
-#, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
@@ -9085,7 +8969,6 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-anonymous.c:133
-#, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
@@ -9094,7 +8977,6 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-anonymous.c:145
-#, c-format
 msgid ""
 "Invalid trace information:\n"
 "%s"
@@ -9110,9 +8992,7 @@ msgstr "CRAM-MD5"
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
-msgstr ""
-"Spajanje na poslužitelj korištenjem lozinke kodirane CRAM-MD5 algoritmom, "
-"ako ga poslužitelj podržava."
+msgstr "Spajanje na poslužitelj korištenjem lozinke kodirane CRAM-MD5 algoritmom, ako ga poslužitelj podržava."
 
 #: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
@@ -9122,9 +9002,7 @@ msgstr "DIGEST-MD5"
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
-msgstr ""
-"Spajanje na poslužitelj korištenjem lozinke kodirane DIGEST-MD5 algoritmom, "
-"ako ga poslužitelj podržava."
+msgstr "Spajanje na poslužitelj korištenjem lozinke kodirane DIGEST-MD5 algoritmom, ako ga poslužitelj podržava."
 
 #: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
@@ -9136,8 +9014,7 @@ msgstr "Upit na poslužitelj je neispravan\n"
 
 #: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr ""
-"Upit na poslužitelj sadrži neispravan token \"Kvaliteta zaštite\"unos\n"
+msgstr "Upit na poslužitelj sadrži neispravan token \"Kvaliteta zaštite\"unos\n"
 
 #: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
@@ -9175,8 +9052,7 @@ msgstr "Ponuđeni parametar ime_cilja nije pravilno formiran."
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
-msgstr ""
-"Ponuđeni parametar ime_cilja je sadržao neispravan ili nepodržan tip imena."
+msgstr "Ponuđeni parametar ime_cilja je sadržao neispravan ili nepodržan tip imena."
 
 #: camel/camel-sasl-gssapi.c:160
 msgid ""
@@ -9190,9 +9066,7 @@ msgstr ""
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
-msgstr ""
-"input_token sadrži neispravnu strukturu, ili potpis nije mogao biti "
-"provjeren."
+msgstr "input_token sadrži neispravnu strukturu, ili potpis nije mogao biti provjeren."
 
 #: camel/camel-sasl-gssapi.c:169
 msgid ""
@@ -9221,12 +9095,11 @@ msgstr "Važenje traženih uverenja je isteklo."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1198
 msgid "Bad authentication response from server."
 msgstr "Neispravan odgovor autentifikacije od servera."
 
 #: camel/camel-sasl-gssapi.c:213
-#, c-format
 msgid "Failed to resolve host `%s': %s"
 msgstr "Nisam mogao pronaći domaćina `%s': %s"
 
@@ -9243,7 +9116,6 @@ msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr "Spajanje na poslužitelj korištenjem Kerberos 4 autentifikacije."
 
 #: camel/camel-sasl-kerberos4.c:162
-#, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
@@ -9271,9 +9143,7 @@ msgstr "NTLM / SPA"
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
-msgstr ""
-"Spajanje na Windows poslužitelj korištenjem NTLM / Secure Password "
-"Authentication."
+msgstr "Spajanje na Windows poslužitelj korištenjem NTLM / Secure Password Authentication."
 
 #: camel/camel-sasl-plain.c:32
 msgid "PLAIN"
@@ -9300,47 +9170,38 @@ msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP prije SMTP autorizacija korištenjem izvora koji nije pop"
 
 #: camel/camel-search-private.c:114
-#, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Neuspjela kompilacija regularnog izraza: %s: %s"
 
 #: camel/camel-service.c:275
-#, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s traži dio sa korisničkim imenom'"
 
 #: camel/camel-service.c:279
-#, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s traži dio sa imenom računala"
 
 #: camel/camel-service.c:283
-#, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' traži dio sa putanjom"
 
 #: camel/camel-service.c:733
-#, c-format
 msgid "Resolving: %s"
 msgstr "Razlučujem: %s"
 
 #: camel/camel-service.c:764 camel/camel-service.c:888
-#, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Greška kod pretrage za imenom: %s"
 
 #: camel/camel-service.c:785 camel/camel-service.c:909
-#, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Neuspjelo nalaženje domaćina: ne može stvoriti nit: %s"
 
 #: camel/camel-service.c:798
-#, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Neuspjelo nalaženje domaćina: %s: domaćin nije pronađen"
 
 #: camel/camel-service.c:801
-#, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Neuspjelo nalaženje domaćina: %s: nepoznat razlog"
 
@@ -9357,7 +9218,6 @@ msgid "Host lookup failed: unknown reason"
 msgstr "Neuspjelo nalaženje domaćina: nepoznat razlog"
 
 #: camel/camel-session.c:282
-#, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
@@ -9366,7 +9226,6 @@ msgstr ""
 "%s"
 
 #: camel/camel-smime-context.c:104
-#, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Unesite sigurnosnu frazu za prolaz za `%s'"
 
@@ -9411,7 +9270,6 @@ msgid "Processing error"
 msgstr "Greška u obradi"
 
 #: camel/camel-smime-context.c:647
-#, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Potpisao: %s <%s>: %s\n"
 
@@ -9419,26 +9277,26 @@ msgstr "Potpisao: %s <%s>: %s\n"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ne mogu dobiti mapu: neispravna operacija"
 
-#: camel/camel-store.c:244
-#, fuzzy, c-format
+#: camel/camel-store.c:242
+#, , c-format
 msgid "Cannot create folder `%s': folder exists"
-msgstr "Ne mogu stvoriti mapu: %s: %s"
+msgstr "Ne mogu stvoriti mapu: `%s': mapa postoji"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:293
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne mogu napraviti mapu: neispravna operacija"
 
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
-#, c-format
+#: camel/camel-store.c:377 camel/camel-vee-store.c:354
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:773 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Smeće"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:775 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Smeće"
 
@@ -9559,7 +9417,6 @@ msgid "Error in application verification"
 msgstr "Greška kod provjere programa"
 
 #: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
-#, c-format
 msgid ""
 "Issuer:            %s\n"
 "Subject:           %s\n"
@@ -9580,7 +9437,6 @@ msgid "BAD"
 msgstr "LOŠ"
 
 #: camel/camel-tcp-stream-openssl.c:704
-#, c-format
 msgid ""
 "Bad certificate from %s:\n"
 "\n"
@@ -9600,7 +9456,6 @@ msgstr ""
 
 #. construct our user prompt
 #: camel/camel-tcp-stream-ssl.c:841
-#, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
 "\n"
@@ -9615,7 +9470,6 @@ msgstr ""
 "Želite li prihvatiti?"
 
 #: camel/camel-tcp-stream-ssl.c:885
-#, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
@@ -9624,7 +9478,6 @@ msgstr ""
 "Izdavač: %s"
 
 #: camel/camel-tcp-stream-ssl.c:937
-#, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
@@ -9633,7 +9486,6 @@ msgstr ""
 "Izdavač: %s"
 
 #: camel/camel-tcp-stream-ssl.c:955
-#, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
@@ -9642,7 +9494,6 @@ msgstr ""
 "Izdavač: %s"
 
 #: camel/camel-tcp-stream-ssl.c:972
-#, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
@@ -9651,17 +9502,14 @@ msgstr ""
 "Izdavač: %s"
 
 #: camel/camel-url.c:290
-#, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nisam mogao obraditi URL `%s"
 
 #: camel/camel-vee-folder.c:611
-#, c-format
 msgid "Error storing `%s': %s"
 msgstr "Greška kod spremanja `%s': %s"
 
 #: camel/camel-vee-folder.c:649
-#, c-format
 msgid "No such message %s in %s"
 msgstr "Nema takve poruke %s u %s"
 
@@ -9669,30 +9517,25 @@ msgstr "Nema takve poruke %s u %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Ne mogu kopirati ili premjestiti poruke u Virtualnu Mapu"
 
-#: camel/camel-vee-store.c:365
-#, c-format
+#: camel/camel-vee-store.c:368
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne mogu obrisati mapu: %s: nema takve mape"
 
-#: camel/camel-vee-store.c:378
-#, c-format
+#: camel/camel-vee-store.c:381
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
 
-#: camel/camel-vee-store.c:386
-#, c-format
+#: camel/camel-vee-store.c:389
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne mogu preimenovati mapu: %s: nema takve mape"
 
 #: camel/camel-vtrash-folder.c:44
-#, fuzzy
 msgid "Cannot copy messages to the Trash folder"
-msgstr "Ne možete kopirati poruke iz NNTP mape!"
+msgstr "Ne možete kopirati poruke u mapu \"Smeće\""
 
 #: camel/camel-vtrash-folder.c:46
-#, fuzzy
 msgid "Cannot copy messages to the Junk folder"
-msgstr "Ne možete kopirati poruke iz NNTP mape!"
+msgstr "Ne možete kopirati poruke u mapu \"Smeće\""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
@@ -9713,58 +9556,55 @@ msgstr "Primjeni filtere na nove poruke u Inbox mapi ovog poslužitelja"
 msgid "Automatically synchronize remote mail locally"
 msgstr "Automatska sinhronizacija udaljenje pošte s lokalnom"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "LDAP Server Name:"
-msgstr "LDAP ime poslužitelja:"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+msgid "Address Book And Calendar"
+msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "Search base:"
-msgstr "Baza _pretrage:"
+#: camel/providers/groupwise/camel-groupwise-provider.c:69
+msgid "Post Office Agent SOAP Port:"
+msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:83
+#: camel/providers/groupwise/camel-groupwise-provider.c:80
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
 msgid "For accessing Novell Groupwise servers"
-msgstr ""
+msgstr "Za pristupanje Novell Groupwise serverima"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: 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:87
+#: 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:102
+#: 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 "Spajanje na IMAP poslužitelje korištenjem lozinke u čistom tekstu."
 
-#: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:323
-#, fuzzy
+#: camel/providers/groupwise/camel-gw-listener.c:303
+#: camel/providers/groupwise/camel-gw-listener.c:327
 msgid "Checklist"
-msgstr "popis"
+msgstr "Kontrolni popis"
 
 #: 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:2888
+#: camel/providers/imap/camel-imap-store.c:2902
 msgid "Operation cancelled"
 msgstr "Operacija je opozvana"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
-#, c-format
+#: camel/providers/imap/camel-imap-store.c:2905
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Veza s poslužiteljom je neočekivano prekinuta: %s"
 
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
-#, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
@@ -9773,12 +9613,10 @@ msgstr ""
 "%s"
 
 #: camel/providers/imap/camel-imap-command.c:389
-#, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Neočekivan odgovor od IMAP poslužitelja: %s"
 
 #: camel/providers/imap/camel-imap-command.c:399
-#, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP naredba nije uspjela: %s"
 
@@ -9787,22 +9625,18 @@ msgid "Server response ended too soon."
 msgstr "Odgovor poslužitelja je prerano završen."
 
 #: camel/providers/imap/camel-imap-command.c:649
-#, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odgovor IMAP poslužitelja ne sadrži %s informaciju"
 
 #: camel/providers/imap/camel-imap-command.c:685
-#, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Neočekivan OK odgovor od IMAP poslužitelja: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:223
-#, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ne mogu kreirati mapu %s: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:242
-#, c-format
 msgid "Could not load summary for %s"
 msgstr "Ne mogu učitati sažetak za %s"
 
@@ -9815,12 +9649,11 @@ msgstr "Mapa je uništena i ponovo kreirana na serveru."
 msgid "Scanning for changed messages"
 msgstr "Tragam za promijenjenim porukama"
 
-#: camel/providers/imap/camel-imap-folder.c:1917
-#, c-format
+#: camel/providers/imap/camel-imap-folder.c:1924
 msgid "Unable to retrieve message: %s"
 msgstr "Ne mogu da pokupim poruku: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1971
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9828,7 +9661,6 @@ msgstr "Ne mogu da pokupim poruku: %s"
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
-#, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
@@ -9836,30 +9668,29 @@ msgstr ""
 "Ne mogu dobiti poruku: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1971
 #: 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:1971
-#: camel/providers/imap/camel-imap-folder.c:2567
+#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2601
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Ova poruka je trenutno nedostupna"
 
-#: camel/providers/imap/camel-imap-folder.c:2231
-#: camel/providers/imap/camel-imap-folder.c:2301
+#: camel/providers/imap/camel-imap-folder.c:2265
+#: camel/providers/imap/camel-imap-folder.c:2335
 msgid "Fetching summary information for new messages"
 msgstr "Prikupljam sažetu informaciju za nove poruke"
 
-#: camel/providers/imap/camel-imap-folder.c:2605
+#: camel/providers/imap/camel-imap-folder.c:2639
 msgid "Could not find message body in FETCH response."
 msgstr "Nisam mogao pronaći tekst poruke u FETCH odgovoru."
 
 #: camel/providers/imap/camel-imap-message-cache.c:155
-#, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Nisam mogao otvoriti direktorij za pričuvnu memoriju: %s"
 
@@ -9867,12 +9698,10 @@ msgstr "Nisam mogao otvoriti direktorij za pričuvnu memoriju: %s"
 #: camel/providers/imap/camel-imap-message-cache.c:309
 #: camel/providers/imap/camel-imap-message-cache.c:340
 #: camel/providers/imap/camel-imap-message-cache.c:372
-#, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nisam uspio privremeno sačuvati poruku %s: %s"
 
 #: camel/providers/imap/camel-imap-message-cache.c:417
-#, c-format
 msgid "Failed to cache %s: %s"
 msgstr "Nisam uspio privremeno sačuvati %s: %s"
 
@@ -9910,14 +9739,12 @@ msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Primjeni filtere na nove poruke u INBOXu ovog servera"
 
 #: camel/providers/imap/camel-imap-provider.c:66
-#, fuzzy
 msgid "Check new messages for Junk contents"
-msgstr "Provjeri za nove poruke u svim mapama"
+msgstr "Provjeri nove poruke da li u se njima nalazi sadržaj koji je proglašen smećem."
 
 #: camel/providers/imap/camel-imap-provider.c:68
-#, fuzzy
 msgid "Only check for Junk messages in the INBOX folder"
-msgstr "Provjeri za nove poruke u svim mapama"
+msgstr "Provjeri samo u mapi INBOX da li postoje nepoželjne poruke"
 
 #: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
@@ -9927,35 +9754,38 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za čitanje i spremanje pošte na IMAP servere."
 
-#: camel/providers/imap/camel-imap-store.c:478
-#, c-format
+#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap4/camel-imap-store.c:166
 msgid "IMAP server %s"
 msgstr "IMAP poslužitelj %s"
 
-#: camel/providers/imap/camel-imap-store.c:480
-#, c-format
+#: camel/providers/imap/camel-imap-store.c:427
+#: camel/providers/imap4/camel-imap-store.c:168
 msgid "IMAP service for %s on %s"
 msgstr "IMAP servis za %s na %s"
 
-#: camel/providers/imap/camel-imap-store.c:601
-#: camel/providers/imap/camel-imap-store.c:621
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap-store.c:209
+#: camel/providers/imap4/camel-imap-store.c:226
 #: 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 se mogao povezati na %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:603
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap-store.c:211
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL nedostupan"
 
-#: camel/providers/imap/camel-imap-store.c:618
-#: camel/providers/imap/camel-imap-store.c:850
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:801
+#: camel/providers/imap4/camel-imap-store.c:223
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
@@ -9963,51 +9793,45 @@ msgstr "SSL nedostupan"
 msgid "Connection cancelled"
 msgstr "Povezivanje poništeno"
 
-#: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap/camel-imap-store.c:715
-#, c-format
+#: camel/providers/imap/camel-imap-store.c:635
+#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap4/camel-imap-store.c:287
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"Nisam se mogao povezati na IMAP server %s u sigurnosnom načinu rada: %s"
+msgstr "Nisam se mogao povezati na IMAP server %s u sigurnosnom načinu rada: %s"
 
-#: camel/providers/imap/camel-imap-store.c:685
+#: camel/providers/imap/camel-imap-store.c:636
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS dodatak nije podržan."
 
-#: camel/providers/imap/camel-imap-store.c:716
+#: camel/providers/imap/camel-imap-store.c:667
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL pregovori nisu uspjeli"
 
-#: camel/providers/imap/camel-imap-store.c:853
-#, c-format
+#: camel/providers/imap/camel-imap-store.c:804
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Ne mogu se spojiti s naredbom \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
-#, c-format
+#: camel/providers/imap/camel-imap-store.c:1228
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP poslužitelj %s ne podržava traženi tip prijave  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1238
 #: camel/providers/smtp/camel-smtp-transport.c:486
-#, c-format
 msgid "No support for authentication type %s"
 msgstr "Nema podrške za tip autentifikacije  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1261
 #: camel/providers/imapp/camel-imapp-store.c:344
-#, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sMolim unesite IMAP zaporku za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1275
 msgid "You didn't enter a password."
 msgstr "Niste unijeli lozinku."
 
-#: camel/providers/imap/camel-imap-store.c:1346
-#, c-format
+#: camel/providers/imap/camel-imap-store.c:1304
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
@@ -10017,35 +9841,120 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
-#, c-format
+#: camel/providers/imap/camel-imap-store.c:1723
+#: camel/providers/imap/camel-imap-store.c:1817
 msgid "No such folder %s"
 msgstr "Nema takve mape %s"
 
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1734
+#: camel/providers/imap/camel-imap-store.c:2023
+#: camel/providers/imap4/camel-imap-store.c:636
+msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Ime mape \"%s\" nije ispravno jer sadrži karakter \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1758
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:234
-#, fuzzy, c-format
+#: camel/providers/local/camel-mh-store.c:236
+#, , c-format
 msgid "Cannot create folder `%s': folder exists."
-msgstr "Ne mogu stvoriti mapu: %s: %s"
-
-#: camel/providers/imap/camel-imap-store.c:2046
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr "Ime mape \"%s\" nije ispravno jer sadrži karakter \"%c\""
+msgstr "Ne mogu stvoriti mapu: `%s': mapa postoji."
 
-#: camel/providers/imap/camel-imap-store.c:2058
-#, c-format
+#: camel/providers/imap/camel-imap-store.c:2035
 msgid "Unknown parent folder: %s"
 msgstr "Nepoznata glavna mapa: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2071
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Glavni direktorij ne smije sadržati direktorije "
 
+#: camel/providers/imap4/camel-imap-command.c:629
+msgid "Unexpected response from IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-engine.c:411
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-engine.c:417
+msgid "Cannot select folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-engine.c:1135
+#: camel/providers/imap4/camel-imap-engine.c:1524
+#: camel/providers/imap4/camel-imap-engine.c:1551
+#: camel/providers/imap4/camel-imap-engine.c:1581
+#: camel/providers/imap4/camel-imap-engine.c:1621
+#: camel/providers/imap4/camel-imap-utils.c:289
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-engine.c:1136
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-store.c:262
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-store.c:374
+msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-store.c:419
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-store.c:493
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-store.c:672
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-store.c:677
+msgid "Cannot create folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-store.c:699
+msgid "Cannot delete folder `%s': Special folder"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-store.c:728
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-store.c:733
+msgid "Cannot delete folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-store.c:791
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-store.c:796
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-store.c:835
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-store.c:840
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-utils.c:83
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-utils.c:106
+msgid "No data"
+msgstr ""
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10063,13 +9972,11 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 "Experimentalni IMAP 4(.1) klijent\n"
-"Ovo je neisprobani i nepodržani kod, možda biste ipak željeli koristiti "
-"obični imap.\n"
+"Ovo je neisprobani i nepodržani kod, možda biste ipak željeli koristiti obični imap.\n"
 "\n"
 " !!! NEMOJTE OVO KORISTITI ZA OZBILNU UPORABU !!!\n"
 
 #: camel/providers/imapp/camel-imapp-store.c:328
-#, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Ne mogu se spojiti na POP poslužitelj na %s "
 
@@ -10078,21 +9985,18 @@ msgid "Index message body data"
 msgstr "Indeksiranje sadržaja poruka"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:382
-#, c-format
+#: camel/providers/local/camel-local-folder.c:388
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:386
-#: camel/providers/local/camel-local-folder.c:389
-#, c-format
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 msgid "mailbox:%s (%s)"
 msgstr "sandučić:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#, c-format
+#: camel/providers/local/camel-local-folder.c:399
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
@@ -10117,8 +10021,8 @@ msgid ""
 "For retrieving (moving) local mail from standard mbox formated spools into "
 "folders managed by Evolution."
 msgstr ""
-"Za preuzimanje (premještanje) lokalne pošte iz mbox formata u mape kojima "
-"upravlja Evolution."
+"Za preuzimanje (premještanje) lokalne pošte iz mbox formata u mape "
+"kojima upravlja Evolution."
 
 #: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
@@ -10153,21 +10057,18 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:138
 #: camel/providers/local/camel-local-store.c:215
-#: camel/providers/local/camel-mbox-store.c:355
+#: 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 "Spremnik root %s nije apsolutna putanja"
 
 #: camel/providers/local/camel-local-store.c:145
-#, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Spremnik root %s nije regularan direktorij"
 
 #: camel/providers/local/camel-local-store.c:154
 #: camel/providers/local/camel-local-store.c:162
 #: camel/providers/local/camel-local-store.c:226
-#, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne mogu dobiti mapu: %s: %s"
 
@@ -10176,40 +10077,33 @@ msgid "Local stores do not have an inbox"
 msgstr "Lokalna spremišta ne sadrže sandučić za poštu."
 
 #: camel/providers/local/camel-local-store.c:186
-#, c-format
 msgid "Local mail file %s"
 msgstr "Lokalna datoteka pošte %s"
 
 #: camel/providers/local/camel-local-store.c:295
-#, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nisam mogao preimenovati direktorij %s u %s: %s"
 
 #: camel/providers/local/camel-local-store.c:360
-#, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nisam mogao preimenovati '%s': %s"
 
 #: camel/providers/local/camel-local-store.c:385
 #: camel/providers/local/camel-mbox-store.c:284
-#, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nisam mogao obrisati datoteku sažetka mape `%s': %s"
 
 #: camel/providers/local/camel-local-store.c:395
 #: camel/providers/local/camel-mbox-store.c:296
-#, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nisam mogao obrisati indeks datoteku mape `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:417
-#: camel/providers/local/camel-mbox-store.c:319
-#, c-format
+#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-mbox-store.c:320
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Ne mogu obrisati meta datoteku mape: `%s': %s"
 
 #: camel/providers/local/camel-local-summary.c:405
-#, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nisam mogao sačuvati sažetak: %s: %s"
 
@@ -10222,7 +10116,6 @@ msgid "Maildir append message cancelled"
 msgstr "Dodata Maildir poruka otkazana"
 
 #: camel/providers/local/camel-maildir-folder.c:186
-#, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ne mogu dodati poruku u maildir mapu: %s: %s"
 
@@ -10233,34 +10126,33 @@ msgstr "Neispravan sadržaj poruke"
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
-#, fuzzy, c-format
+#: camel/providers/local/camel-mh-store.c:204
+#, , c-format
 msgid "Cannot get folder `%s': %s"
-msgstr "Ne mogu dobiti mapu: %s: %s"
+msgstr "Ne mogu dohvatiti mapu: `%s': %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
-#, fuzzy, c-format
+#: camel/providers/local/camel-mh-store.c:211
+#, , c-format
 msgid "Cannot get folder `%s': folder does not exist."
-msgstr "Mapa `%s' ne postoji."
+msgstr "Ne mogu dohvatiti mapu `%s': mapa ne postoji."
 
 #: camel/providers/local/camel-maildir-store.c:119
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
-#, fuzzy, c-format
+#, , c-format
 msgid "Cannot create folder `%s': %s"
-msgstr "Ne mogu stvoriti mapu: %s: %s"
+msgstr "Ne mogu stvoriti mapu: `%s': %s"
 
 #: camel/providers/local/camel-maildir-store.c:134
-#, fuzzy, c-format
+#, , c-format
 msgid "Cannot get folder `%s': not a maildir directory."
-msgstr "`%s' nije maildir direktorij."
+msgstr "Ne mogu dohvatiti mapu `%s': nije maildir direktorij."
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
-#, c-format
+#: camel/providers/local/camel-mh-store.c:260
 msgid "Could not delete folder `%s': %s"
 msgstr "Nisam mogao obrisati direktorij `%s': %s"
 
@@ -10268,28 +10160,26 @@ msgstr "Nisam mogao obrisati direktorij `%s': %s"
 msgid "not a maildir directory"
 msgstr "nije maildir direktorij"
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
-#, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nisam mogao skenirati direktorij `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:417
-#: camel/providers/local/camel-maildir-summary.c:548
-#, c-format
+#: camel/providers/local/camel-maildir-summary.c:419
+#: camel/providers/local/camel-maildir-summary.c:550
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Ne mogu otvoriti putanju maildir direktorija: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr "Provjeravam dosljednost mape"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr "Provjeravam za nove poruke"
 
-#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-maildir-summary.c:735
 #: camel/providers/local/camel-mbox-summary.c:369
 #: camel/providers/local/camel-mbox-summary.c:542
 #: camel/providers/local/camel-mbox-summary.c:633
@@ -10299,12 +10189,10 @@ msgstr "Smiještam direktorij"
 
 #: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
-#, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ne mogu zaključati  mapu %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:284
-#, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ne mogu otvoriti sandučić: %s: %s\n"
 
@@ -10313,14 +10201,12 @@ msgid "Mail append cancelled"
 msgstr "Dodavanje pošte otkazano"
 
 #: camel/providers/local/camel-mbox-folder.c:347
-#, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ne mogu dodati poruku u mbox datoteku: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:435
 #: camel/providers/local/camel-mbox-folder.c:466
 #: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
@@ -10337,19 +10223,18 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Sastavljanje poruke neuspjelo: Oštećeno sandučić?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:362
 msgid "Cannot create a folder by this name."
 msgstr "Ne mogu stvoriti mapu s ovim imenom."
 
 #: camel/providers/local/camel-mbox-store.c:206
-#, fuzzy, c-format
+#, , c-format
 msgid "Cannot get folder `%s': not a regular file."
-msgstr "Ne mogu priložiti datoteku %s: nije standardna datoteka"
+msgstr "Ne mogu dohvatiti mapu `%s': nije obična datoteka"
 
 #: camel/providers/local/camel-mbox-store.c:236
 #: camel/providers/local/camel-mbox-store.c:247
 #: camel/providers/local/camel-mbox-store.c:270
-#, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
@@ -10358,84 +10243,72 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:255
-#, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' nije regularna datoteka."
 
 #: camel/providers/local/camel-mbox-store.c:262
-#, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mapa `%s' nije prazna. Nije obrisana."
 
-#: camel/providers/local/camel-mbox-store.c:374
-#, c-format
+#: camel/providers/local/camel-mbox-store.c:375
 msgid "Cannot create directory `%s': %s."
 msgstr "Ne mogu otvoriti direktorij  `%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:388
-#, c-format
+#: camel/providers/local/camel-mbox-store.c:389
 msgid "Cannot create folder: %s: %s"
 msgstr "Ne mogu stvoriti mapu: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 msgid "Folder already exists"
 msgstr "Mapa već postoji"
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 msgid "The new folder name is illegal."
 msgstr "Ime nove mape je neispravno."
 
-#: camel/providers/local/camel-mbox-store.c:485
-#, fuzzy, c-format
+#: camel/providers/local/camel-mbox-store.c:486
+#, , c-format
 msgid "Could not rename `%s': `%s': %s"
-msgstr "Nisam mogao preimenovati '%s': %s"
+msgstr "Ne mogu preimenovati `%s': `%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
-#, fuzzy, c-format
+#: camel/providers/local/camel-mbox-store.c:561
+#, , c-format
 msgid "Could not rename '%s' to %s: %s"
-msgstr "Ne mogu preimenovati direktorij %s u %s: %s"
+msgstr "Ne mogu preimenovati  '%s' u %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:375
-#, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nisam mogao otvoriti direktorij: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:423
-#, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatalna greška u obradi pošte na poziciji %ld u direktoriju %s"
 
 #: camel/providers/local/camel-mbox-summary.c:479
-#, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ne mogu provjeriti mapu: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:547
 #: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
-#, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nisam mogao otvoriti datoteku: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
-#, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ne mogu otvoriti privremeni sandučić: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:572
 #: camel/providers/local/camel-mbox-summary.c:736
-#, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nisam mogao zatvoriti izvornu mapu%s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:581
-#, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nisam mogao zatvoriti temp mapu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
-#, c-format
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2459
 msgid "Could not rename folder: %s"
 msgstr "Nisam mogao preimenovati direktorij: %s"
 
@@ -10448,23 +10321,19 @@ msgstr "Neslaganje sažetka i direktorija, čak i nakon sinhronizacije"
 
 #: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
-#, c-format
 msgid "Unknown error: %s"
 msgstr "Nepoznata greška: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:846
-#, c-format
 msgid "Could not store folder: %s"
 msgstr "Nisam mogao spremiti direktorij: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:940
 #: camel/providers/local/camel-mbox-summary.c:966
-#, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Greška kod pisanja u privremeni pretinac: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:957
-#, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Pisanje u tmp poštanskog pretinca neuspjelo: %s: %s"
 
@@ -10473,44 +10342,36 @@ msgid "MH append message cancelled"
 msgstr "MH dodaja poruke otkazana"
 
 #: camel/providers/local/camel-mh-folder.c:177
-#, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ne mogu dodati poruku u mh mapu: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:217
-#, fuzzy, c-format
+#: camel/providers/local/camel-mh-store.c:219
+#, , c-format
 msgid "Could not create folder `%s': %s"
-msgstr ""
-"Nisam mogao napraviti mapu `%s':\n"
-"%s"
+msgstr "Nisam mogao napraviti mapu `%s':%s"
 
-#: camel/providers/local/camel-mh-store.c:229
-#, fuzzy, c-format
+#: camel/providers/local/camel-mh-store.c:231
+#, , c-format
 msgid "Cannot get folder `%s': not a directory."
-msgstr "Ne mogu dobiti mapu: %s: %s"
+msgstr "Ne mogu dohvatiti mapu: %s: nije direktorij."
 
 #: camel/providers/local/camel-mh-summary.c:244
-#, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ne mogu otvoriti putanju MH direktorija: %s: %s"
 
 #: camel/providers/local/camel-spool-store.c:122
-#, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Spool `%s' se ne može otvoriti: %s"
 
 #: camel/providers/local/camel-spool-store.c:134
-#, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "Spool `%s' nije regularna datoteka ili direktorij"
 
 #: camel/providers/local/camel-spool-store.c:153
-#, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mapa `%s/%s' ne postoji."
 
 #: camel/providers/local/camel-spool-store.c:163
-#, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
@@ -10519,12 +10380,10 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-spool-store.c:167
-#, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mapa `%s' ne postoji."
 
 #: camel/providers/local/camel-spool-store.c:172
-#, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
@@ -10533,7 +10392,6 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-spool-store.c:180
-#, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "`%s' nije mailbox datoteka."
 
@@ -10542,12 +10400,10 @@ msgid "Store does not support an INBOX"
 msgstr "Spremnik ne podržava INBOX"
 
 #: camel/providers/local/camel-spool-store.c:209
-#, c-format
 msgid "Spool mail file %s"
 msgstr "Spool datoteka pošte %s"
 
 #: camel/providers/local/camel-spool-store.c:209
-#, c-format
 msgid "Spool folder tree %s"
 msgstr "Lista spool direktorija %s"
 
@@ -10562,19 +10418,16 @@ msgstr "Spool direktoriji se ne mogu brisati"
 #: camel/providers/local/camel-spool-summary.c:175
 #: camel/providers/local/camel-spool-summary.c:185
 #: camel/providers/local/camel-spool-summary.c:195
-#, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Nisam mogao sinkronizirati privremenu mapu %s: %s"
 
 #: camel/providers/local/camel-spool-summary.c:211
-#, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Nisam mogao sinhronizirati spool direktorij %s: %s"
 
 #: camel/providers/local/camel-spool-summary.c:242
 #: camel/providers/local/camel-spool-summary.c:261
 #: camel/providers/local/camel-spool-summary.c:274
-#, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
@@ -10584,7 +10437,6 @@ msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
 #: camel/providers/nntp/camel-nntp-store.c:997
-#, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Molim unesite NNTP lozinku za %s@%s"
 
@@ -10616,20 +10468,18 @@ msgstr "Korisnik poništen"
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
 #: camel/providers/pop3/camel-pop3-folder.c:512
-#, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Ne mogu dobiti poruku %s: %s"
 
 #: camel/providers/nntp/camel-nntp-folder.c:157
 #: camel/providers/nntp/camel-nntp-folder.c:195
-#, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Interna greška: uid je u neispravnom formatu: %s"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#, fuzzy, c-format
+#, , c-format
 msgid "Could not get article %s from NNTP server"
-msgstr "Nisam mogao pokrenuti wombat server"
+msgstr "Ne mogu dohvatiti članak %s s NNTP poslužitelja"
 
 #: camel/providers/nntp/camel-nntp-folder.c:353
 msgid "Posting not allowed by news server"
@@ -10651,11 +10501,9 @@ msgid "Error reading response to posted message: message not posted"
 msgstr "Greška pri čitanju odgovora na poslanu poruku: poruka nije poslana"
 
 #: camel/providers/nntp/camel-nntp-folder.c:432
-#, fuzzy, c-format
+#, , c-format
 msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Greška kod automatskog spremanja poruke: %s\n"
-" %s"
+msgstr "Greška prilikom slanja poruke: %s: poruka nije poslana"
 
 #: camel/providers/nntp/camel-nntp-folder.c:448
 msgid "You cannot post NNTP messages while working offline!"
@@ -10671,20 +10519,16 @@ msgstr "Ne mogu dohvatiti popis grupa sa poslužitelja."
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:98
 #: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Nije se mogla učitati datoteka sa listom grupa za %s: %s"
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nije se mogla snimiti datoteka sa listom grupa za %s: %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid ""
-"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr ""
-"Prikaži mape u skraćenom obliku (npr. h.c.o.linux umjesto hr.comp.os.linux)"
+msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr "Prikaži mape u skraćenom obliku (npr. h.c.o.linux umjesto hr.comp.os.linux)"
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
 msgid "In the subscription dialog, show relative folder names"
@@ -10705,17 +10549,14 @@ msgid ""
 msgstr "Prijava na NNTP server korištenjem lozinke u čistom tekstu."
 
 #: camel/providers/nntp/camel-nntp-store.c:158
-#, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Nisam mogao pročitati pozdrav od %s: %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:170
-#, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s je uzvratio kodom o grešci %d: %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:326
-#, c-format
 msgid "USENET News via %s"
 msgstr "USENET vijesti preko %s"
 
@@ -10724,13 +10565,14 @@ msgid "Stream error"
 msgstr "Greška u nizu podataka"
 
 #: camel/providers/nntp/camel-nntp-store.c:643
-#, fuzzy, c-format
+#, , c-format
 msgid ""
 "Error retrieving newsgroups:\n"
 "\n"
 "%s"
 msgstr ""
-"Greška kod spremanja poruka u: %s:\n"
+"Greška pri dohvatu grupa:\n"
+"\n"
 " %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:735
@@ -10755,9 +10597,7 @@ msgstr ""
 
 #: camel/providers/nntp/camel-nntp-store.c:792
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr ""
-"Ne možete stvoriti mapu u pohrani USENET poruka: umjesto toga otkažite "
-"pretplatu."
+msgstr "Ne možete stvoriti mapu u pohrani USENET poruka: umjesto toga otkažite pretplatu."
 
 #: camel/providers/nntp/camel-nntp-store.c:800
 msgid "You cannot rename a folder in a News store."
@@ -10765,51 +10605,43 @@ msgstr "Ne možete ukloniti mapu u spremištu USENET poruka."
 
 #: camel/providers/nntp/camel-nntp-store.c:808
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
-"Ne možete ukloniti mapu u spremištu USENET poruka: otkažite pretplatu "
-"umjesto toga."
+msgstr "Ne možete ukloniti mapu u spremištu USENET poruka: otkažite pretplatu umjesto toga."
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
-#, fuzzy, c-format
+#: camel/providers/nntp/camel-nntp-summary.c:253
+#, , c-format
 msgid "Connection error: %s"
-msgstr "Nepoznata greška: %s"
+msgstr "Greška u spajanju: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:258
-#, c-format
+#: camel/providers/nntp/camel-nntp-summary.c:262
 msgid "No such folder: %s"
 msgstr "Nema takve mape: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:264
-#, c-format
+#: camel/providers/nntp/camel-nntp-summary.c:268
 msgid "Could not get group: %s"
 msgstr "Ne mogu dobiti grupu: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 msgid "Could not get messages: unspecificed error"
 msgstr "Ne mogu dohvatiti poruke: nenavedena greška"
 
-#: camel/providers/nntp/camel-nntp-summary.c:374
-#, c-format
+#: camel/providers/nntp/camel-nntp-summary.c:378
 msgid "NNTP Command failed: %s"
 msgstr "NNTP komanda nije uspjela: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:434
-#: camel/providers/nntp/camel-nntp-summary.c:539
-#, c-format
+#: camel/providers/nntp/camel-nntp-summary.c:438
+#: camel/providers/nntp/camel-nntp-summary.c:543
 msgid "%s: Scanning new messages"
 msgstr "%s: Tražim nove poruke"
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
-#, c-format
+#: camel/providers/nntp/camel-nntp-summary.c:558
 msgid "Unknown server response: %s"
 msgstr "Nepoznat odgovor poslužitelja: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
 msgstr "Koristite poništi"
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
-#, c-format
+#: camel/providers/nntp/camel-nntp-summary.c:607
 msgid "Operation failed: %s"
 msgstr "Neuspjela operacija: %s"
 
@@ -10818,7 +10650,6 @@ msgid "Retrieving POP summary"
 msgstr "Preuzimam POP sažetak"
 
 #: camel/providers/pop3/camel-pop3-folder.c:265
-#, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Ne mogu dobiti POP sažetak: %s"
 
@@ -10827,14 +10658,12 @@ msgid "Expunging deleted messages"
 msgstr "Nepročitana poruka"
 
 #: camel/providers/pop3/camel-pop3-folder.c:404
-#, c-format
 msgid "No message with uid %s"
 msgstr "Nema poruka sa uid-om %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
+#.  returns the proper exception code.  Sigh.
 #: camel/providers/pop3/camel-pop3-folder.c:411
-#, c-format
 msgid "Retrieving POP message %d"
 msgstr "Preuzimam POP poruke (%d)"
 
@@ -10847,7 +10676,6 @@ msgid "Leave messages on server"
 msgstr "Ostavi poruke na serveru"
 
 #: camel/providers/pop3/camel-pop3-provider.c:43
-#, c-format
 msgid "Delete after %s day(s)"
 msgstr "Obriši nakon %s dana"
 
@@ -10855,7 +10683,7 @@ msgstr "Obriši nakon %s dana"
 msgid "Disable support for all POP3 extensions"
 msgstr "Onemogući podršku za sva POP3 proširenja"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
 msgid "POP"
 msgstr "POP"
 
@@ -10867,9 +10695,7 @@ msgstr "Za povezivanje i preuzimanje pošte sa POP servera."
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
-msgstr ""
-"Spajanje na POP poslužitelj korištenjem lozinke u čistim tekstom. Ovo je "
-"jedini način prijenosa kojeg podržavaju mnogi POP poslužitelji."
+msgstr "Spajanje na POP poslužitelj korištenjem lozinke u čistim tekstom. Ovo je jedini način prijenosa kojeg podržavaju mnogi POP poslužitelji."
 
 #: camel/providers/pop3/camel-pop3-provider.c:83
 msgid ""
@@ -10877,60 +10703,51 @@ msgid ""
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"Spajanje na POP poslužitelj korištenjem enkriptirane lozinke preko APOP "
-"protokola.Možda neće raditi svim korisnicima, čak i sa poslužiteljma koji "
-"tvrde da to podržavaju."
+"Spajanje na POP poslužitelj korištenjem enkriptirane lozinke preko APOP protokola."
+"Možda neće raditi svim korisnicima, čak i sa poslužiteljma koji tvrde da to podržavaju."
 
 #: camel/providers/pop3/camel-pop3-store.c:195
-#, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Nisam se mogao povezati na POP server %s (port %d): %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:227
 #: camel/providers/pop3/camel-pop3-store.c:256
 #: camel/providers/pop3/camel-pop3-store.c:268
-#, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Nisam se mogao povezati na POP server %s u sigurnosnom načinu rada: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:366
-#, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Nisam se mogao povezati na POP server %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:407
 #: camel/providers/pop3/camel-pop3-store.c:521
-#, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr ""
-"Nisam mogao da se povežem na POP poslužitelj %s: Traženi mehanizam prijave "
-"nije podržan."
+"Nisam mogao da se povežem na POP poslužitelj %s: Traženi mehanizam prijave nije "
+"podržan."
 
 #: camel/providers/pop3/camel-pop3-store.c:423
-#, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' prijava neuspela na POP poslužitelj %s: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:435
-#, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Ne mogu se prijaviti na POP server %s: greška kod SASL protokola"
 
 #: camel/providers/pop3/camel-pop3-store.c:454
-#, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Nisam se mogao prijaviti na POP server %s: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:480
-#, c-format
+#, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
-msgstr ""
+msgstr "%sMolim, upišite POP lozinku za %s na računalu %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:535
 #: camel/providers/pop3/camel-pop3-store.c:542
-#, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
@@ -10939,12 +10756,11 @@ msgstr ""
 "Greška kod slanja zaporke: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:641
-#, c-format
 msgid "No such folder `%s'."
 msgstr "Nema takve mape `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10952,40 +10768,33 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr ""
-"Za dostavu pošte prosljeđivanjem \"sendmail\" programu na lokalnom sustavu."
+msgstr "Za dostavu pošte prosljeđivanjem \"sendmail\" programu na lokalnom sustavu."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr "Nisam mogao obraditi popis primatelja"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:144
-#, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Nisam mogao napraviti cjevovod na sendmail: %s: poruka nije poslana"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:165
-#, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Ne mogu forkati sendmail: %s: poruka nije poslana"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:205
-#, c-format
 msgid "Could not send message: %s"
 msgstr "Nisam mogao poslati poruku: %s"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:233
-#, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail je završio signalom %s: poruka nije poslana"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:240
-#, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nisam mogao izvršiti %s: poruka nije poslana"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:245
-#, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail je završio sa statusom %d: poruka nije poslana"
 
@@ -10997,13 +10806,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava pošte preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "Za dostavu pošte povezivanjem na mrežni mailhub korištenjem SMTP-a.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
@@ -11111,36 +10920,32 @@ msgstr "Greška kod odgovora dobrodošlice"
 
 #: camel/providers/smtp/camel-smtp-transport.c:343
 #: camel/providers/smtp/camel-smtp-transport.c:382
-#, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr ""
-"Nisam se mogao povezati na SMTP server %s u sigurnosnom načinu rada: %s"
+msgstr "Nisam se mogao povezati na SMTP server %s u sigurnosnom načinu rada: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:344
 msgid "server does not appear to support SSL"
 msgstr "čini se da poslužitelj ne podržava SSL"
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
-#, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "STARTTLS zahtjevu je isteklo vrijeme: %s"
+#, , c-format
+msgid "STARTTLS command failed: %s"
+msgstr "Greška kod izvršavanja naredbe STARTTLS: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
-msgstr "STARTTLS greška u odgovoru"
+msgid "STARTTLS command failed"
+msgstr "Greška kod izvršavanja naredbe STARTTLS"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
-#, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP poslužitelj %s ne podržava traženi tip autorizacije (%s)."
 
 #: camel/providers/smtp/camel-smtp-transport.c:514
-#, c-format
+#, c-format
 msgid "%sPlease enter the SMTP password for %s on host %s"
-msgstr ""
+msgstr "%sMolim, upišite SMTP lozinku za %s na računalu %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:533
-#, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
 "%s\n"
@@ -11151,142 +10956,131 @@ msgstr ""
 "\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:666
-#, c-format
 msgid "SMTP server %s"
 msgstr "SMTP poslužitelj %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:668
-#, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP dostava pošte preko %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+msgid "Cannot send message: service not connected."
+msgstr "Ne mogu poslati poruku: nema veze sa servisom.."
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr "Ne mogu poslati poruku: adresa pošiljatelja nije ispravna."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr "Slanje poruke"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne mogu poslati poruku: nisu određeni primatelji."
 
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: camel/providers/smtp/camel-smtp-transport.c:722
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ne mogu poslati poruku: jedan ili više neispravnih primatelja"
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr "SMTP pozdrav"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
-#, c-format
-msgid "HELO request timed out: %s"
-msgstr "HELO zahtjevu je isteklo vrijeme: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:943
+#, , c-format
+msgid "HELO command failed: %s"
+msgstr "Greška kod izvršavanja naredbe HELO: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
-msgstr "HELO pogrešan odgovor"
+#: camel/providers/smtp/camel-smtp-transport.c:960
+msgid "HELO command failed"
+msgstr "Greška kod izvršavanja naredbe HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr "SMTP prijava"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr "Greška kod stvaranja objekta SASL prijave."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
-#: camel/providers/smtp/camel-smtp-transport.c:1057
-#, c-format
-msgid "AUTH request timed out: %s"
-msgstr "AUTH zahtjevu je isteklo vrijeme: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1060
+#, , c-format
+msgid "AUTH command failed: %s"
+msgstr "Greška kod izvršavanja naredbe AUTH: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr "AUTH zahtjev nije uspio."
+msgid "AUTH command failed"
+msgstr "Greška kod izvršavanja naredbe AUTH"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1127
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 msgid "Bad authentication response from server.\n"
 msgstr "Neispravan odgovor autentifikacije od servera.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1152
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "MAIL FROM zahtjevu je isteklo vrijeme: %s: poruka nije poslana"
+#: camel/providers/smtp/camel-smtp-transport.c:1153
+#, , c-format
+msgid "MAIL FROM command failed: %s: mail not sent"
+msgstr "Greška kod izvršavanja naredbe MAIL FROM: %s: poruka nije poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
-msgstr "MAIL FROM pogrešan odgovor"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+msgid "MAIL FROM command failed"
+msgstr "Greška kod izvršavanja naredbe MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1196
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "RCPT TO zahtjevu je isteklo vrijeme: %s: poruka nije poslana"
+#: camel/providers/smtp/camel-smtp-transport.c:1194
+#, , c-format
+msgid "RCPT TO command failed: %s: mail not sent"
+msgstr "Greška kod izvršavanja naredbe RCPT TO: %s: poruka nije poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1218
-#, c-format
+#: camel/providers/smtp/camel-smtp-transport.c:1213
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> neuspelo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1257
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "DATA zahtjevu je isteklo vrijeme: %s: poruka nije poslana"
+#: camel/providers/smtp/camel-smtp-transport.c:1252
+#: camel/providers/smtp/camel-smtp-transport.c:1310
+#: camel/providers/smtp/camel-smtp-transport.c:1329
+#, , c-format
+msgid "DATA command failed: %s: mail not sent"
+msgstr "Greška kod izvršavanja naredbe DATA: %s: poruka nije poslana"
 
 #. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: camel/providers/smtp/camel-smtp-transport.c:1277
-msgid "DATA response error"
-msgstr "DATA pogrešan odgovor"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1318
-#: camel/providers/smtp/camel-smtp-transport.c:1341
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-"DATA slanju isteklo je vrijeme: završetak poruke: %s: poruka nije poslana"
+#.  * 354 Enter mail, end with "." on a line by itself
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+msgid "DATA command failed"
+msgstr "Greška kod izvršavanja naredbe DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
-msgstr "DATA završetak pogrešan odgovor"
+#: camel/providers/smtp/camel-smtp-transport.c:1368
+#, , c-format
+msgid "RSET command failed: %s"
+msgstr "Greška kod izvršavanja naredbe RSET: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "RSET zahtjevu je isteklo vrijeme: %s"
+msgid "RSET command failed"
+msgstr "Greška kod izvršavanja naredbe RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
-msgstr "RSET greška u odazivu"
+#: camel/providers/smtp/camel-smtp-transport.c:1407
+#, , c-format
+msgid "QUIT command failed: %s"
+msgstr "Greška kod izvršavanja naredbe QUIT: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
-#, c-format
-msgid "QUIT request timed out: %s"
-msgstr "QUIT zahtjevu je isteklo vrijeme: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
-msgstr "QUIT pogrešan odgovor"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+msgid "QUIT command failed"
+msgstr "Greška kod izvršavanja naredbe QUIT"
 
 #: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
 #: composer/e-msg-composer-attachment-bar.c:107
-#, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
 #: composer/e-msg-composer-attachment-bar.c:110
-#, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1482
 msgid "attachment"
 msgstr "prilog"
 
@@ -11294,22 +11088,20 @@ msgstr "prilog"
 msgid "Remove selected items from the attachment list"
 msgstr "Ukloni odabrane predmete sa liste priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "Dodaj prilog..."
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Attach a file to the message"
 msgstr "Dodaj datoteku poruci"
 
 #: composer/e-msg-composer-attachment.c:168
 #: composer/e-msg-composer-attachment.c:184
-#, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Ne mogu priložiti datoteku %s: %s"
 
 #: composer/e-msg-composer-attachment.c:176
-#, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Ne mogu priložiti datoteku %s: nije standardna datoteka"
 
@@ -11334,79 +11126,69 @@ msgstr "Predloži automatsko otvaranje privitka"
 msgid "You need to configure an account before you can compose mail."
 msgstr "Morate da podesite nalog da biste mogli sastaviti poruku."
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:508
 msgid "Posting destination"
 msgstr "Odredište slanja"
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:509
 msgid "Choose folders to post the message to."
 msgstr "Odaberi mape u koje će se poslati poruka."
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:543
 msgid "Click here for the address book"
 msgstr "Kliknite ovdje za adresar."
 
-#.
 #. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:572
+#.  *
+#.  * Create this before we call create_from_optionmenu,
+#.  * because that causes from_changed to be called, which
+#.  * expects the reply_to fields to be initialized.
+#: composer/e-msg-composer-hdrs.c:573
 msgid "Reply-To:"
 msgstr "Odgovor na:"
 
-#.
 #. * From
-#.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:579
 msgid "From:"
 msgstr "Od:"
 
-#.
 #. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:585
 msgid "Subject:"
 msgstr "Tema:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:594
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:595
 msgid "Enter the recipients of the message"
 msgstr "Unesite primatelje poruke"
 
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:598
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Unesite adrese na koje će se slati kopija poruke"
 
-#: composer/e-msg-composer-hdrs.c:601
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:603
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
-msgstr ""
-"Unesite adrese na koje će se poslati kopija poruke, a koje se neće pojaviti "
-"u popisu primatelja."
+msgstr "Unesite adrese na koje će se poslati kopija poruke, a koje se neće pojaviti u popisu primatelja."
 
-#.
 #. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:610
 msgid "Post To:"
 msgstr "Oglasi na:"
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:615
 msgid "Click here to select folders to post to"
 msgstr "Kliknite ovdje za odabir mapa u koje će se slati poruke"
 
@@ -11415,22 +11197,18 @@ msgid "Attach file(s)"
 msgstr "Priloži datoteku(e)"
 
 #: composer/e-msg-composer.c:652
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"Ne mogu potpisati izlaznu poruku: Nije postavljen certifikat za ovaj "
-"korisnički račun"
+msgid "Cannot sign outgoing message: No signing certificate set for from account"
+msgstr "Ne mogu potpisati izlaznu poruku: Nije postavljen certifikat za ovaj korisnički račun"
 
 #: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
-"Ne mogu kriptirati izlaznu poruku: Nije postavljen certifikaz za kriptiranje "
-"za ovaj korisnički račun"
+"Ne mogu kriptirati izlaznu poruku: Nije postavljen certifikaz za kriptiranje za ovaj "
+"korisnički račun"
 
 #: composer/e-msg-composer.c:789
-#, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
@@ -11443,17 +11221,14 @@ msgid "File exists, overwrite?"
 msgstr "Datoteka postoji, prepisai preko nje?"
 
 #: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
-#, c-format
 msgid "Error saving file: %s"
 msgstr "Greška kod spremanja datoteke: %s"
 
 #: composer/e-msg-composer.c:1212
-#, c-format
 msgid "Error loading file: %s"
 msgstr "Greška kod učitavanja datoteke: %s"
 
 #: composer/e-msg-composer.c:1250
-#, c-format
 msgid "Error accessing file: %s"
 msgstr "Greška kod pristupa datoteci: %s"
 
@@ -11462,7 +11237,6 @@ msgid "Unable to retrieve message from editor"
 msgstr "Ne mogu da povratim poruku iz urednika"
 
 #: composer/e-msg-composer.c:1265
-#, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
@@ -11471,7 +11245,6 @@ msgstr ""
 "%s"
 
 #: composer/e-msg-composer.c:1272
-#, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
@@ -11480,7 +11253,6 @@ msgstr ""
 "%s"
 
 #: composer/e-msg-composer.c:1281
-#, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
@@ -11489,7 +11261,6 @@ msgstr ""
 "%s"
 
 #: composer/e-msg-composer.c:1290
-#, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
@@ -11506,7 +11277,6 @@ msgstr ""
 "Želite li ih pokušati povratiti?"
 
 #: composer/e-msg-composer.c:1558
-#, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
 "\n"
@@ -11516,6 +11286,10 @@ msgstr ""
 "\n"
 "Želite li da sačuvam promjene?"
 
+#: composer/e-msg-composer.c:1560
+msgid "Untitled Message"
+msgstr "Neimenovana poruka"
+
 #: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Upozorenje: izmjenjena poruka"
@@ -11528,15 +11302,18 @@ msgstr "Otvori datoteku"
 msgid "Signature:"
 msgstr "Potpis:"
 
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1317
 msgid "Autogenerated"
 msgstr "Automatski stvoren"
 
+#. plural form
 #: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "------"
+msgstr[0] "Dodana <b>%d</b> datoteka"
+msgstr[1] "Dodane <b>%d</b> datoteke"
+msgstr[2] "Dodano <b>%d</b> datoteka"
 
 #: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
@@ -11579,7 +11356,7 @@ msgstr ""
 "Ne mogu kreirati prozor za sastavljanje:\n"
 "Ne mogu aktivirati komponentu HTML urednika."
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4239
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11668,11 +11445,7 @@ msgid ""
 "receipt when a message you\n"
 "sent is read, and to specify what Evolution should do when someone requests "
 "a receipt from you.</small>"
-msgstr ""
-"<small>Na ovoj stranici možete odabrati želite li dobiti obavijest kada "
-"osoba kojoj šaljete poštu pročita poruku, te\n"
-"odrediti što da Evolution napravi kad netko od vas zatraži potvrdu da ste "
-"pročitali poruku.</small>"
+msgstr "<small>Na ovoj stranici možete odabrati želite li dobiti obavijest kada osoba kojoj šaljete poštu pročita poruku, te\nodrediti što da Evolution napravi kad netko od vas zatraži potvrdu da ste pročitali poruku.</small>"
 
 #: designs/read_receipts/read.glade.h:6
 msgid "Always send back a read reciept"
@@ -11702,10 +11475,9 @@ msgstr "Osim ako je poruka poslata na dopisnu listu, a ne osobno meni"
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
-msgstr ""
-"Kada primite poruku sa zahtjevom za odgovorom, što treba Evolution učiniti? "
+msgstr "Kada primite poruku sa zahtjevom za odgovorom, što treba Evolution učiniti? "
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -11713,15 +11485,15 @@ msgstr ""
 "Datoteka pod tim imenom već postoji.\n"
 "Da je prepišem?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 msgid "Overwrite file?"
 msgstr "Prepiši datoteku?"
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr "Zapamti ovu lozinku"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr "Zapamti ovu zaporku do kraja ove sesije"
 
@@ -11734,25 +11506,29 @@ msgid "Sync Categories:"
 msgstr "Sinkroniziram kategorije:"
 
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
+#.  in 12-hour format, without seconds.
+#.  strftime format of a weekday, a date and a
+#.  time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
+#.  in 24-hour format, without seconds.
+#.  strftime format of a weekday, a date and a
+#.  time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
+#.  in 12-hour format, without minutes or seconds.
 #: e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
+#.  in 24-hour format, without minutes or seconds.
 #: e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
@@ -11768,49 +11544,57 @@ msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
+#.  without seconds.
 #: e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
+#.  without seconds.
 #: e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y. %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
+#.  without minutes or seconds.
 #: e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
+#.  without minutes or seconds.
 #: e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
+#.  strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
+#.  strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
-#. in 12-hour format.
+#.  in 12-hour format.
+#.  strftime format of a time in 12-hour format,
+#.  without seconds.
+#.  This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
+#.  strftime format of a time in 24-hour format,
+#.  without seconds.
+#.  This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11819,123 +11603,117 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:65
+#. plural form
+#: filter/filter-datespec.c:73
+#, , c-format
 msgid "1 second ago"
-msgstr "prije jedne sekunde"
-
-#: filter/filter-datespec.c:65
-#, c-format
-msgid "%d seconds ago"
-msgstr "prije %d sekundi"
-
-#: filter/filter-datespec.c:66
+msgid_plural "%d seconds ago"
+msgstr[0] "prije jedne sekunde"
+msgstr[1] "prije %d sekunde"
+msgstr[2] "prije %d sekundi"
+
+#. plural form
+#: filter/filter-datespec.c:74
+#, , c-format
 msgid "1 minute ago"
-msgstr "prije jedne minute"
-
-#: filter/filter-datespec.c:66
-#, c-format
-msgid "%d minutes ago"
-msgstr "prije %d minuta"
-
-#: filter/filter-datespec.c:67
+msgid_plural "%d minutes ago"
+msgstr[0] "prije jedne minute"
+msgstr[1] "prije %d minute"
+msgstr[2] "prije %d minuta"
+
+#. plural form
+#: filter/filter-datespec.c:75
+#, , c-format
 msgid "1 hour ago"
-msgstr "prije jednog sata"
-
-#: filter/filter-datespec.c:67
-#, c-format
-msgid "%d hours ago"
-msgstr "prije %d sati"
-
-#: filter/filter-datespec.c:68
+msgid_plural "%d hours ago"
+msgstr[0] "prije jednog sata"
+msgstr[1] "prije %d sata"
+msgstr[2] "prije %d sati"
+
+#. plural form
+#: filter/filter-datespec.c:76
+#, , c-format
 msgid "1 day ago"
-msgstr "prije jednog dana"
-
-#: filter/filter-datespec.c:68
-#, c-format
-msgid "%d days ago"
-msgstr "prije %d dana"
-
-#: filter/filter-datespec.c:69
+msgid_plural "%d days ago"
+msgstr[0] "prije jednog dana"
+msgstr[1] "prije %d dana"
+msgstr[2] "prije %d dana"
+
+#. plural form
+#: filter/filter-datespec.c:77
+#, , c-format
 msgid "1 week ago"
-msgstr "prije jednog tjedna"
-
-#: filter/filter-datespec.c:69
-#, c-format
-msgid "%d weeks ago"
-msgstr "prije %d tjedana"
-
-#: filter/filter-datespec.c:70
+msgid_plural "%d weeks ago"
+msgstr[0] "prije jednog tjedna"
+msgstr[1] "prije %d tjedna"
+msgstr[2] "prije %d tjedana"
+
+#. plural form
+#: filter/filter-datespec.c:78
+#, , c-format
 msgid "1 month ago"
-msgstr "prije jednog mjeseca"
-
-#: filter/filter-datespec.c:70
-#, c-format
-msgid "%d months ago"
-msgstr "prije %d mjeseci"
-
-#: filter/filter-datespec.c:71
+msgid_plural "%d months ago"
+msgstr[0] "prije jednog mjeseca"
+msgstr[1] "prije %d mjeseca"
+msgstr[2] "prije %d mjeseci"
+
+#. plural form
+#: filter/filter-datespec.c:79
+#, , c-format
 msgid "1 year ago"
-msgstr "prije jedne godine"
-
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr "prije %d godina"
+msgid_plural "%d years ago"
+msgstr[0] "prije jedne godine"
+msgstr[1] "prije %d godine"
+msgstr[2] "prije %d godina"
 
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 msgid "You must choose a date."
 msgstr "Morate izabrati datum."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<kliknite ovdje za odabir datuma>"
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr "sada"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:285
+#: filter/filter-datespec.c:297
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: filter/filter-datespec.c:406
+#: filter/filter-datespec.c:413
 msgid "Select a time to compare against"
 msgstr "Odaberite ime za usporedbu"
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
-msgstr "Filter pravila"
-
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr "Morate dati ime datoteci."
 
-#: filter/filter-file.c:184
-#, c-format
+#: filter/filter-file.c:185
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Datoteka '%s' ne postoji ili nije regularna."
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 msgid "Choose a file"
 msgstr "Izaberite datoteku"
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
-msgstr "Onda"
+msgid "<b>Then</b>"
+msgstr "<b>Tada</b> "
 
 #: filter/filter-folder.c:153
 msgid "You must specify a folder."
 msgstr "Morate odrediti mapu."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
-#: mail/mail-account-gui.c:1098
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
+#: mail/mail-account-gui.c:1153
 msgid "Select Folder"
 msgstr "Označi mapu"
 
 #: filter/filter-input.c:193
-#, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
@@ -11944,23 +11722,23 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:66
+#: mail/mail-config.c:63 mail/mail-config.glade.h:90
 msgid "Important"
 msgstr "Važno"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "Za napraviti"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "Kasnije"
 
-#: filter/filter-part.c:531 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
@@ -11968,59 +11746,79 @@ msgstr "Test"
 msgid "You must name this filter."
 msgstr "Morate dati ime ovom filteru."
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
+#: filter/filter-rule.c:752
+msgid "Rule name:"
 msgstr "Ime pravila: "
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
 msgstr "Bez naslova"
 
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Ako"
+#: filter/filter-rule.c:779
+msgid "<b>If</b>"
+msgstr "<b>Ako</b> "
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
 msgstr "Izvrši akcije"
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr "ako su svi uvjeti zadovoljeni"
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 msgid "if any criteria are met"
 msgstr "ako je bilo koji uvjet zadovoljen"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr "dolazeći"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr "odlazeći"
 
 #: filter/filter.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: filter/filter.glade.h:2
+msgid "<b>Filter Rules</b>"
+msgstr "<b>Pravila filtera</b>"
+
+#: filter/filter.glade.h:3
+msgid "<b>Virtual _Folders</b>"
+msgstr "<b>Virtualne _mape</b>"
+
+#: filter/filter.glade.h:4
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>Pravila _filtera</b>"
+
+#: filter/filter.glade.h:5
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>vFolder izvori</b>"
+
+#: filter/filter.glade.h:6
 msgid "Compare against"
 msgstr "Usporedi sa"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:7
 msgid "Edit Filters"
 msgstr "Kategorije"
 
-#: filter/filter.glade.h:3
+#: filter/filter.glade.h:8
 msgid "Edit VFolders"
 msgstr "Uređivanje VMapa"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:9
 msgid "Incoming"
 msgstr "Dolazno"
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:10
 msgid "Outgoing"
 msgstr "Odlazeći"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:11
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12028,7 +11826,7 @@ msgstr ""
 "Datum poruke će biti uspoređen sa\n"
 "vremenom u ponoć danog datuma."
 
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:13
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -12036,7 +11834,7 @@ msgstr ""
 "Datum poruke će biti uspoređen sa\n"
 "vremenom kada se filtriranje dogodilo."
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:15
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -12044,59 +11842,51 @@ msgstr ""
 "Datum poruke će biti uspoređen sa\n"
 "trenutnim vremenom kada se filtriranje dogodilo."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr "Virtualni direktoriji"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:18
 msgid "a time relative to the current time"
 msgstr "vrijeme u odnosu na trenutno vrijeme"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:19
 msgid "ago"
 msgstr "prije"
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:23
 msgid "months"
 msgstr "mjeseci"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "sekunde"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "samo određene mape"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:26
 msgid "the current time"
 msgstr "trenutno vrijeme"
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:27
 msgid "the time you specify"
 msgstr "vrijeme koje ste odredili"
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "vFolder izvori"
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:28
 msgid "weeks"
 msgstr "tjedni"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:29
 msgid "with all active remote folders"
 msgstr "sa svim aktivnim mrežnim mapama"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:30
 msgid "with all local and active remote folders"
 msgstr "sa svim lokalnim i aktivnim mrežnim mapama"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:31
 msgid "with all local folders"
 msgstr "sa svim lokalnim mapama"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:32
 msgid "years"
 msgstr "godine"
 
@@ -12199,11 +11989,11 @@ msgstr "je"
 
 #: filter/libfilter-i18n.h:28
 msgid "is after"
-msgstr "Prenosim podatke sa %1$S\r"
+msgstr "Prenosim podatke sa %1$S
+"
 
 #: filter/libfilter-i18n.h:29
 msgid "is before"
-msgstr "Šaljem zahtjev na %1$S\r"
+msgstr "Šaljem zahtjev na %1$S
+"
 
 #: filter/libfilter-i18n.h:30
 msgid "is Flagged"
@@ -12226,11 +12016,10 @@ msgid "is not Flagged"
 msgstr "nije označen"
 
 #: filter/libfilter-i18n.h:36
-#, fuzzy
 msgid "Junk Test"
-msgstr "Lipanj"
+msgstr "Testiranje pošte smeća"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Oznaka"
@@ -12260,8 +12049,8 @@ msgid "Move to Folder"
 msgstr "Premjesti u mapu"
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr "Veži poruku za naredbe ljuske"
+msgid "Pipe to Program"
+msgstr ""
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
@@ -12295,30 +12084,30 @@ msgstr "vraća više od"
 msgid "returns less than"
 msgstr "vraća manje od"
 
-#: filter/libfilter-i18n.h:53 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:53
+msgid "Run Program"
+msgstr ""
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Rezultat"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr "Postavi status"
 
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "Naredba konzole"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Veličina (kB)"
 
 #: filter/libfilter-i18n.h:58
 msgid "sounds like"
-msgstr "zvuči kao\r"
+msgstr "zvuči kao
+"
 
 #: filter/libfilter-i18n.h:59
 msgid "Source Account"
@@ -12336,9 +12125,9 @@ msgstr "počinje sa"
 msgid "Stop Processing"
 msgstr "Prekini sa obradom"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: 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:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1512
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Subjekt"
@@ -12347,17 +12136,12 @@ msgstr "Subjekt"
 msgid "Unset Status"
 msgstr "Nedodeljen status"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
 #: mail/mail-vfolder.c:1007
-#, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Ime pravila '%s' nije jedinstveno, odaberite drugo."
 
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr "Pravila"
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
@@ -12409,11 +12193,11 @@ msgstr "Subjekt ne sadrži"
 msgid "You must name this vfolder."
 msgstr "Morate imenovati ovaj vfolder."
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 msgid "You need to to specify at least one folder as a source."
 msgstr "Morate da odredite najmanje jednu mapu kao izvor."
 
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
 msgid "VFolder source"
 msgstr "VFolder izvor"
 
@@ -12422,8 +12206,7 @@ msgid "Composer Preferences"
 msgstr "Postavke uređivača poruka"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr "Podesite postavke pošte, uključujući sigurnost i prikaz poruka"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -12462,7 +12245,7 @@ msgstr "Preglednik za direktorije Evolucija pošte"
 msgid "Evolution Mail preferences control"
 msgstr "Kontrola osobina Evolucija pošte"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:830
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
@@ -12472,7 +12255,7 @@ msgstr "Pošta"
 msgid "Mail Accounts"
 msgstr "Poštanski račun"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr "Osobine pošte"
 
@@ -12485,45 +12268,44 @@ msgid "Don't delete"
 msgstr "Ne briši"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:445
 msgid "[Default]"
 msgstr "[Predefinirano]"
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:499
 msgid "Account name"
 msgstr "Ime računa"
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:501
 msgid "Protocol"
 msgstr "Protokol"
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:353
+#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:352
 #: mail/mail-config.c:1252
 msgid "Unnamed"
 msgstr "Neimenovano"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:336
 msgid "You must specify a valid script name."
 msgstr "Morate dati ispravno ime skripte."
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
+#: mail/em-composer-prefs.c:394 mail/em-composer-prefs.c:456
 msgid "[script]"
 msgstr "[script]"
 
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:878
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
-#: mail/em-composer-prefs.c:922
+#: mail/em-composer-prefs.c:926
 msgid "Add script signature"
 msgstr "Dodaj potpis skripte"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:946
 msgid "Signature(s)"
 msgstr "Potpis(i)"
 
 #: mail/em-composer-utils.c:124
-#, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
@@ -12546,8 +12328,8 @@ msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
-"Budući da je kontakt lista koju šaljete konfigurirana tako da sakrije "
-"adrese, ova poruka će sadržavati samo skrivene primatelje (Bcc)."
+"Budući da je kontakt lista koju šaljete konfigurirana tako da sakrije adrese, ova poruka "
+"će sadržavati samo skrivene primatelje (Bcc)."
 
 #: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
@@ -12559,8 +12341,8 @@ msgid ""
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
-"Moguće je da poslužitelj za poštu otkrije primatelje dodavanjem Apparently-"
-"To u  zaglavlje.\n"
+"Moguće je da poslužitelj za poštu otkrije primatelje dodavanjem Apparently-To u  "
+"zaglavlje.\n"
 "Treba li svejedno poslati?"
 
 #: mail/em-composer-utils.c:305
@@ -12575,7 +12357,7 @@ msgstr ""
 "Ne mogu otvoriti mapu sa pripremom za ovaj račun.\n"
 "Želite li da koristite predefinisanu mapu sa pripremom?"
 
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:137
 msgid "Create _Virtual Folder From Search..."
 msgstr "Napravi _Virtualnu mapu iz pretrage..."
 
@@ -12605,280 +12387,302 @@ msgstr "Nepročitane poruke"
 msgid "<click here to select a folder>"
 msgstr "<kliknite ovdje za odabir mape>"
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 msgid "Create New Folder"
 msgstr "Napravi novi direktorij"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2217
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Navedite gdje napraviti mapu:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Ime mape:"
 
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VFolder-i"
 
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr "Neupariv"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr "Dolazna pošta"
 
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 msgid "Loading..."
 msgstr "Učitavam..."
 
-#: mail/em-folder-tree.c:831
-#, fuzzy
+#: mail/em-folder-tree.c:874
+#, , c-format
+msgid "Moving folder %s"
+msgstr "Premještam mapu %s"
+
+#: mail/em-folder-tree.c:876
+#, , c-format
+msgid "Copying folder %s"
+msgstr "Kopiram mapu %s"
+
+#: mail/em-folder-tree.c:883
+#, , c-format
+msgid "Moving messages into folder %s"
+msgstr "Premještam poruke u mapu %s"
+
+#: mail/em-folder-tree.c:885
+#, , c-format
+msgid "Copying messages into folder %s"
+msgstr "Kopiram poruke u mapu %s"
+
+#: mail/em-folder-tree.c:901
 msgid "Cannot drop message(s) into toplevel store"
-msgstr "Ne mogu kopirati ili premjestiti poruke u Virtualnu Mapu"
+msgstr "Ne mogu ispustiti poruke u spremište najviše razine"
 
-#: mail/em-folder-tree.c:1798
-#, fuzzy, c-format
+#: mail/em-folder-tree.c:1947
+#, , c-format
 msgid "Cannot move folder `%s': illegal operation"
-msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
+msgstr "Ne mogu premjestiti mapu `%s': nedozvoljena operacija"
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1976 mail/em-folder-tree.c:2152
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1992 mail/em-folder-tree.c:2005
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Izaberite direktorij"
 
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2032
+#, , c-format
+msgid "Creating folder `%s'"
+msgstr "Stvaram mapu \"%s\""
+
+#: mail/em-folder-tree.c:2217 mail/mail-component.c:638
 msgid "Create folder"
 msgstr "Napravi mapu"
 
-#: mail/em-folder-tree.c:2069
-#, c-format
+#: mail/em-folder-tree.c:2336
 msgid "Could not delete folder: %s"
 msgstr "Ne mogu obrisati mapu: %s"
 
-#: mail/em-folder-tree.c:2094
-#, fuzzy, c-format
+#: mail/em-folder-tree.c:2361
+#, , c-format
 msgid "Cannot delete local %s folder."
-msgstr "Ne mogu obrisati mapu: %s: nema takve mape"
+msgstr "Ne mogu obrisati mapu %s."
 
-#: mail/em-folder-tree.c:2100
-#, c-format
+#: mail/em-folder-tree.c:2367
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Treba li doista obrisati mapu \"%s\" i sve njene podmape?"
 
-#: mail/em-folder-tree.c:2110
-#, c-format
+#: mail/em-folder-tree.c:2377
 msgid "Delete \"%s\""
 msgstr "Obriši \"%s\""
 
-#: mail/em-folder-tree.c:2144
-#, fuzzy, c-format
+#: mail/em-folder-tree.c:2411
+#, , c-format
 msgid "Cannot rename local %s folder."
-msgstr "Ne mogu preimenovati mapu: %s: nema takve mape"
+msgstr "Ne mogu preimenovati mapu %s."
 
-#: mail/em-folder-tree.c:2153
-#, c-format
+#: mail/em-folder-tree.c:2420
 msgid "Rename the \"%s\" folder to:"
-msgstr "Preimenuj mapu „%s“ u:"
+msgstr "Preimenuj mapu \"%s\" u:"
 
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2422
 msgid "Rename Folder"
 msgstr "Preimenuj mapu"
 
-#: mail/em-folder-tree.c:2179
-#, c-format
+#: mail/em-folder-tree.c:2446
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Mapa pod imenom \"%s\" već postoji. Molim koristite neko drugo ime."
 
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2492 ui/evolution-addressbook.xml.h:45
 #: 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_ogled"
 
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2493
 msgid "Open in _New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2498
 msgid "_Move"
 msgstr "_Pomakni"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2502
 msgid "_New Folder..."
 msgstr "_Novi direktorij..."
 
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2505
 msgid "_Rename"
 msgstr "_Promijeni ime"
 
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2508 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Postavke..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
 msgstr "_Ispis"
 
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odgovori na _popis"
 
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "_Odgovori svima"
 
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "_Naprijed"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
 msgid "Follo_w Up..."
 msgstr "Pr_ati..."
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 msgid "Fla_g Completed"
 msgstr "Označ_i završene"
 
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
 msgid "Cl_ear Flag"
 msgstr "Ukloni oznaku"
 
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Označi kao pročitano"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 msgid "Mark as _Unread"
 msgstr "Označi kao nepročitano"
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 msgid "Mark as _Important"
 msgstr "Označ_i kao važno"
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 msgid "_Mark as Unimportant"
 msgstr "_Označi kao nebitno "
 
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Označi kao smeće"
 
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Označi da nije smeće"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 msgid "U_ndelete"
 msgstr "_Poništi brisanje"
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 msgid "Mo_ve to Folder..."
 msgstr "_Premjesti u mapu..."
 
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj u mapu..."
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 msgid "Add Sender to Address_book"
 msgstr "Dodaj pošiljaoca u adresa_r"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 msgid "Appl_y Filters"
 msgstr "Pri_mjeni filtere"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+msgid "F_ilter Junk"
+msgstr "F_iltriraj neželjenu poštu"
+
+#: mail/em-folder-view.c:785
 msgid "Crea_te Rule From Message"
 msgstr "Na_pravi pravilo od poruke"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
 msgstr "VFolder na _Naslov"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
 msgstr "VFolder na P_ošiljaoca"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
 msgstr "VFolder na _Primaoce"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 msgid "VFolder on Mailing _List"
 msgstr "VFolder na dopisnu _listu "
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
 msgid "VFolder on Thread"
 msgstr "VFolder na niti"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
 msgstr "Filter na Sub_jekt"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
 msgstr "Filter na P_ošiljatelja"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
 msgstr "Filter na Pri_matelje"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
 msgstr "Filter na _Dopisni popis"
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 msgid "Filter on Thread"
 msgstr "Filtar na niti"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Uobičajeno"
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 msgid "Print Message"
 msgstr "Ispiši poruku"
 
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
 msgid "_Copy Link Location"
 msgstr "_Kopiraj lokaciju veze"
 
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2171
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite za slanje pošte %s"
 
 #. message-search popup match count string
 #: mail/em-format-html-display.c:402
-#, c-format
 msgid "Matches: %d"
 msgstr "Poklapanja: %d"
 
@@ -12887,25 +12691,20 @@ msgid "Unsigned"
 msgstr "Nepotpisano"
 
 #: mail/em-format-html-display.c:638
-#, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
-msgstr ""
-"Ova poruka nije potpisana. Nema jamstva da je pošiljatelj poruke autentičan."
+msgstr "Ova poruka nije potpisana. Nema jamstva da je pošiljatelj poruke istinit."
 
 #: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr "Ispravni potpis"
 
 #: mail/em-format-html-display.c:639
-#, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
-msgstr ""
-"Ova poruka je potpisana i valjana, pošiljatelj je vrlo vjerojatno onaj koji "
-"tvrdi da jest."
+msgstr "Ova poruka je potpisana i valjana, pošiljatelj je vrlo vjerojatno onaj za kojeg se predstavlja."
 
 #: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
@@ -12915,8 +12714,7 @@ msgstr "Neispravni potpis"
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
-msgstr ""
-"Potpis poruke ne može biti provjeren, možda je promijenjen tijekom prijenosa."
+msgstr "Potpis poruke ne može biti provjeren, možda je promijenjen tijekom prijenosa."
 
 #: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
@@ -12926,9 +12724,7 @@ msgstr "Ispravni potpis, ne mogu provjeriti pošiljatelja"
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
-msgstr ""
-"Poruka je potpisana valjanim certifikatom, no posiljaoc moruke se ne može "
-"provjeriti"
+msgstr "Poruka je potpisana valjanim certifikatom, no posiljaoc moruke se ne može provjeriti"
 
 #: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
@@ -12938,9 +12734,7 @@ msgstr "Nekriptirano"
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
-msgstr ""
-"Ova poruka nije kriptirana. Njezin sadržaj može biti vidljiv dok putuje "
-"internetom."
+msgstr "Ova poruka nije kriptirana. Njezin sadržaj može biti vidljiv dok putuje internetom."
 
 #: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
@@ -12951,10 +12745,7 @@ msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
-msgstr ""
-"Ova poruka je kriptirana, ali sa slabim enkripcijskim algoritmom. Bilo bi "
-"teško, ali ne i nemoguće stranoj osobi vidjeti sadržaj poruke u razumno "
-"kratkom vremenu."
+msgstr "Ova poruka je kriptirana, ali sa slabim enkripcijskim algoritmom. Bilo bi teško, ali ne i nemoguće stranoj osobi vidjeti sadržaj poruke u razumno kratkom vremenu."
 
 #: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
@@ -12964,8 +12755,7 @@ msgstr "Šifrirano"
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
-msgstr ""
-"Ova poruka je kriptirana. Bilo bi teško stranoj osobi vidjeti sadržaj poruke."
+msgstr "Ova poruka je kriptirana. Bilo bi teško stranoj osobi vidjeti sadržaj poruke."
 
 #: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
@@ -12976,9 +12766,7 @@ msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
-msgstr ""
-"Ova poruka je kriptirana jakim enkripcijskim algoritmom. Bilo bi vrlo teško "
-"stranoj osobi vidjeti sadržaj poruke u razumno kratkom vremenu."
+msgstr "Ova poruka je kriptirana jakim enkripcijskim algoritmom. Bilo bi vrlo teško stranoj osobi vidjeti sadržaj poruke u razumno kratkom vremenu."
 
 #: mail/em-format-html-display.c:734
 msgid "_View Certificate"
@@ -12988,33 +12776,31 @@ msgstr "Po_gledaj certifikat"
 msgid "This certificate is not viewable"
 msgstr "Ovaj potvrda nije vidljiva"
 
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:972
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Završeno na %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:980
 msgid "Overdue:"
 msgstr "Prekoračeno:"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:983
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "do %d. %B, %Y. %k:%M %p"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1053
 msgid "_View Inline"
 msgstr "_Pogledaj unutar"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1054
 msgid "_Hide"
 msgstr "_Sakrij"
 
 #: mail/em-format-html-print.c:125
-#, c-format
 msgid "Page %d of %d"
 msgstr "Strana %d od %d"
 
 #: mail/em-format-html.c:455 mail/em-format-html.c:457
-#, c-format
 msgid "Retrieving `%s'"
 msgstr "Dohvaćanje `%s'"
 
@@ -13023,114 +12809,140 @@ msgid "Malformed external-body part."
 msgstr "Neispravan vanjski dio poruke."
 
 #: mail/em-format-html.c:842
-#, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pokazivač na FTP adresu (%s)"
 
 #: mail/em-format-html.c:853
-#, 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:855
-#, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pokazivač na lokalnu datoteku (%s)"
 
 #: mail/em-format-html.c:876
-#, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pokazivač na mrežne podatke (%s) "
 
 #: mail/em-format-html.c:887
-#, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pokazivač na nepoznati vanjski podatak (\"%s\" tipa) "
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1129
 msgid "Formatting message"
 msgstr "Formatiranje poruke"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:742
+#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:743
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
+#: mail/message-tag-followup.c:304
 msgid "From"
 msgstr "Od"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:744
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Odgovor-Za"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:744
+#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:745
 #: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Prima"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:745
+#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:746
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Cc (kopija)"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:747
 #: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc (nevidljiva kopija)"
 
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1516 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:769
 msgid "Mailer"
 msgstr "Program e-pošte"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1543
 msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
+msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1546
 msgid "<I> (%R %Z)</I>"
-msgstr ""
+msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1556 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/em-format.c:963
+#: mail/em-format-html.c:1577 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+msgid "Newsgroups"
+msgstr "Interesne grupe"
+
+#: mail/em-format.c:987
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
 
-#: mail/em-format.c:1042 mail/em-format.c:1161
+#: mail/em-format.c:1066 mail/em-format.c:1188
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Ne mogu parsirati S/MIME poruku: Nepoznata greška"
 
-#: mail/em-format.c:1151
+#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
+#: mail/em-format.c:1223
+#, , c-format
+msgid "Internal error: expecting CamelMultipart, got \"%s\""
+msgstr "Interna greška:  očekivao sam CamelMultipart, a dobio sam  \"%s\""
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
+msgstr "Nepodržano šifriranje za višedjelno/šifrirano"
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nisam mogao obraditi MIME poruku. Pokazujem kao izvor."
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 msgid "Unsupported signature format"
 msgstr "Nepodržani format potpisa"
 
-#: mail/em-format.c:1324
-#, fuzzy
+#: mail/em-format.c:1352
 msgid "Error verifying signature"
-msgstr "Nepoznata greška pri provjeri potpisa"
+msgstr "Greška pri provjeri potpisa"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 msgid "Unknown error verifying signature"
 msgstr "Nepoznata greška pri provjeri potpisa"
 
+#: mail/em-format.c:1372
+#, , c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr "Interna greška: očekivao sam CamelMimeMessage, a dobio sam  \"%s\""
+
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (ugrađeni)"
 
+#: mail/em-mailer-prefs.c:85
+msgid "Every time"
+msgstr "Uvijek"
+
+#: mail/em-mailer-prefs.c:86
+msgid "Once per day"
+msgstr "Jednom dnevno"
+
+#: mail/em-mailer-prefs.c:87
+msgid "Once per week"
+msgstr "Tjedno"
+
+#: mail/em-mailer-prefs.c:88
+msgid "Once per month"
+msgstr "Mjesečno"
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13138,8 +12950,7 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Lokacija hijerarhije Evolution mape kontakata se promijenila od inačice "
-"Evolutiona 1.x.\n"
+"Lokacija hijerarhije Evolution mape kontakata se promijenila od inačice Evolutiona 1.x.\n"
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
@@ -13149,17 +12960,15 @@ msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Nije uspjela migracija pop3 uid međuspremnika: %s"
 
 #: mail/em-migrate.c:1946 mail/em-migrate.c:2047
-#, fuzzy, c-format
+#, , c-format
 msgid "Failed to migrate folder expand state: %s"
-msgstr "Neuspjelo stvaranje veze ka '%s': %s"
+msgstr "Neuspjelo migriranje proširenog stanja mape: %s"
 
 #: mail/em-migrate.c:2171 mail/em-migrate.c:2343
-#, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Nije uspjelo stvaranje direktorija `%s': %s"
 
 #: mail/em-migrate.c:2183
-#, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Nisam uspio otvoriti spremište za `%s': %s"
 
@@ -13168,7 +12977,6 @@ msgid "Save As..."
 msgstr "Snimi kao..."
 
 #: mail/em-popup.c:716
-#, c-format
 msgid "untitled_image.%s"
 msgstr "nenaslovljena_slika.%s"
 
@@ -13193,13 +13001,12 @@ msgid "_Add to Addressbook"
 msgstr "_Dodaj u adresar"
 
 #: mail/em-popup.c:963
-#, c-format
 msgid "Open in %s..."
 msgstr "Otvori u %s..."
 
 #: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
-msgstr ""
+msgstr "Ova lokacija ne podržava pretplate ili nije omgućena"
 
 #: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
@@ -13210,11 +13017,11 @@ msgid "Folder"
 msgstr "Mapa"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:827
+#: mail/em-subscribe-editor.c:831
 msgid "Please select a server."
 msgstr "Molim odaberite server."
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:852
 msgid "No server has been selected"
 msgstr "Nije odabran poslužitelj"
 
@@ -13223,7 +13030,6 @@ msgid "Don't show this message again."
 msgstr "Ne pokazuj ponovno ovu poruku."
 
 #: mail/em-utils.c:279
-#, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
@@ -13244,13 +13050,12 @@ msgid "an unknown sender"
 msgstr "nepoznati pošiljatelj"
 
 #. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
+#.  it must contain a single single %%+05d followed by a single '%%s'
 #: mail/em-utils.c:1149
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Na %a, %Y-%m-%d u %H:%M %%+05d, %%s napisao:"
 
-#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
-#, c-format
+#: mail/em-utils.c:1432 mail/em-utils.c:1516 mail/em-utils.c:1525
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
@@ -13258,8 +13063,7 @@ msgstr ""
 "Ne mogu spremiti u `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1431
-#, c-format
+#: mail/em-utils.c:1437
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
@@ -13267,56 +13071,52 @@ msgstr ""
 "`%s' već postoji.\n"
 "Prepisati?"
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1480
 msgid "message"
 msgstr "cedulja"
 
-#: mail/em-utils.c:1526
-#, c-format
+#: mail/em-utils.c:1532
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Greška: '%s' postoji i nije obična datoteka"
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1586
 msgid "Save Message..."
 msgstr "Spremi poruku..."
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1635
 msgid "Add address"
 msgstr "Dodaj adresu"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
-#, fuzzy, c-format
+#: mail/em-utils.c:2070
+#, , c-format
 msgid "Messages from %s"
-msgstr "Pošta od %s"
+msgstr "Poruke od %s"
 
-#: mail/em-utils.c:2103
-#, c-format
+#: mail/em-utils.c:2121
 msgid "Could not create temporary directory: %s"
 msgstr "Nisam mogao napraviti privremeni direktorij: %s"
 
-#: mail/em-utils.c:2434
-#, c-format
+#: mail/em-utils.c:2452
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
 "s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
-"Ova operacija će trajno ukloniti sve obrisane poruke u mapi `%s'. Ako "
-"nastavite, nećete moći vratiti navedene poruke.\n"
+"Ova operacija će trajno ukloniti sve obrisane poruke u mapi `%"
+"s'. Ako nastavite, nećete moći vratiti navedene poruke.\n"
 "\n"
 "Dali stvarno želite obrisati ove poruke?"
 
-#: mail/em-utils.c:2459
+#: mail/em-utils.c:2477
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
-"Ova operacija će trajno ukloniti sve obrisane poruke u svim mapama. Ako "
-"nastavite, nećete moći vratiti navedene poruke.\n"
+"Ova operacija će trajno ukloniti sve obrisane poruke u svim mapama. Ako nastavite, nećete moći vratiti navedene poruke.\n"
 "\n"
 "Dali stvarno želite obrisati ove poruke?"
 
@@ -13342,11 +13142,11 @@ msgstr "Boja isticanja citata."
 
 #: mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
-msgstr ""
+msgstr "Visina prozora za pisanje poruke"
 
 #: mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
-msgstr ""
+msgstr "Širina prozora za pisanje poruke"
 
 #: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
@@ -13369,28 +13169,24 @@ msgid "Default forward style"
 msgstr "Uobičajeni način proslijeđivanja"
 
 #: mail/evolution-mail.schemas.in.in.h:13
-#, fuzzy
 msgid "Default height of the Composer Window"
-msgstr "Predefinirani naslov poruke."
+msgstr "Uobičajena visina prozora Composera"
 
 #: mail/evolution-mail.schemas.in.in.h:14
-#, fuzzy
 msgid "Default height of the Message Window"
-msgstr "Predefinirani naslov poruke."
+msgstr "Uobičajena visina prozora za poruke"
 
 #: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "Uobičajeni način odgovaranja"
 
 #: mail/evolution-mail.schemas.in.in.h:16
-#, fuzzy
 msgid "Default width of the Composer Window"
-msgstr "Uobičajena širina za ploču trake mapa"
+msgstr "Uobičajena širina prozora Composera"
 
 #: mail/evolution-mail.schemas.in.in.h:17
-#, fuzzy
 msgid "Default width of the Message Window"
-msgstr "Uobičajena širina za ploču trake mapa"
+msgstr "Uobičajena širina prozora za poruke"
 
 #: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
@@ -13406,8 +13202,7 @@ msgstr "Ispražnjavanje mapa sa smećem prilikom izlaska iz Evolutiona."
 
 #: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
-"Omogući caret način rada, tako da se vidi pokazivač prilikom čitanja pošte."
+msgstr "Omogući caret način rada, tako da se vidi pokazivač prilikom čitanja pošte."
 
 #: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
@@ -13427,339 +13222,357 @@ msgid ""
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
-"Ako postoji ugrađeni preglednik za određeni mime-tip unutar Evolutiona,svi "
-"mime-tipovi koji su prikazani u popisu a odgovaraju bonobo-component "
+"Ako postoji ugrađeni preglednik za određeni mime-tip unutar Evolutiona,"
+"svi mime-tipovi koji su prikazani u popisu a odgovaraju bonobo-component "
 "pregledniku u GNOME mime-tip bazi mogu se koristiti za pregled sadržaja."
 
 #: mail/evolution-mail.schemas.in.in.h:26
+msgid "Last time empty trash was run"
+msgstr "Zadnji put je bio pokrenut prazni koš za smeće"
+
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of Labels and their associated colours"
 msgstr "Izlistavanje oznaka i njima pridruženih boja"
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid "List of accounts"
 msgstr "Popis korisničkih računa"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
-"Popis korisničkih računa poznat komponenti za e-poštu Evolutiona. Popis "
-"sadrži znakovne nizove s imenima poddirektorija relativnih s /apps/evolution/"
-"mail/accounts."
+"Popis korisničkih računa poznat komponenti za e-poštu Evolutiona. "
+"Popis sadrži znakovne nizove s imenima poddirektorija relativnih s"
+" /apps/evolution/mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of custom headers and whether they are enabled."
 msgstr "Popis prilagođenih zaglavlja i da li su oni omogućeni."
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:31
 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."
 msgstr ""
-"Popis korisničkih računa poznat komponenti za e-poštu Evolutiona. Popis "
-"sadrži znakovne nizove u obliku ime:boja gdje boja koristi HTML heks "
-"kodiranje."
+"Popis korisničkih računa poznat komponenti za e-poštu Evolutiona. "
+"Popis sadrži znakovne nizove u obliku ime:boja gdje boja koristi HTML "
+"heks kodiranje."
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Popis mime tipova koji traže bonobo preglednike komponenata"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "Load images for HTML messages over http"
 msgstr "Učitavanje slika za HTML poruke preko http-a"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
 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 - "
 "Always load images off the net"
 msgstr ""
-"Učitavanje slika za HTML poruke preko http-a. Moguće vrijednosti su: 0 - "
-"Nikad ne učitavaj slike s mreže 1 - Učitavaj slike ako je pošiljatelj u "
-"adresaru 2 - Uvijek učitavaj slike s mreže"
+"Učitavanje slika za HTML poruke preko http-a. Moguće vrijednosti su: 0 - Nikad ne "
+"učitavaj slike s mreže 1 - Učitavaj slike ako je pošiljatelj u adresaru 2 - Uvijek "
+"učitavaj slike s mreže"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions"
 msgstr "Logiranje akcija filtra"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Log filter actions to the specified log file."
 msgstr "Logiranje akcija filtra u navedenu log datoteku."
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions"
 msgstr "Logiranje akcija filtra"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Logfile to log filter actions."
 msgstr "Logiranje akcija filtra."
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout"
 msgstr "Označi kao pregledano nakon određenog vremena"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark as Seen after specified timeout."
 msgstr "Označi kao pregledano nakon određenog vremena."
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označivanje citata u pregledu poruke"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označivanje citata u pregledu poruke."
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default hight"
-msgstr ""
+msgstr "Visina prozora poruke"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message Window default width"
-msgstr ""
+msgstr "Širina prozora poruke"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Stil prikaza poruke (normalno, puna zaglavlja, kod)"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Minimum days between emptying the trash on exit"
+msgstr "Najmanji broj dana između pražnjenja koša za smeće"
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr "Najmanji broj dana između pražnjenja koša za smeće kod izlaska iz programa."
+
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "New Mail Notify sound file"
 msgstr "Zvučna datoteka za obavijest o novopristigloj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "New Mail Notify type"
 msgstr "Nova vrsta obavijesti o pristigloj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt on empty subject"
 msgstr "Iskoči u slučaju praznog naslova"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Upitaj korisnika kada pokuša obrisati mapu."
 
-#: mail/evolution-mail.schemas.in.in.h:49
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: mail/evolution-mail.schemas.in.in.h:52
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Upitaj korisnika kada pokuša poslati poruku bez naslova."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt when user expunges"
 msgstr "Upitaj korisnika prilikom brisanja"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user only fills Bcc"
 msgstr "Upitaj kada korisnik popuni samo Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
-"Upitaj kada korisnik pokuša poslati HTML poštu primateljima koji možda ne "
-"žele primati HTML poštu."
+"Upitaj kada korisnik pokuša poslati HTML poštu primateljima koji možda ne žele "
+"primati HTML poštu."
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Upitaj kada korisnik pokuša poslati poruku bez To ili Cc primatelja."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Upitaj kada korisnik pokuša poslati neželjeni HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Recognize links in text and replace them."
 msgstr "Prepoznaj veze u tekstu i zamijeni ih."
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Prepoznaj smješke u tekstu i zamijeni ih slikama."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Run junk test on incoming mail"
 msgstr "Pokreni testiranje na smeće na dolaznoj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "S3kr3t 0pt10n"
 msgstr "S3kr3t 0pt10n"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "S3kr3t 0pt10n."
 msgstr "S3kr3t 0pt10n."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Send HTML mail by default"
 msgstr "Pošalji poštu formatiranu kao HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Send HTML mail by default."
 msgstr "Pošalji poštu formatiranu kao HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show Animations"
 msgstr "Prikaži animacije"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show animated images as animations."
 msgstr "Prikaži animirane slike kao animacije"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Prikaži obrisane poruke (precrtane) u listi poruka"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show deleted messages in the message-list"
 msgstr "Prikaži obrisane poruke u listi poruka"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show the \"Preview\" pane"
 msgstr "Prikaži karticu \"Pregled\""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show the \"Preview\" pane."
 msgstr "Prikaži karticu \"Pregled\""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Sound file to play when new mail arrives."
 msgstr "Zvučna datoteka koju treba odsvirati pri pristizanju nove pošte."
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Određuje tip notifikacije o novoj pošti koju korisnik želi koristiti."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Spell check inline"
 msgstr "Provjera pravopisa na licu mjesta"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Terminal font"
 msgstr "Pismo terminala"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr "Zadnji put kada je program koša za smeće bio pokrenut, u danima od pokretanja sustava."
+
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "The terminal font for mail display"
 msgstr "Pismo terminala za prikaz pošte"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "The variable width font for mail display"
 msgstr "Pismo varijabilne širine za prikaz pošte"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 msgstr ""
+"Ovo treba sadržavati listu XML struktura određujući korisnička zaglavlja "
+"i sve što treba biti prikazano. Format XML strukture je &lt;"
+"header enabled&gt; - uključi ako zaglavlje treba biti prikazano u prikazu "
+"pošte."
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Thread the message list."
 msgstr "Prikaži listu poruka u obliku niti."
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "Thread the message-list"
 msgstr "Prikaži listu poruka u obliku niti."
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Thread the message-list based on Subject"
 msgstr "Prikaži listu poruka u obliku niti na temelju naslova"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Timeout for marking message as Seen"
 msgstr "Vremensko ograničenje poruke obilježene kao viđene"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Timeout for marking message as Seen."
 msgstr "Vremensko ograničenje poruke obilježene kao viđene"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "UID string of the default account."
 msgstr "UID string predefinirang korisničkog računa"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use Spamasssassin daemon and client"
 msgstr "Koristi Spamassassin daemon i klijent"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Koristi Spamassassin daemon i klijent (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Use custom fonts"
 msgstr "Koristi prilagođena pisma"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "Use custom fonts for displaying mail"
 msgstr "Koristi prilagođena pisma za prikaz pošte"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use only local spam tests."
 msgstr "Koristi samo lokalne testove za spam."
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Koristi samo lokalne testove za spam (bez DNS-a)."
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Variable width font"
 msgstr "Font promjenljive širine"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/Bcc menu item is checked"
 msgstr "Pogled/Bcc stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/Bcc menu item is checked."
 msgstr "Pogled/Bcc stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/Cc menu item is checked"
 msgstr "Pogled/Cc stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/Cc menu item is checked."
 msgstr "Pogled/Cc stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/From menu item is checked"
 msgstr "Pogled/Od stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/From menu item is checked."
 msgstr "Pogled/Od stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/PostTo menu item is checked"
 msgstr "Pogled/Za stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/PostTo menu item is checked."
 msgstr "Pogled/Za stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/ReplyTo menu item is checked"
 msgstr "Pogled/OdgovoriNa stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/ReplyTo menu item is checked."
 msgstr "Pogled/OdgovoriNa stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
-"Treba li se prebaciti na nizanje po subjektu kada poruka ne sadrži In-Reply-"
-"To ili References zaglavlja."
+"Treba li se prebaciti na nizanje po subjektu kada poruka ne sadrži "
+"In-Reply-To ili References zaglavlja."
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "port for starting user runned spamd"
-msgstr ""
+msgstr "veza za pokretanje korisnički pokrenutim spamd"
 
-#: mail/evolution-mail.schemas.in.in.h:100
-#, fuzzy
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "spamd port"
-msgstr "Uvoz"
+msgstr "spamd port"
 
 #: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
@@ -13808,9 +13621,8 @@ msgid "Please wait"
 msgstr "Molim pričekajte"
 
 #: mail/importers/elm-importer.c:244
-#, fuzzy
 msgid "Importing Elm data"
-msgstr "Uvoz datoteka"
+msgstr "Uvoz elm podataka"
 
 #: mail/importers/elm-importer.c:436
 msgid ""
@@ -13825,35 +13637,30 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
-#, fuzzy
 msgid "Destination folder:"
-msgstr "M_apa sa skicama:"
+msgstr "Odredišni direktorij:"
 
 #: mail/importers/evolution-mbox-importer.c:119
-#, fuzzy
 msgid "Select folder to import into"
-msgstr "Izaberi certifikat za uvoz"
+msgstr "Izaberite mapu za uvoz u"
 
 #: mail/importers/evolution-mbox-importer.c:219
 #: mail/importers/evolution-outlook-importer.c:224
 #: mail/importers/mail-importer.c:220
-#, fuzzy, c-format
+#, , c-format
 msgid "Importing `%s'"
-msgstr "Uvoz"
+msgstr "Uvoz `%s'"
 
 #: mail/importers/evolution-outlook-importer.c:271
 #: mail/importers/mail-importer.c:134
-#, fuzzy
 msgid "Importing mailbox"
-msgstr "Uvoz datoteka"
+msgstr "Uvoz sandučića"
 
 #: mail/importers/mail-importer.c:354
-#, c-format
 msgid "Scanning %s"
 msgstr "Pretražujem %s"
 
 #: mail/importers/netscape-importer.c:72
-#, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetni filter \"%s\""
 
@@ -13914,9 +13721,8 @@ msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution uvozi vaše stare Netscape podatke"
 
 #: mail/importers/netscape-importer.c:1677
-#, fuzzy
 msgid "Importing Netscape data"
-msgstr "Evolution uvozi vaše stare Netscape podatke"
+msgstr "Uvoz Netscape podataka"
 
 #: mail/importers/netscape-importer.c:1877
 msgid "Settings"
@@ -13939,9 +13745,8 @@ msgid "Evolution is importing your old Pine data"
 msgstr "Evolution uvozi vaše stare Pine podatke"
 
 #: mail/importers/pine-importer.c:313
-#, fuzzy
 msgid "Importing Pine data"
-msgstr "Uvoz datoteka"
+msgstr "Uvoz Pine podataka"
 
 #: mail/importers/pine-importer.c:478
 msgid "Addressbook"
@@ -13957,89 +13762,50 @@ msgstr ""
 
 #: mail/importers/pine-importer.c:505
 msgid "Pine"
-msgstr "Vino"
-
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Trenutni format spremanja:"
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr "Sadržaj tijela indeksa"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Novi format pohrane:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"Napomena: Kada prebacujete između formata sandućića, neuspjeh\n"
-"(kao što je nedostatak prostora na disku) možda neće biti\n"
-"moguće automatski opraviti. Molim oprezno koristite ovo svojstvo."
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
+msgstr "Pine"
 
 #: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
 msgstr "Niste unijeli sve potrebne podatke."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:140
+#: mail/mail-account-editor.c:145
 msgid "Evolution Account Editor"
 msgstr "Urednik Evolution računa"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Računalo:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Korisničko ime:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:804 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Putanja:"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2086
 msgid "You may not create two accounts with the same name."
 msgstr "Ne možete otvoriti dva naloga sa istim imenom."
 
 #: mail/mail-autofilter.c:75
-#, c-format
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
 #: mail/mail-autofilter.c:261
-#, c-format
 msgid "Subject is %s"
 msgstr "Subjekt je %s"
 
 #: mail/mail-autofilter.c:277
-#, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
 #: mail/mail-autofilter.c:294
-#, c-format
 msgid "%s mailing list"
 msgstr "%s dopisna lista"
 
 #: mail/mail-autofilter.c:318
-#, c-format
 msgid "Replies to %s"
 msgstr "Odgovara na %s"
 
@@ -14052,7 +13818,6 @@ msgid "The following filter rule(s):\n"
 msgstr "Sljedeća pravila filtera:\n"
 
 #: mail/mail-autofilter.c:428
-#, c-format
 msgid ""
 "Used the removed folder:\n"
 "    '%s'\n"
@@ -14062,42 +13827,39 @@ msgstr ""
 "    '%s'\n"
 "I osvježen sadržaj."
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr ""
+msgstr "Imate neposlane poruke, želite li svejedno izaći?"
 
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
 msgid "New Mail Message"
 msgstr "Nova poruka poštom"
 
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
-#: mail/mail-component.c:553
-#, fuzzy
+#: mail/mail-component.c:594
 msgid "New Mail Folder"
-msgstr "New VFolder"
+msgstr "Nova mapa za poštu"
 
-#: mail/mail-component.c:554
-#, fuzzy
+#: mail/mail-component.c:595
 msgid "Mail _Folder"
-msgstr "Filteri pošte"
+msgstr "_Mapa pošte"
 
-#: mail/mail-component.c:555
-#, fuzzy
+#: mail/mail-component.c:596
 msgid "Create a new mail folder"
-msgstr "Kreiraj novi kalendar"
+msgstr "Stvori novu mapu e-pošte"
 
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
 msgid "URI of the mail source that the view will display"
 msgstr "URI poruke koju će pogled pokazati"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identitet"
 
@@ -14106,12 +13868,10 @@ msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
-msgstr ""
-"Molim unesite dolje vaše ime i adresu e-pošte. \"Opcionalna\" polja dolje ne "
-"moraju biti popunjena, osim ako ne želite ove podatke uključiti u poruke "
-"koje šaljete."
+msgstr "Molim unesite dolje vaše ime i adresu e-pošte. \"Opcionalna\" polja dolje ne moraju biti popunjena, osim ako ne želite ove podatke uključiti u poruke koje šaljete."
 
 #: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Primanje pošte"
 
@@ -14127,7 +13887,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Molim odaberite neku od slijedećih opcija"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:387 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Slanje pošte"
 
@@ -14135,11 +13895,9 @@ msgstr "Slanje pošte"
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Molim unesite podatke o načinu na koji želite slati poštu. Ako niste "
-"sigurni, pitajte sustav administratora ili davatelja Internet usluga."
+msgstr "Molim unesite podatke o načinu na koji želite slati poštu. Ako niste sigurni, pitajte sustav administratora ili davatelja Internet usluga."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Upravljanje računima"
 
@@ -14152,10 +13910,9 @@ msgid ""
 "purposes only."
 msgstr ""
 "Skoro ste završili sa procesom podešavanja pošte. Identitet, dolazeći server "
-"za poštu i odlazeći način koji ste unijeli biti će grupirani zajedno za "
-"izradu Evolution korisničkog računa.Molim unesite dolje ime za ovaj "
-"korisnički račun. Ime će biti korištenosamo za potrebe prikazivanja na "
-"zaslonu."
+"za poštu i odlazeći način koji ste unijeli biti će grupirani zajedno za izradu Evolution korisničkog računa."
+"Molim unesite dolje ime za ovaj korisnički račun. Ime će biti korišteno"
+"samo za potrebe prikazivanja na zaslonu."
 
 #: mail/mail-config.c:1092
 msgid "Checking Service"
@@ -14163,117 +13920,229 @@ msgstr "Provjeravam servis"
 
 #: mail/mail-config.c:1170 mail/mail-config.c:1174
 msgid "Connecting to server..."
-msgstr "Spajam se na server...\r"
+msgstr "Spajam se na server...
+"
+
+#: mail/mail-config.glade.h:1
+msgid " Ch_eck for Supported Types "
+msgstr ""
 
 #: mail/mail-config.glade.h:3
-msgid " _Check for supported types "
-msgstr "Pr_ovjeravam podržane tipove "
+msgid "<b>Preview</b>"
+msgstr "<b>Pregled</b>"
 
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
-msgstr "(SSL nije podržan u ovoj inačici Evolutiona) "
+msgid "<b>SSL is not supported in this build of evolution</b>"
+msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(SSL nije podržan u ovoj inačici Evolutiona) "
+msgid "<b>S_ignatures</b>"
+msgstr ""
+
+#: mail/mail-config.glade.h:6
+msgid "<b>_Languages</b>"
+msgstr ""
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
-msgstr "<b>Prikazana zaglavlja e-pošte</b>"
+msgid "<span weight=\"bold\">Account Information</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:8
-msgid "A_lso encrypt to self when sending encrypted mail"
-msgstr "A_lso kriptiranje sebi prilikom slanja kriptirane pošte"
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
-msgstr "Urednik računa"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "Informacije o računu"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
-msgstr "Dodaj sk_riptu"
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
-msgstr "Dodaj novi potpis..."
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "Uvij_ek šifriraj na mene kod slanja šifrirane pošte"
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr "Uvijek pošalji _skrivenu kopiju (Bcc) na:"
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "Uvijek pošalji _kopiju (Cc) na:"
+msgid "<span weight=\"bold\">General</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:19
+msgid "<span weight=\"bold\">Labels and Colors</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+msgid "<span weight=\"bold\">Loading Images</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:22
+msgid "<span weight=\"bold\">Message Fonts</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:23
+msgid "<span weight=\"bold\">New Mail Notification</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:24
+msgid "<span weight=\"bold\">Optional Information</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "<span weight=\"bold\">Options</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Printed Fonts</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:28
+msgid "<span weight=\"bold\">Required Information</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
+msgid "<span weight=\"bold\">Security</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:31
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+msgid "A_lso encrypt to self when sending encrypted mail"
+msgstr "A_lso kriptiranje sebi prilikom slanja kriptirane pošte"
+
+#: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Urednik računa"
+
+#: mail/mail-config.glade.h:36
+msgid "Add Ne_w Signature..."
+msgstr ""
+
+#: mail/mail-config.glade.h:37
+msgid "Add _Script"
+msgstr ""
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "Uvij_ek šifriraj na mene kod slanja šifrirane pošte"
+
+#: mail/mail-config.glade.h:39
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:41
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+msgid "Always _sign outgoing messages when using this account"
+msgstr ""
+
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Uvijek _vjeruj ključevima u mojoj vezi kada šifriraš"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Pridruži izvornu poruku"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Privitak"
 
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Provjera vjerodostojnosti"
+#: mail/mail-config.glade.h:46
+msgid "Automatically _insert smiley images"
+msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+msgid "Automatically check for _new mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltički (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltički (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+msgid "Beep w_hen new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "C_haracter set:"
 msgstr "Kodna stranica:"
 
-#: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "_Boje"
+#: mail/mail-config.glade.h:52
+msgid "Ch_eck for Supported Types "
+msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 msgid "Check _Incoming Mail"
 msgstr "Provjera _dolazne pošte"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr "Provjeri pravopis dok kucam"
 
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "Provjera za novu poštu"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Provjera _dolazne pošte koja je prepoznata kao smeće"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "Boja pogrešno napisanih riječi:"
 
-#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "Sastavljanje poruka"
+#: mail/mail-config.glade.h:57
+msgid "Colors"
+msgstr ""
 
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "Podesiti izvor?"
+#: mail/mail-config.glade.h:58
+msgid "Confirm _when expunging a folder"
+msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14289,274 +14158,241 @@ msgstr ""
 "\n"
 "Pritisnite \"Primjeni\" da sačuvate podešavanja."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "_Uobičajeno"
 
-#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr "Predefinirano ponašanje"
-
-#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
-msgstr "Predefenirana kodna _strana"
-
-#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr "Brisanje pošte"
+#: mail/mail-config.glade.h:67
+msgid "Default character e_ncoding:"
+msgstr ""
 
-#: mail/mail-config.glade.h:46
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "Digitalno _potpisivanje izlaznih poruka (uobičajeno)"
+#: mail/mail-config.glade.h:68
+msgid "Defaults"
+msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "Ne citiraj originalnu poruku"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ne potpisuj zahtjeve za s_astancima (za kompatibilnost sa Outlook-om)"
 
-#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Gotovo"
 
-#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
-msgstr "M_apa sa skicama:"
+#: mail/mail-config.glade.h:73
+msgid "Drafts _Folder:"
+msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Korisnički računi za e-mail"
 
-#: mail/mail-config.glade.h:53
-msgid "Email _address:"
-msgstr "_Poštanska adresa"
+#: mail/mail-config.glade.h:76
+msgid "Email _Address:"
+msgstr ""
 
-#: mail/mail-config.glade.h:54
-msgid "Empty _trash folders on exit"
-msgstr "Isprazni mape sa smećem pri izlazu"
+#: mail/mail-config.glade.h:77
+msgid "Empty trash folders on e_xit"
+msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "_Potvrda kriptiranja:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Pomoćnik Evolution računa"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "Izvrši zapovijed..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 msgid "Fi_xed -width:"
 msgstr "Fik_sirana -širina:"
 
-#: mail/mail-config.glade.h:59
-msgid "Filter Options"
-msgstr "Mogućnosti filtra"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Osobine pisma"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "Formatiranje poruka u H_TML-u"
 
-#: mail/mail-config.glade.h:62
-msgid "H_eaders"
-msgstr "_Zaglavlja"
+#: mail/mail-config.glade.h:85
+msgid "HTML Mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:86
+msgid "Headers"
+msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "Naglasi _citate sa"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:88
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:91
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:93
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:69
-msgid "Labels and Colors"
-msgstr "Etikete i boje"
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr "Učitavanje slika"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Podešavanje pošte"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Lokacija sandučića"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Sastavljač poruke"
 
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr "Prikaz poruka"
-
-#: mail/mail-config.glade.h:77
-msgid "Message Fonts"
-msgstr "Pisma poruke"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr "&Obavijest o novim porukama"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:101
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Napomena: biti ćete upitani za lozinku dok se ne spojite prvi put"
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "Opcionalne informacije"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "_Organizacija:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG osobna karta _ključa:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Odabir boje"
 
-#: mail/mail-config.glade.h:90
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+#: mail/mail-config.glade.h:108
+msgid "Play sound file when new mail arri_ves"
 msgstr ""
-"Up_ozori prilikom slanja poruke kod koje su definirani samo Bcc primatelji"
-
-#: mail/mail-config.glade.h:91
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:92
-msgid "Printed Fonts"
-msgstr "Ispisana pisma "
+#: mail/mail-config.glade.h:109
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr "Up_ozori prilikom slanja poruke kod koje su definirani samo Bcc primatelji"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:110
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:111
 msgid "Quote original message"
 msgstr "Citiraj originalnu poruku"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr "kao citate"
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr "_Zapamti ovu lozinku"
+#: mail/mail-config.glade.h:113
+msgid "Re_member password"
+msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 msgid "Re_ply-To:"
 msgstr "_Odgovor na:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "Primanje pošte"
 
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
-msgstr "_Opcije za primanje"
-
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
-msgstr "_Zapamti ovu lozinku"
-
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "Potrebni podaci"
+#: mail/mail-config.glade.h:117
+msgid "Receiving Options"
+msgstr ""
 
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr "Vrati zadano"
+#: mail/mail-config.glade.h:118
+msgid "Remember _password"
+msgstr ""
 
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
-msgstr "_Sigurnost"
+#: mail/mail-config.glade.h:120
+msgid "S_tandard Font:"
+msgstr ""
 
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr "Sigurni MIME (S/MIME)"
+#: mail/mail-config.glade.h:121
+msgid "Security"
+msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr "Odaberite pismo utvrđene širine za HTML"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr "Odaberite pismo utvrđene širine za HTML radi ispisa"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr "Odaberite pismo promjenjljive širine za HTML"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr "Odaberite pismo promjenjljive širine za HTML radi ispisa"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+msgid "Select..."
+msgstr ""
+
+#: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "Slanje pošte"
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
-msgstr "Direktorij poslanih _poruka"
-
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "Pripremljene i poslane poruke"
+#: mail/mail-config.glade.h:130
+msgid "Sent _Messages Folder:"
+msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "Pos_lužitelj zahtijeva autentifikaciju"
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "Postavke poslužitelja"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "_Tip poslužitelja:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 msgid "Si_gning certificate:"
 msgstr "Potpisivanje certifikata:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+msgid "Signat_ure:"
+msgstr ""
+
+#: mail/mail-config.glade.h:135
+msgid "Signatures"
+msgstr ""
+
+#: mail/mail-config.glade.h:136
 msgid "Specify _filename:"
 msgstr "Odredi ime _datoteke:"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
-msgstr "_Provjera pravopisa"
+#: mail/mail-config.glade.h:137
+msgid "Spell Checking"
+msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr "Standardni Unix mbox"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+msgid "T_erminal Font:"
+msgstr ""
+
+#: mail/mail-config.glade.h:140
+msgid "T_ype: "
+msgstr ""
+
+#: mail/mail-config.glade.h:141
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14566,16 +14402,14 @@ msgstr ""
 "potpis. Ime koje ste dali će biti korišteno\n"
 "samo za svrhu prikazivanja na zaslonu."
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:144
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr ""
-"Ovdje možete podesiti provjeru pravopisa i jezik. U popisu se nalaze samo "
-"jezici za koje imate instaliran rječnik."
+msgstr "Ovdje možete podesiti provjeru pravopisa i jezik. U popisu se nalaze samo jezici za koje imate instaliran rječnik."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:146
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14583,15 +14417,15 @@ msgstr ""
 "Unesite ime po kome želite da nazovete ovaj korisnički račun.\n"
 "Na primjer: \"Poslovni\" ili \"Osobni\""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr "Koristi _daemon"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "V_arijabilna širina:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14601,177 +14435,103 @@ msgstr ""
 "\n"
 "Pritisnite \"Naprijed\" za početak. "
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 msgid "_Add Signature"
 msgstr "Dod_aj potpis"
 
-#: mail/mail-config.glade.h:137
-msgid "_Always load images off the net"
-msgstr "_Uvijek učitaj slike sa mreže"
-
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr "_Uvijek potpiši odlazeće poruke na ovom korisničkom računu"
-
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "_Tip identifikacije: "
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "_Tip identifikacije: "
-
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr "_Automatski provjeri za novu poštu svakih"
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr "_Automatski ubaci slike sa osmjesima"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr "_Oglasi se kada stigne nova pošta"
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr "_Potvrdi kada izbacuješ mapu"
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
-msgstr "_Predefinirani potpis:"
+#: mail/mail-config.glade.h:157
+msgid "_Always load images from the Internet"
+msgstr ""
 
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr "_Uobičajene postavke"
+#: mail/mail-config.glade.h:158
+msgid "_Digitally sign outgoing messages (by default)"
+msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Nemoj me obavještavati kada stigne nova pošta"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 msgid "_Enable"
 msgstr "Omogući"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Kriptiranje izlaznih poruka (uobičajeno)"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 msgid "_Forward style:"
 msgstr "Stil _prosljeđivanja "
 
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "_Puno ime:"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr "_HTML pošta"
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr "_Identitet"
-
-#: mail/mail-config.glade.h:157
-msgid "_Junk"
-msgstr "_Smeće"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 msgid "_Load images if sender is in address book"
 msgstr "_Učitavanje slika ako je pošiljatelj u adresaru"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr "_Samo lokalni testovi"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 msgid "_Make this my default account"
 msgstr "_Neka je ovo moj glavni korisnički račun "
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 msgid "_Mark messages as read after"
 msgstr "_Označi poruke kao pročitane poslije "
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: mail/mail-config.glade.h:163
-msgid "_Never load images off the net"
-msgstr "_Nikada ne učitavaj slike sa mreže"
-
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr "_Pusti zvučnu datoteku kada stigne nova pošta"
+#: mail/mail-config.glade.h:171
+msgid "_Never load images from the Internet"
+msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:173
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Upozori kada šalješ HTML poruke onima koji ih ne žele"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Upozori kada šalješ poruke bez naslova"
 
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr "_Primanje pošte"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Reply style:"
 msgstr "_Stil odgovora:"
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr "_Povrati predefinirano"
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 msgid "_Script:"
 msgstr "_Skripta:"
 
-#: mail/mail-config.glade.h:172
-msgid "_Select..."
-msgstr "_Odaberi..."
-
-#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr "_Slanje pošte"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "_Pokaži animirane slike"
 
-#: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr "_Potpisi"
-
-#: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
-msgstr "_Standardno pismo:"
-
-#: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
-msgstr "_Pismo za terminal:"
-
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
-msgstr "_Koristi sigurnosnu vezu (SSL):"
+msgid "_Use Secure Connection (SSL):"
+msgstr ""
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi ista pisma kao drugi programi"
 
+#: mail/mail-config.glade.h:180
+msgid "_minute(s)"
+msgstr ""
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "boja"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-folder-cache.c:792
-#, c-format
+#: mail/mail-folder-cache.c:796
 msgid "Pinging %s"
 msgstr "Pingam %s"
 
 #: mail/mail-mt.c:260
-#, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
@@ -14780,7 +14540,6 @@ msgstr ""
 "%s"
 
 #: mail/mail-mt.c:263
-#, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
@@ -14796,135 +14555,120 @@ msgstr "Radim"
 msgid "Filtering Folder"
 msgstr "Filtriram direktorij"
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Prikupljam poštu"
 
-#: mail/mail-ops.c:528
-#, c-format
+#: mail/mail-ops.c:534
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nisam mogao primjeniti odlazne filtere: %s"
 
-#: mail/mail-ops.c:553
-#, c-format
+#: mail/mail-ops.c:559
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 "Nisam mogao dodati u %s: %s\n"
-"Umjesto toga dodajem u lokalnu mapu „Poslano“."
+"Umjesto toga dodajem u lokalnu mapu \"Poslano\"."
 
-#: mail/mail-ops.c:562
-#, c-format
+#: mail/mail-ops.c:568
 msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Nisam mogao smjestiti poštu u lokalnu mapu „Poslano“: %s"
+msgstr "Nisam mogao smjestiti poštu u lokalnu mapu \"Poslano\": %s"
 
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Šaljem \"%s\""
-
-#: mail/mail-ops.c:722
-#, c-format
+#: mail/mail-ops.c:664
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
 
-#: mail/mail-ops.c:741
-#, c-format
-msgid "Failed on message %d of %d"
-msgstr "Poruka %d od %d nije poslana"
+#: mail/mail-ops.c:695
+#, , c-format
+msgid "Failed to send %d of %d messages"
+msgstr "Greška kod slanja %d od %d poruka"
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
 msgid "Complete."
 msgstr "Gotovo."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
 msgid "Saving message to folder"
 msgstr "Spremam poruku u mapu"
 
-#: mail/mail-ops.c:922
-#, c-format
+#: mail/mail-ops.c:881
 msgid "Moving messages to %s"
 msgstr "Premještam poruke u %s"
 
-#: mail/mail-ops.c:922
-#, c-format
+#: mail/mail-ops.c:881
 msgid "Copying messages to %s"
 msgstr "Kopiram poruke u %s"
 
-#: mail/mail-ops.c:1035
-#, c-format
+#: mail/mail-ops.c:994
 msgid "Scanning folders in \"%s\""
 msgstr "Pretražujem direktorije u \"%s\""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr "Prosljeđene poruke"
 
-#: mail/mail-ops.c:1274
-#, c-format
+#: mail/mail-ops.c:1233
 msgid "Opening folder %s"
 msgstr "Otvaram mapu %s"
 
-#: mail/mail-ops.c:1346
-#, c-format
+#: mail/mail-ops.c:1305
 msgid "Opening store %s"
 msgstr "Otvaram smočnica %s"
 
-#: mail/mail-ops.c:1424
-#, c-format
+#: mail/mail-ops.c:1383
 msgid "Removing folder %s"
 msgstr "Uklanjam mapu %s"
 
-#: mail/mail-ops.c:1518
-#, c-format
+#: mail/mail-ops.c:1477
 msgid "Storing folder '%s'"
 msgstr "Smeštam direktorij '%s'"
 
-#: mail/mail-ops.c:1583
-#, c-format
+#: mail/mail-ops.c:1542
+#, c-format
 msgid "Expunging and storing account '%s'"
-msgstr ""
+msgstr "Čistim i spreman korisnički račun \"%s\""
 
-#: mail/mail-ops.c:1584
-#, fuzzy, c-format
+#: mail/mail-ops.c:1543
+#, , c-format
 msgid "Storing account '%s'"
-msgstr "Smeštam direktorij '%s'"
+msgstr "Spremam korisnički račun '%s'"
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Osvježavam mapu"
 
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Izbacujem mapu"
 
-#: mail/mail-ops.c:1723
-#, c-format
+#: mail/mail-ops.c:1682
 msgid "Emptying trash in '%s'"
 msgstr "Praznim smeće u '%s'"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Direktoriji"
 
-#: mail/mail-ops.c:1807
-#, c-format
+#: mail/mail-ops.c:1766
 msgid "Retrieving message %s"
 msgstr "Učitavam poruku %s"
 
-#: mail/mail-ops.c:1879
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "Učitavam poruke (%d)"
-
-#: mail/mail-ops.c:1963
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "Spremam %d poruku(e)"
-
-#: mail/mail-ops.c:2011
-#, c-format
+#. plural form
+#: mail/mail-ops.c:1838
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#. plural form
+#: mail/mail-ops.c:1924
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mail/mail-ops.c:1974
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
@@ -14932,8 +14676,7 @@ msgstr ""
 "Ne mogu napraviti izlaznu datoteku: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2039
-#, c-format
+#: mail/mail-ops.c:2002
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
@@ -14941,12 +14684,11 @@ msgstr ""
 "Greška kod spremanja poruka u: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "Spremam prilog"
 
-#: mail/mail-ops.c:2127
-#, c-format
+#: mail/mail-ops.c:2090
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
@@ -14954,25 +14696,18 @@ msgstr ""
 "Ne mogu napraviti izlaznu datoteku: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2157
-#, c-format
+#: mail/mail-ops.c:2120
 msgid "Could not write data: %s"
 msgstr "Nisam mogao da upišem: %s"
 
-#: mail/mail-ops.c:2305
-#, c-format
+#: mail/mail-ops.c:2268
 msgid "Disconnecting from %s"
 msgstr "Prekidam vezu sa %s"
 
-#: mail/mail-ops.c:2305
-#, c-format
+#: mail/mail-ops.c:2268
 msgid "Reconnecting to %s"
 msgstr "Ponovo se povezujem na %s"
 
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr "Mijenjam status smeća"
-
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Razlikuj velika i mala slova"
@@ -14985,17 +14720,13 @@ msgstr "Pronađi u poruci"
 msgid "Find:"
 msgstr "Nađi:"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "&Traži"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-msgid "Digital Signature"
-msgstr "Digitalni potpis"
-
-#: mail/mail-security.glade.h:3
-msgid "Encryption"
-msgstr "Ši&firiraj"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:4
 msgid "Security Information"
@@ -15003,20 +14734,17 @@ msgstr "Podaci o sigurnosti"
 
 #: mail/mail-send-recv.c:151
 msgid "Cancelling..."
-msgstr "Poništavam...\r"
+msgstr "Poništavam...
+"
 
 #: mail/mail-send-recv.c:258
-#, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Poslužitelj: %s, tip: %s"
 
 #: mail/mail-send-recv.c:260
-#, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Putanja: %s, tip: %s"
 
 #: mail/mail-send-recv.c:262
-#, c-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
@@ -15041,7 +14769,6 @@ msgid "User canceled operation."
 msgstr "Korisnik je poništio operaciju."
 
 #: mail/mail-session.c:266
-#, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
@@ -15049,16 +14776,15 @@ msgstr "Unesite lozinku za %s"
 msgid "Enter Password"
 msgstr "Upišite šifru"
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:295
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ovog postupka"
 
 #: mail/mail-signature-editor.c:80
-#, c-format
 msgid "Could not save signature file: %s"
 msgstr "Nisam mogao sačuvati datoteku sa potpisom: %s"
 
@@ -15093,17 +14819,16 @@ msgid "Name:"
 msgstr "Ime:"
 
 #: mail/mail-tools.c:114
-#, fuzzy, c-format
+#, , c-format
 msgid "Could not create spool directory `%s': %s"
-msgstr "Ne mogu kreirati mapu %s: %s"
+msgstr "Ne mogu napraviti spool direktorij `%s': %s"
 
 #: mail/mail-tools.c:141
-#, c-format
+#, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr ""
+msgstr "Pokušaj premjestiti e-poštu u izvor \"%s\", koji nije poštanski sandučić."
 
 #: mail/mail-tools.c:276
-#, c-format
 msgid "Forwarded message - %s"
 msgstr "Prosljeđena poruka - %s"
 
@@ -15112,22 +14837,18 @@ msgid "Forwarded message"
 msgstr "Prosljeđena poruka"
 
 #: mail/mail-tools.c:319
-#, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Neispravna mapa: `%s'"
 
 #: mail/mail-vfolder.c:87
-#, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Postavljam vfolder: %s"
 
 #: mail/mail-vfolder.c:206
-#, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Osvežavam vfolder-e za uri: %s"
 
 #: mail/mail-vfolder.c:524
-#, c-format
 msgid ""
 "The following vFolder(s):\n"
 "%sUsed the removed folder:\n"
@@ -15148,7 +14869,6 @@ msgid "Edit VFolder"
 msgstr "Promjeni VMape"
 
 #: mail/mail-vfolder.c:984
-#, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pokušavam promijeniti vmapu '%s' koja ne postoji."
 
@@ -15264,7 +14984,7 @@ msgstr "_Sljedi"
 msgid "For Your Information"
 msgstr "Za vašu informaciju"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Naprijed"
 
@@ -15272,11 +14992,11 @@ msgstr "Naprijed"
 msgid "No Response Necessary"
 msgstr "Nije nužan odgovor"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Odgovori"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Odgovori svima"
 
@@ -15301,8 +15021,8 @@ msgstr ""
 "Molim odaberite akciju za praćenje iz \"Oznaka\" menija."
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
-msgstr "_Mora do:"
+msgid "_Due By:"
+msgstr ""
 
 #: mail/message-tags.glade.h:7
 msgid "_Flag:"
@@ -15370,17 +15090,15 @@ msgstr "Inačica podešavanja Evolutiona"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr ""
-"Identifikacijski broj ili  alias komponente koja se uobičajeno prikazuje "
-"prilikom pokretanja."
+msgstr "Identifikacijski broj ili  alias komponente koja se uobičajeno prikazuje prilikom pokretanja."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
 "If set to true, Evolution will start up in offline mode instead of online "
 "mode."
 msgstr ""
-"Ako je postavljeno, Evolution će se pokrenuti u neumreženom načinu rada "
-"umjesto uobičajenom umreženom načinu."
+"Ako je postavljeno, Evolution će se pokrenuti u neumreženom načinu rada umjesto "
+"uobičajenom umreženom načinu."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid ""
@@ -15391,10 +15109,8 @@ msgstr ""
 "inačicama Evolutiona."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr ""
-"Popis putanja za mape koje se sinhroniziraju s diskom za neumreženu uporabu"
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgstr "Popis putanja za mape koje se sinhroniziraju s diskom za neumreženu uporabu"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Path to the default calendar folder"
@@ -15473,7 +15189,6 @@ msgid "Autocompletion Folders"
 msgstr "Mape za samodopunjavanje"
 
 #: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
@@ -15482,7 +15197,6 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Navedeno ime direktorija nije ispravno: %s"
 
@@ -15502,16 +15216,14 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
-"Odaberite datoteku koju želite importirati u Evolution, te odaberite iz "
-"popisa koje je vrste.\n"
+"Odaberite datoteku koju želite importirati u Evolution, te odaberite iz popisa koje je "
+"vrste.\n"
 "\n"
-"Ako ne znate, odaberite \"Automatski\", pa će Evolution pokušati sam "
-"pogoditi."
+"Ako ne znate, odaberite \"Automatski\", pa će Evolution pokušati sam pogoditi."
 
 #: shell/e-shell-importer.c:154
-#, fuzzy
 msgid "Choose the destination for this import"
-msgstr "Otkaži sastanak iz ove stavke"
+msgstr "Odaberite odredište za ovaj uvoz"
 
 #: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:737
 msgid "Please select the information that you would like to import:"
@@ -15530,7 +15242,6 @@ msgstr ""
 "pokušati ponovo, molim pritisnite gumb \"Natrag\".\n"
 
 #: shell/e-shell-importer.c:228 shell/e-shell-importer.c:259
-#, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
@@ -15543,7 +15254,6 @@ msgid "Select importer"
 msgstr "Odaberite uvoznika"
 
 #: shell/e-shell-importer.c:448 shell/e-shell-importer.c:1020
-#, c-format
 msgid "File %s does not exist"
 msgstr "Datoteka %s ne postoji"
 
@@ -15552,17 +15262,15 @@ msgid "Importing"
 msgstr "Uvoz"
 
 #: shell/e-shell-importer.c:463
-#, fuzzy, c-format
+#, , c-format
 msgid "Importing %s.\n"
-msgstr "Uvoz"
+msgstr "Uvoz %s.\n"
 
 #: shell/e-shell-importer.c:473 shell/e-shell-importer.c:474
-#, c-format
 msgid "Error loading %s"
 msgstr "Greška prilikom učitavanja %s"
 
 #: shell/e-shell-importer.c:490
-#, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
@@ -15607,19 +15315,17 @@ msgid "Starting Intelligent Importers"
 msgstr "Pokrećem inteligentne uvoznike"
 
 #: shell/e-shell-importer.c:847 shell/e-shell-startup-wizard.c:692
-#, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
 #: shell/e-shell-importer.c:1034
-#, fuzzy, c-format
+#, , c-format
 msgid "No importer available for file %s"
-msgstr "Nema dostupnog ponuđača za protokol `%s'"
+msgstr "Nema dostupnog uvoznika za datoteku %s"
 
 #: shell/e-shell-importer.c:1046
-#, fuzzy
 msgid "Unable to execute importer"
-msgstr "Nisam mogao izvršiti gpg."
+msgstr "Nisam mogao izvršiti uvoznika"
 
 #: shell/e-shell-importer.c:1156
 msgid "_Import"
@@ -15629,13 +15335,13 @@ msgstr "_Uvoz"
 msgid "Closing connections..."
 msgstr "Prekidam veze..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr "Podešavanja Evolucije"
 
 #. It would be nice to insensitivize the OK button appropriately
-#. instead of doing this, but unfortunately we can't do this for the
-#. Bonobo control.
+#.  instead of doing this, but unfortunately we can't do this for the
+#.  Bonobo control.
 #: shell/e-shell-shared-folder-picker-dialog.c:281
 msgid "Please select a user."
 msgstr "Molim odaberite korisnika."
@@ -15645,17 +15351,14 @@ msgid "Opening Folder"
 msgstr "Otvaram direktorij"
 
 #: shell/e-shell-shared-folder-picker-dialog.c:393
-#, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Otvaram direktorij \"%s\""
 
 #: shell/e-shell-shared-folder-picker-dialog.c:398
-#, c-format
 msgid "in \"%s\" ..."
-msgstr "u „%s“..."
+msgstr "u \"%s\"..."
 
 #: shell/e-shell-shared-folder-picker-dialog.c:482
-#, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Ne mogu otvoriti djeljeni direktorij: %s"
 
@@ -15681,10 +15384,6 @@ msgstr ""
 "\n"
 "Želite li sada zatvoriti pomoćnika?"
 
-#: shell/e-shell-startup-wizard.c:795
-msgid "Quit Assistant"
-msgstr "Zatvorite pomoćnika"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Nije navedeno ime direktorija."
@@ -15710,7 +15409,6 @@ msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Čini se da GNOME Pilot alati nisu instalirani na ovaj sistem."
 
 #: shell/e-shell-window-commands.c:71
-#, c-format
 msgid "Error executing %s."
 msgstr "Greška kod pokretanja %s."
 
@@ -15726,23 +15424,21 @@ msgstr "Ne mogu pokrenuti Bug buddy."
 msgid "About Ximian Evolution"
 msgstr "O Ximian Evolutionu"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Na mreži"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Neumreženi rad"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Neumreženi rad"
 
 #: shell/e-shell-window.c:327
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution je trenutno na mreži. Pritisnite ovaj gumb da radite bez "
+msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr """Ximian Evolution je trenutno na mreži. Pritisnite ovaj gumb da radite bez "
 "mreže."
 
 #: shell/e-shell-window.c:334
@@ -15750,11 +15446,8 @@ msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution je u procesu odlaska u rad bez mreže."
 
 #: shell/e-shell-window.c:340
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution nije trenutno na mreži. Pritisnite ovaj gumb za rad na "
-"mreži."
+msgid "Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr "Ximian Evolution nije trenutno na mreži. Pritisnite ovaj gumb za rad na mreži."
 
 #: shell/e-shell.c:537
 #, c-format
@@ -15763,8 +15456,7 @@ msgid ""
 "The data hasn't been deleted, but it will not be seen by this version of "
 "Evolution.\n"
 msgstr ""
-"Upozorenje: Evolution ne može nadograditi sve vaše podatke iz inačice  %d.%d."
-"%d.\n"
+"Upozorenje: Evolution ne može nadograditi sve vaše podatke iz inačice  %d.%d.%d.\n"
 "Podaci nisu obrisani, ali ih nećete moći vidjeti u ovoj inačici Evolutiona.\n"
 
 #: shell/e-shell.c:1063
@@ -15794,7 +15486,6 @@ msgid "New"
 msgstr "Novi"
 
 #: shell/evolution-shell-component-utils.c:124
-#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -15805,7 +15496,6 @@ msgstr ""
 "Nepoznata greška."
 
 #: shell/evolution-shell-component-utils.c:127
-#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -15818,7 +15508,6 @@ msgstr ""
 "%s"
 
 #: shell/evolution-shell-component-utils.c:134
-#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -15941,27 +15630,22 @@ msgid "Evolution Import Assistant"
 msgstr "Pomoćnik Evolucije za uvoz"
 
 #: shell/importer/import.glade.h:3
-#, fuzzy
 msgid "Import File"
-msgstr "Uvoz datoteka"
+msgstr "Uvezi datoteku"
 
 #: shell/importer/import.glade.h:4
-#, fuzzy
 msgid "Import Location"
-msgstr "Lokacija"
+msgstr "Lokacija uvoza"
 
 #: shell/importer/import.glade.h:5
-#, fuzzy
 msgid "Importer Type"
-msgstr "Uvoznici"
+msgstr "Vrsta uvoznika"
 
 #: shell/importer/import.glade.h:6
-#, fuzzy
 msgid "Select Importers"
-msgstr "Odaberite uvoznika"
+msgstr "Odaberite uvoznike"
 
 #: shell/importer/import.glade.h:7
-#, fuzzy
 msgid "Select a File"
 msgstr "Odaberite datoteku"
 
@@ -15995,9 +15679,7 @@ msgstr "Ne pitaj me više"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolucija može uvesti podatke iz sijedećih datoteka:"
 
-#. Preview/Alpha/Beta version warning message
 #: shell/main.c:217
-#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
@@ -16048,7 +15730,6 @@ msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ne mogu pristupiti ljusci Ximian Evolution."
 
 #: shell/main.c:390
-#, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ne mogu pokreniti Ximian Evolution ljusku : %s"
 
@@ -16070,7 +15751,7 @@ msgstr "Silom ugasi sve dijelove evolutiona"
 
 #: shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr ""
+msgstr "Inzistiraj na ponovnoj migraciji iz Evoultion 1.4"
 
 #: shell/main.c:501
 msgid "Send the debugging output of all components to a file."
@@ -16081,7 +15762,6 @@ msgid "Evolution"
 msgstr "Evolution"
 
 #: shell/main.c:528
-#, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
@@ -16089,46 +15769,53 @@ msgstr ""
 "%s: --online i --offline se ne mogu koristiti zajedno.\n"
 "  Za više informacija, upišite %s.\n"
 
-#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
-#: smime/gui/certificate-manager.c:463
+#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
+#: smime/gui/certificate-manager.c:503
 msgid "Select a cert to import..."
 msgstr "Izaberi certifikat za uvoz"
 
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:546
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
 msgid "Certificate Name"
 msgstr "Certificate Name"
 
-#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
 msgid "Purposes"
 msgstr "Purpose"
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "Serial Number"
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 msgid "Expires"
 msgstr "Istječe"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 msgid "E-Mail Address"
 msgstr "Adresa e-pošte"
 
-#: smime/gui/certificate-viewer.c:331
-#, c-format
+#: smime/gui/certificate-viewer.c:334
 msgid "Certificate Viewer: %s"
 msgstr "Preglednik certifikata: %s"
 
-#: smime/gui/component.c:41
-#, fuzzy, c-format
+#: smime/gui/component.c:45
+#, , c-format
 msgid "Enter the password for `%s'"
-msgstr "Unesite lozinku za %s"
+msgstr "Unesite lozinku za `%s'"
+
+#. we're setting the password initially
+#: smime/gui/component.c:68
+msgid "Enter new password for certificate database"
+msgstr "Upišite novu lozinku za certificiranje baze"
+
+#: smime/gui/component.c:70
+msgid "Enter new password"
+msgstr "Upišite novu lozinku"
 
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
-#, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
@@ -16137,7 +15824,6 @@ msgstr ""
 "  Naslov: %s\n"
 
 #: smime/gui/e-cert-selector.c:122
-#, c-format
 msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
@@ -16222,7 +15908,6 @@ msgid "Contact Certificates"
 msgstr "Certifikati kontakata"
 
 #: smime/gui/smime-ui.glade.h:21
-#, no-c-format
 msgid "Do you want to trust \"%s\" for the following purposes?"
 msgstr "Želite li vjerovati \"%s\" u sljedećim prigodama?"
 
@@ -16303,10 +15988,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "You have certificates from these organizations that identify you:"
 
 #: smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
-msgstr ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
+msgstr "You have certificates on file that identify these certificate authorities:"
 
 #: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
@@ -16316,7 +15999,8 @@ msgstr "You have certificates on file that identify these people:"
 msgid "Your Certificates"
 msgstr "Vaše potvrde"
 
-#: smime/lib/e-cert-db.c:571
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 msgid "Certificate already exists"
 msgstr "Certifikat već postoji"
 
@@ -16405,7 +16089,6 @@ msgid "UID"
 msgstr "UID"
 
 #: smime/lib/e-cert.c:635
-#, fuzzy, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identifikator objekta (%S)"
 
@@ -16486,7 +16169,6 @@ msgid "Extensions"
 msgstr "Nastavci"
 
 #: smime/lib/e-cert.c:983
-#, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
@@ -16547,15 +16229,12 @@ msgid "Default subject for the message."
 msgstr "Predefinirani naslov poruke."
 
 #. This most likely means that KILL_PROCESS_CMD wasn't
-#. * found, so just bail completely.
-#.
+#.  * found, so just bail completely.
 #: tools/killev.c:63
-#, c-format
 msgid "Could not execute '%s': %s\n"
-msgstr "Nisam mogao izvršiti „%s“: %s\n"
+msgstr "Nisam mogao izvršiti \"%s\": %s\n"
 
 #: tools/killev.c:78
-#, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Gasim %s (%s)\n"
 
@@ -16596,7 +16275,7 @@ msgid "Previews the contacts to be printed"
 msgstr "Pregled kontakata za ispis"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "_Pregled prije ispisa"
@@ -16649,7 +16328,7 @@ 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:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
 msgid "_Actions"
@@ -17036,8 +16715,7 @@ msgid "Hide _Read Messages"
 msgstr "Sakrij pro_čitane poruke"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Sakrij obrisane poruke umjesto njihovog precrtavanja"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -17048,7 +16726,7 @@ msgstr "Označi sve kao p_ročitane"
 msgid "Mark all visible messages as read"
 msgstr "Označi sve vidljive poruke kao pročitane"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Ubaci poruku(e) iz međumemorije"
 
@@ -17105,7 +16783,6 @@ msgid "_Threaded Message List"
 msgstr "Lista poruka prema _niti razgovora"
 
 #: ui/evolution-mail-message.xml.h:1
-#, fuzzy
 msgid "A_dd Sender to Address Book"
 msgstr "Do_daj pošiljaoca u adresar"
 
@@ -17114,7 +16791,6 @@ msgid "A_pply Filters"
 msgstr "_Primijeni filtere"
 
 #: ui/evolution-mail-message.xml.h:3
-#, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Dodaj pošiljaoca u adresar"
 
@@ -17215,306 +16891,314 @@ msgid "F_orward As..."
 msgstr "P_roslijedi kao..."
 
 #: ui/evolution-mail-message.xml.h:33
+msgid "Filter _Junk"
+msgstr "Filtriraj neželjenu _poštu"
+
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filtriraj prema Dopisnoj _Listi..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Filter prema Po_šiljatelju..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Filter prema P_rimatelju..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Filter prema _Subjektu..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
+msgid "Filter the selected messages for junk status"
+msgstr "Filtriraj označene poruke kao smeće"
+
+#: ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "Označi odabrane poruke za praćenje"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "_Sljedi..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Prisili učitavanje slika u HTML porukama"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Prosljedi odabranu poruku u tijelu nove poruke"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Prosljedi odabranu poruku citiranu kao odgovor"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Prosljedi odabranu poruku nekome"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Prosljedi odabranu poruku nekome kao prilog"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Uvećaj veličinu teksta"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "Učitaj _slike"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "Označi kao važno"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr "Označi kao _nepročitano"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "Označi kao nevažn_o"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr "Označi odabrane poruke kao pročitane"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr "Označi odabrane poruke kao važne"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as junk"
 msgstr "Označi odabrane poruke kao smeće"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Označi da odabrane poruke nisu smeće"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Označi odabrane poruke kao nepročitane"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Označi odabrane poruke kao nevažne"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "Označi odabrane poruke za brisanje"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Pomakni"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr "Premjesti odabranu poruku(e) u drugi direktorij"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next"
 msgstr "Dalje"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Sljedeća _važna poruka"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr "Sljedeća _nit"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr "Sljedeća _nepročitana poruka"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Not Junk"
 msgstr "Nije smeće"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Otvori odabranu poruku u novom prozoru"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Otvori odabranu poruku radi ponovnog slanja"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "Originalna _veličina"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr "P_rethodna nepročitana poruka"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 msgid "Post a Repl_y"
 msgstr "_Pošalji odgovor"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr "Pošalji odgovor na poruku u javnu mapu"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr "Pr_ethodna važna poruka"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Pregled poruke za ispis"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Previous"
 msgstr "Prethodni"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Ispiši ovu poruku"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr "Preu_smjeri"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Preu_smeri (odbaci) odabrani poruku nekome"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "Vrati tekst na izvornu veličinu"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "S_earch in Message..."
 msgstr "Nađi u poruci..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "_Manje"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "Spremi poruku kao tekstualnu datoteku"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Traži tekst u tijelu prikazane poruke"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "Postavi postavke stranice za vaš trenutni pisač"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "Prikaži izvor poruke"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "Prikazuj cijela _zaglavlja"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Prikaži treptajući kursor u tijelu prikazane poruke"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "Prikaži poruku u normalnom stilu"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "Prikaži poruku sa svim zaglavljima e-pošte"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr "Prikaži izvorni kod elektronske poruke"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "Veličina te_ksta"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "Vrati odabrane obrisane  poruke"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder na dopisnu _listu... "
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr "VFolder na _pošiljaoca... "
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr "VFolder direktorij na _primatelja..."
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr "VFolder na _Naslov..."
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr "_Priloženo"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiraj u mapu"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Napravi filter od poruke"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Go To"
 msgstr "_Idi na"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Larger"
 msgstr "_Veće"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Message Display"
 msgstr "_Prikaz poruka"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Premjesti u mapu"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "_Slijedeća poruka "
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Normal Display"
 msgstr "Normalan pri_kaz"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Open Message"
 msgstr "_Otvori poruku"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr "_Prethodna poruka"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr "_kao citate"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Resend..."
 msgstr "Ponovo poša_lji..."
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Alati"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr "_Vrati obrisano"
 
@@ -17909,9 +17593,8 @@ msgid "_New"
 msgstr "_Novi"
 
 #: ui/evolution.xml.h:31
-#, fuzzy
 msgid "_Quick Reference"
-msgstr "Osobine pošte"
+msgstr "_Brza referenca"
 
 #: ui/evolution.xml.h:32
 msgid "_Send / Receive"
@@ -18025,7 +17708,7 @@ msgid "Define Views..."
 msgstr "Odredi poglede..."
 
 #. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#.  week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "PUSČPSN"
@@ -18035,16 +17718,15 @@ msgstr "PUSČPSN"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
 msgid "Now"
 msgstr "Sad"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:435
 msgid "Today"
 msgstr "Danas"
 
 #: widgets/misc/e-cell-date-edit.c:805
-#, c-format
 msgid "The time must be in the format: %s"
 msgstr "Vrijeme mora biti u formatu: %s"
 
@@ -18115,7 +17797,6 @@ msgid "Visual"
 msgstr "Vidljivo"
 
 #: widgets/misc/e-charset-picker.c:168
-#, c-format
 msgid "Unknown character set: %s"
 msgstr "Nepoznata kodna strana: %s"
 
@@ -18191,12 +17872,12 @@ msgstr "Greška u sintaksi"
 msgid "Spacing around expander arrow"
 msgstr "Razmaci oko strelica za grananje"
 
-#: widgets/misc/e-filter-bar.c:191
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Urednik pretrage"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
 msgstr "Spremanje pretraživanja"
 
@@ -18213,19 +17894,18 @@ msgid "_Advanced..."
 msgstr "_Napredno..."
 
 #: widgets/misc/e-image-chooser.c:172
-#, fuzzy
 msgid "Choose Image"
-msgstr "Izaberite datoteku"
+msgstr "Izaberite sliku"
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr "_&Traži"
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 msgid "_Find Now"
 msgstr "_Traži sad"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
+#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Očisti"
 
@@ -18255,283 +17935,3 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% dovršeno)"
 
-#~ msgid "Addressbook Sources"
-#~ msgstr "Izvori adresara"
-
-#~ msgid "No data provided"
-#~ msgstr "Nisam dobio podatke"
-
-#~ msgid ""
-#~ "Could not open file `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nisam mogao otvoriti datoteku `%s':\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Could not create directory `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ne mogu stvoriti direktorij `%s':\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Could not create file `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nisam mogao napraviti datoteku `%s':\n"
-#~ "%s"
-
-#~ msgid "`%s' is not a directory."
-#~ msgstr "`%s' nije direktorij."
-
-#~ msgid "On this Computer"
-#~ msgstr "Na ovom računalu"
-
-#~ msgid "Importing %s as %s"
-#~ msgstr "Uvozim %s kao %s"
-
-#~ msgid "Scanning mail filters"
-#~ msgstr "Pretražujem filtere za poštu"
-
-#~ msgid "Scanning directory"
-#~ msgstr "Pretražujem mapu"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid "Cannot copy folder: %s"
-#~ msgstr "Ne mogu kopirati mapu: %s"
-
-#~ msgid "Cannot move folder: %s"
-#~ msgstr "Ne mogu premjestiti mapu: %s"
-
-#~ msgid "Cannot move a folder over itself."
-#~ msgstr "Ne mogu premjestiti mapu preko nje same."
-
-#~ msgid "Cannot copy a folder over itself."
-#~ msgstr "Ne mogu kopirati mapu preko iste."
-
-#~ msgid "Cannot move a folder into one of its descendants."
-#~ msgstr "Ne mogu premjestiti mapu u neku od njenih potomaka."
-
-#~ msgid "Specify a folder to copy folder \"%s\" into:"
-#~ msgstr "Navedite mapu u koji će se mapa „%s“ kopirati:"
-
-#~ msgid "Copy Folder"
-#~ msgstr "Kopiraj mapu"
-
-#~ msgid "Specify a folder to move folder \"%s\" into:"
-#~ msgstr "Navedite mapu u koju će se mapa „%s“ premjesti:"
-
-#~ msgid "Move Folder"
-#~ msgstr "Premjesti mapu"
-
-#~ msgid ""
-#~ "Cannot delete folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ne mogu obrisati mapu:\n"
-#~ "%s"
-
-#~ msgid "Really delete folder \"%s\"?"
-#~ msgstr "Zaista da brišem mapu „%s“?"
-
-#~ msgid ""
-#~ "Cannot rename folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ne mogu preimenovati mapu:\n"
-#~ "%s"
-
-#~ msgid "Selected folder does not belong to another user"
-#~ msgstr "Odabrani mapa ne pripada drugom korisniku"
-
-#~ msgid ""
-#~ "Cannot remove folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ne mogu ukloniti mapu:\n"
-#~ "%s"
-
-#~ msgid "Create New Shortcut Group"
-#~ msgstr "Napravi novu grupu prečaca"
-
-#~ msgid "Group name:"
-#~ msgstr "Ime grupe:"
-
-#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-#~ msgstr "Da li zaista želite da uklonite grupu „%s“ sa trake prečaca?"
-
-#~ msgid "Rename Shortcut Group"
-#~ msgstr "Preimenuj grupu prečaca"
-
-#~ msgid "Rename selected shortcut group to:"
-#~ msgstr "Preimenuj odabranu grupu prečaca u:"
-
-#~ msgid "_Small Icons"
-#~ msgstr "_Male ikone"
-
-#~ msgid "Show the shortcuts as small icons"
-#~ msgstr "Prikazuj kratice kao male sličice"
-
-#~ msgid "_Large Icons"
-#~ msgstr "_Velike ikone"
-
-#~ msgid "Show the shortcuts as large icons"
-#~ msgstr "Prikazuj kratice kao velike sličice"
-
-#~ msgid "_Add Group..."
-#~ msgstr "_Dodaj grupu..."
-
-#~ msgid "Create a new shortcut group"
-#~ msgstr "Napravi novu grupu prečaca"
-
-#~ msgid "_Remove this Group..."
-#~ msgstr "_Ukloni ovu grupu..."
-
-#~ msgid "Remove this shortcut group"
-#~ msgstr "Ukloni ovu grupu prečaca"
-
-#~ msgid "Re_name this Group..."
-#~ msgstr "Pre_imenuj ovu grupu..."
-
-#~ msgid "Rename this shortcut group"
-#~ msgstr "Preimenuj ovu grupu prečaca"
-
-#~ msgid "_Hide the Shortcut Bar"
-#~ msgstr "_Sakrij liniju sa prečicama"
-
-#~ msgid "Hide the shortcut bar"
-#~ msgstr "Sakrij liniju sa prečicama"
-
-#~ msgid "Create _Default Shortcuts"
-#~ msgstr "Napravi _uobičajene prečace"
-
-#~ msgid "Create Default Shortcuts"
-#~ msgstr "Napravi uobičajene prečace"
-
-#~ msgid "Rename Shortcut"
-#~ msgstr "Preimenuj prečac"
-
-#~ msgid "Rename selected shortcut to:"
-#~ msgstr "Preimenuj odabrani prečac u:"
-
-#~ msgid "Open the folder linked to this shortcut"
-#~ msgstr "Otvori direktorij na koji pokazuje ova prečica"
-
-#~ msgid "Open in New _Window"
-#~ msgstr "_Otvori u novom prozoru"
-
-#~ msgid "Open the folder linked to this shortcut in a new window"
-#~ msgstr "Otvori direktorij vezan ovom prečicom u novom prozoru"
-
-#~ msgid "Rename this shortcut"
-#~ msgstr "Preimenuj ovaj prečac"
-
-#~ msgid "Re_move"
-#~ msgstr "_Ukloni"
-
-#~ msgid "Remove this shortcut from the shortcut bar"
-#~ msgstr "Ukloni prečac sa linije prečaca"
-
-#~ msgid "Error saving shortcuts."
-#~ msgstr "Greška kod spremanja kratica."
-
-#~ msgid "Shortcuts"
-#~ msgstr "Kratice"
-
-#~ msgid "\"%s\" in \"%s\""
-#~ msgstr "„%s“ u „%s“"
-
-#~ msgid "Print Summary"
-#~ msgstr "Pregled ispisa"
-
-#~ msgid "Print summary"
-#~ msgstr "Ispis sažetka "
-
-#~ msgid "Reload"
-#~ msgstr "Ponovno učitavanje"
-
-#~ msgid "Reload the view"
-#~ msgstr "Osvježi pregled"
-
-#~ msgid "Copy to folder..."
-#~ msgstr "Kopiraj u mapu..."
-
-#~ msgid "Move to folder..."
-#~ msgstr "Premjesti u direktorij..."
-
-#~ msgid "Map It"
-#~ msgstr "Mapiraj"
-
-#~ msgid "Home Address"
-#~ msgstr "Adresa (dom)"
-
-#~ msgid "Work Address"
-#~ msgstr "Poslovna adresa"
-
-#~ msgid "Other Address"
-#~ msgstr "Druga adresa"
-
-#~ msgid "Could not open '%s': %s"
-#~ msgstr "Ne mogu otvoriti '%s': %s"
-
-#~ msgid "Could not create temporary mbox store: %s"
-#~ msgstr "Ne mogu stvoriti privremenu mbox pohranu: %s"
-
-#~ msgid "Could not create temporary mbox folder: %s"
-#~ msgstr "Ne mogu stvoriti privremenu mbox mapu: %s"
-
-#~ msgid "Could not copy messages to temporary mbox folder: %s"
-#~ msgstr "Ne mogu kopirati poruke u privremenu mbox mapu: %s"
-
-#~ msgid "Evolution Error"
-#~ msgstr "Greška Evolucije"
-
-#~ msgid ""
-#~ "There is no importer that is able to handle\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ne postoji uvoznik koji može rukavati s\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Importing %s.\n"
-#~ "Starting %s"
-#~ msgstr ""
-#~ "Uvozim %s.\n"
-#~ "Pokrećem %s"
-
-#~ msgid "Error starting %s"
-#~ msgstr "Greška kod pokretanja %s"
-
-#~ msgid "Select a destination folder for importing this data"
-#~ msgstr "Odaberite odredišnu mapu za uvoz ovih podataka"
-
-#~ msgid "Go to folder..."
-#~ msgstr "Idi do mape..."
-
-#~ msgid "Select the folder that you want to open"
-#~ msgstr "Odaberite mapu koju želite otvoriti"
-
-#~ msgid "Create New Shortcut"
-#~ msgstr "Napravi novi prečac"
-
-#~ msgid "Select the folder you want the shortcut to point to:"
-#~ msgstr "Odaberite direktorij na koji želite da prečica ukazuje:"
-
-#~ msgid "Import File (step 3 of 3)"
-#~ msgstr "Uvezite datoteku (korak 3 od 3)"
-
-#~ msgid "Importer Type (step 1 of 3)"
-#~ msgstr "Vrsta uvoznika (korak 1 od 3)"
-
-#~ msgid "Select Importers (step 2 of 3)"
-#~ msgstr "Odaberite uvoznike (korak 2 od 3)"
-
-#~ msgid "Select a File (step 2 of 3)"
-#~ msgstr "Odaberite datoteku (korak 2 od 3)"
-
-#~ msgid "Evolution is now exiting ..."
-#~ msgstr "Evolution sada izlazi..."
author	Denis Lackovic <delacko@src.gnome.org>	2004-03-29 06:46:57 +0800
committer	Denis Lackovic <delacko@src.gnome.org>	2004-03-29 06:46:57 +0800
commit	9fab86cb59bf7ca18e5f00c0b6c31a4b24ba390d (patch)
tree	d65773be605618334978b266529ae8f869cd8a3a /po
parent	53167c89e32be8da8b3dcad4224664a1e0c445f0 (diff)
download	gsoc2013-evolution-9fab86cb59bf7ca18e5f00c0b6c31a4b24ba390d.tar gsoc2013-evolution-9fab86cb59bf7ca18e5f00c0b6c31a4b24ba390d.tar.gz gsoc2013-evolution-9fab86cb59bf7ca18e5f00c0b6c31a4b24ba390d.tar.bz2 gsoc2013-evolution-9fab86cb59bf7ca18e5f00c0b6c31a4b24ba390d.tar.lz gsoc2013-evolution-9fab86cb59bf7ca18e5f00c0b6c31a4b24ba390d.tar.xz gsoc2013-evolution-9fab86cb59bf7ca18e5f00c0b6c31a4b24ba390d.tar.zst gsoc2013-evolution-9fab86cb59bf7ca18e5f00c0b6c31a4b24ba390d.zip