bump version, libtool numbers

2004-02-09 JP Rosevear <jpr@ximian.com> * configure.in: bump version, libtool numbers svn path=/trunk/; revision=24685
author: JP Rosevear <jpr@ximian.com> 2004-02-10 04:46:37 +0800
committer: JP Rosevear <jpr@src.gnome.org> 2004-02-10 04:46:37 +0800
commit: 6c8106d36334fc56f6d9e089b6e7d1156651945d (patch)
tree: 8e8b95d5a3360fb6ff2b1ce16b6e8623a9675391 /po/hr.po
parent: c406ecad32f63137e4cb60548b519dac65f9b9a7 (diff)
download: gsoc2013-evolution-6c8106d36334fc56f6d9e089b6e7d1156651945d.tar
gsoc2013-evolution-6c8106d36334fc56f6d9e089b6e7d1156651945d.tar.gz
gsoc2013-evolution-6c8106d36334fc56f6d9e089b6e7d1156651945d.tar.bz2
gsoc2013-evolution-6c8106d36334fc56f6d9e089b6e7d1156651945d.tar.lz
gsoc2013-evolution-6c8106d36334fc56f6d9e089b6e7d1156651945d.tar.xz
gsoc2013-evolution-6c8106d36334fc56f6d9e089b6e7d1156651945d.tar.zst
gsoc2013-evolution-6c8106d36334fc56f6d9e089b6e7d1156651945d.zip
1 files changed, 1722 insertions, 1061 deletions
diff --git a/po/hr.po b/po/hr.po
index 1b734c25fc..a5b205fe3b 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0\n"
-"POT-Creation-Date: 2004-02-01 16:51+0100\n"
+"POT-Creation-Date: 2004-02-09 15:17-0500\n"
 "PO-Revision-Date: 2004-02-01 16:52+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -40,9 +40,9 @@ 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);
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:362 mail/importers/netscape-importer.c:1844
@@ -97,7 +97,7 @@ msgid "New Addressbook"
 msgstr "Novi adresar"
 
 #: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
@@ -135,31 +135,31 @@ msgstr "Kontakt _lista"
 msgid "Create a new contact list"
 msgstr "Napravi novi kontakt popis"
 
-#: addressbook/gui/component/addressbook-config.c:397
+#: addressbook/gui/component/addressbook-config.c:398
 msgid "Failed to connect to LDAP server"
 msgstr "Neuspešno povezivanje sa LDAP serverom"
 
-#: addressbook/gui/component/addressbook-config.c:421
+#: addressbook/gui/component/addressbook-config.c:422
 msgid "Failed to authenticate with LDAP server"
 msgstr "Neuspjela prijava na LDAP server"
 
-#: addressbook/gui/component/addressbook-config.c:449
+#: addressbook/gui/component/addressbook-config.c:450
 msgid "Could not perform query on Root DSE"
 msgstr "Nisam mogao obaviti upit na Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:773
+#: addressbook/gui/component/addressbook-config.c:774
 msgid "The server responded with no supported search bases"
 msgstr "Server je odgovorio nepodržanim bazama za pretragu"
 
-#: addressbook/gui/component/addressbook-config.c:1184
+#: addressbook/gui/component/addressbook-config.c:1185
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Ovaj poslužitelj ne podržava LDAPv3 informacije o shemi"
 
-#: addressbook/gui/component/addressbook-config.c:1206
+#: addressbook/gui/component/addressbook-config.c:1207
 msgid "Error retrieving schema information"
 msgstr "Greška kod čitanja podataka sheme"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Server did not respond with valid schema information"
 msgstr "Poslužitelj nije odgovorio sa ispravnim podacima sheme"
 
@@ -175,12 +175,14 @@ 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:174 mail/em-migrate.c:1112
+#, c-format
 msgid "Migrating `%s':"
 msgstr "Migriram `%s':"
 
@@ -203,11 +205,11 @@ msgstr "Osobni podaci"
 msgid "On LDAP Servers"
 msgstr "Na LDAP poslužiteljima"
 
-#: addressbook/gui/component/addressbook-migrate.c:551
+#: addressbook/gui/component/addressbook-migrate.c:550
 msgid "LDAP Servers"
 msgstr "Mijenjaj LDAP poslužitelje"
 
-#: addressbook/gui/component/addressbook-migrate.c:671
+#: addressbook/gui/component/addressbook-migrate.c:670
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Automatsko dovršavanje"
@@ -232,8 +234,10 @@ 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:285
@@ -253,32 +257,34 @@ 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:599
 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:604
 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:613
 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:630
 msgid "Unable to open addressbook"
@@ -293,10 +299,11 @@ msgid "Failed to authenticate.\n"
 msgstr "Neuspjela prijava.\n"
 
 #: addressbook/gui/component/addressbook.c:789
+#, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sUnesite zaporku za %s (korisnik %s)"
 
-#: addressbook/gui/component/addressbook.c:1070
+#: addressbook/gui/component/addressbook.c:1071
 msgid "UID of the contacts source that the view will display"
 msgstr "UID izvora kontakata koje će pregled ispisati"
 
@@ -421,7 +428,8 @@ 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:23
-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:24
@@ -455,8 +463,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 "
@@ -500,8 +508,7 @@ 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."
 
@@ -524,8 +531,8 @@ msgid ""
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
-"Odabiranje ove opcije omogućiti će promjenu promjenu uobičajenih postavki"
-"LDAP\n"
+"Odabiranje ove opcije omogućiti će promjenu promjenu uobičajenih "
+"postavkiLDAP\n"
 "Evolution pretraživanja i  upisivanja i mijenjanja kontakata. "
 
 #: addressbook/gui/component/ldap-config.glade.h:47
@@ -533,8 +540,7 @@ msgid ""
 "Specifying a display name and group is the first step in setting up an "
 "addressbook."
 msgstr ""
-"Određivanje prikazanog imena i grupe je prvi korak u podešavanju "
-"adresara."
+"Određivanje prikazanog imena i grupe je prvi korak u podešavanju adresara."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
@@ -569,7 +575,8 @@ 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."
 
@@ -633,9 +640,8 @@ 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:72
 msgid ""
@@ -651,7 +657,9 @@ 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:75
 msgid ""
@@ -692,8 +700,9 @@ 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:85
@@ -763,8 +772,7 @@ msgstr "Ukloni sve"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:214
 #: addressbook/gui/component/select-names/e-select-names.c:693
-#: calendar/gui/dialogs/cal-prefs-dialog.c:663
-#: composer/e-msg-composer-attachment-bar.c:444
+#: calendar/gui/dialogs/cal-prefs-dialog.c:659
 msgid "Remove"
 msgstr "Ukloni"
 
@@ -798,7 +806,7 @@ msgstr "Ime"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:213
+#: addressbook/gui/widgets/e-addressbook-view.c:216
 msgid "Source"
 msgstr "Izvor"
 
@@ -900,8 +908,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 ""
@@ -959,10 +967,10 @@ msgstr "_Kategorije..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1259
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:1767
-#: mail/em-folder-view.c:736 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
+#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
+#: mail/em-folder-view.c:772 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
@@ -1010,6 +1018,8 @@ 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:249
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "Address"
 msgstr "Adresa"
 
@@ -2001,6 +2011,8 @@ msgstr "AOL Instant Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 #: addressbook/gui/contact-editor/e-contact-editor.c:2844
+#: addressbook/gui/widgets/eab-contact-display.c:245
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2014,6 +2026,8 @@ msgstr "MSN Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #: addressbook/gui/contact-editor/e-contact-editor.c:2847
+#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:255
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2112,18 +2126,25 @@ msgid "Business"
 msgstr "Posao"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:256
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:2845
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:258
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:2846
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "MSN"
 msgstr "MSN"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nisam mogao pronać element za polje: `%s'"
 
@@ -2257,7 +2278,7 @@ msgid "IM Service:"
 msgstr "IM servis:"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:948
+#: calendar/gui/e-itip-control.c:947
 msgid "Location:"
 msgstr "Lokacija:"
 
@@ -2284,7 +2305,7 @@ 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/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:206
+#: addressbook/gui/widgets/e-addressbook-view.c:209
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
 msgid "Book"
@@ -2355,12 +2376,13 @@ msgid "1 contact"
 msgstr "1 kontakt"
 
 #: 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-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:220
+#: addressbook/gui/widgets/e-addressbook-view.c:223
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
 msgid "Query"
@@ -2378,30 +2400,30 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Greška kod promijene karte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:157
+#: addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Name begins with"
 msgstr "Ime počinje sa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:158
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "Poruka počinje sa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:159
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 #: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 #: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Polje koje sadrži"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Advanced..."
 msgstr "Napredno..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:227
+#: 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-meeting-list-view.c:249
@@ -2409,81 +2431,84 @@ msgstr "Napredno..."
 msgid "Type"
 msgstr "Tip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:486
+#: addressbook/gui/widgets/e-addressbook-view.c:494
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Adresar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
-#: addressbook/gui/widgets/e-addressbook-view.c:1030
-#: addressbook/gui/widgets/e-addressbook-view.c:1964
+#: addressbook/gui/widgets/e-addressbook-view.c:835
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:2013
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Spremi kao VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1017
+#: addressbook/gui/widgets/e-addressbook-view.c:1042
 msgid "New Contact..."
 msgstr "Novi kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1018
+#: addressbook/gui/widgets/e-addressbook-view.c:1043
 msgid "New Contact List..."
 msgstr "Nova lista kontakata..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1021
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "Go to Folder..."
 msgstr "Idi u mapu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1022
+#: addressbook/gui/widgets/e-addressbook-view.c:1047
 msgid "Import..."
 msgstr "Uvezi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1024
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Search for Contacts..."
 msgstr "Tražim kontakte..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1025
-msgid "Addressbook Sources..."
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#, fuzzy
+msgid "Address Book Sources..."
 msgstr "Podešavanja adresara"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1027
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Pilot Settings..."
 msgstr "Podešavanja pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1031
+#: addressbook/gui/widgets/e-addressbook-view.c:1056
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Prosljedi kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1032
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "Send Message to Contact"
 msgstr "Pošalji kontaktu poruku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1033 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
 #: 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/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Ispis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1035
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Print Envelope"
 msgstr "Ispiši omotnicu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1039
-msgid "Copy to folder..."
-msgstr "Kopiraj u mapu..."
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#, fuzzy
+msgid "Copy to Address Book..."
+msgstr "Adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1040
-msgid "Move to folder..."
-msgstr "Premjesti u direktorij..."
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#, fuzzy
+msgid "Move to Address Book..."
+msgstr "Adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #: 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:1044
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 #: calendar/gui/calendar-component.c:358
 #: calendar/gui/dialogs/copy-source-dialog.c:158
 #: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
@@ -2491,17 +2516,18 @@ msgstr "Izreži"
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1070
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Umetni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
-#: calendar/gui/e-cal-view.c:1228
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: calendar/gui/e-cal-view.c:1224
 msgid "Current View"
 msgstr "Trenutačni pogled"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1235
+#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#, c-format
 msgid ""
 "The addressbook backend for\n"
 "%s\n"
@@ -2509,11 +2535,11 @@ msgid ""
 msgstr ""
 "Osnovni proces adresara za\n"
 "%s\n"
-"je pao. Morat ćete ponovo pokreneti Evolution kako bi nastavili"
-"da je koristite"
+"je pao. Morat ćete ponovo pokreneti Evolution kako bi nastavilida je "
+"koristite"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1555
+#: addressbook/gui/widgets/e-addressbook-view.c:1604
 #: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
@@ -2557,10 +2583,7 @@ msgid "Company Phone"
 msgstr "Telefon poduzeća"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:216
-#: addressbook/gui/widgets/eab-contact-display.c:217
-#: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-pošta"
 
@@ -2619,6 +2642,7 @@ msgid "Nickname"
 msgstr "Nadimak"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:270
 msgid "Note"
 msgstr "Bilješka"
 
@@ -2627,6 +2651,7 @@ msgid "Office"
 msgstr "Ured"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:239
 msgid "Organization"
 msgstr "Organizacija"
 
@@ -2694,8 +2719,7 @@ msgstr "Visina"
 #: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:160
 msgid "Has Focus"
-msgstr """"
-"Sadrži Fokus"
+msgstr "Sadrži Fokus"
 
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
@@ -2753,43 +2777,70 @@ msgstr "Odabrano"
 msgid "Has Cursor"
 msgstr "Sadrži Pokazivač"
 
-#: addressbook/gui/widgets/eab-contact-display.c:93
-#: addressbook/gui/widgets/eab-contact-display.c:114
-msgid "Map It"
-msgstr "Mapiraj"
+#: addressbook/gui/widgets/eab-contact-display.c:116
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:126
+msgid "map"
+msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:198
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:176
+#: addressbook/gui/widgets/eab-contact-display.c:414
 msgid "List Members"
 msgstr "Popis članova"
 
-#: addressbook/gui/widgets/eab-contact-display.c:214
-#: addressbook/gui/widgets/eab-contact-display.c:344
-msgid "Job Title"
-msgstr "Poslovna titula"
+#: addressbook/gui/widgets/eab-contact-display.c:232
+#, fuzzy
+msgid "E-mail"
+msgstr "E-pošta"
+
+#: addressbook/gui/widgets/eab-contact-display.c:237
+#, fuzzy
+msgid "work"
+msgstr "Posao"
 
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Adresa (dom)"
+#: addressbook/gui/widgets/eab-contact-display.c:240
+#, fuzzy
+msgid "Position"
+msgstr "Opis"
 
-#: addressbook/gui/widgets/eab-contact-display.c:222
-msgid "Work Address"
-msgstr "Poslovna adresa"
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#, fuzzy
+msgid "Video Conferencing"
+msgstr "_Adresa za video konferenciju:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Druga adresa"
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#, fuzzy
+msgid "Phone"
+msgstr "Telefon (u autu)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:227
-#: addressbook/gui/widgets/eab-contact-display.c:375
-msgid "Home page"
-msgstr "Početna stranica"
+#: addressbook/gui/widgets/eab-contact-display.c:248
+msgid "Fax"
+msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:228
-#: addressbook/gui/widgets/eab-contact-display.c:383
+#: addressbook/gui/widgets/eab-contact-display.c:253
+#, fuzzy
+msgid "personal"
+msgstr "Osobni podaci"
+
+#: addressbook/gui/widgets/eab-contact-display.c:261
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/widgets/eab-contact-display.c:473
 msgid "Blog"
 msgstr "Blog"
 
+#: addressbook/gui/widgets/eab-contact-display.c:434
+msgid "Job Title"
+msgstr "Poslovna titula"
+
+#: addressbook/gui/widgets/eab-contact-display.c:465
+msgid "Home page"
+msgstr "Početna stranica"
+
 #: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Success"
 msgstr "Uspjeh"
@@ -2797,8 +2848,8 @@ msgstr "Uspjeh"
 #: addressbook/gui/widgets/eab-gui-util.c:47
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
-#: camel/providers/pop3/camel-pop3-store.c:540
-#: camel/providers/pop3/camel-pop3-store.c:547 shell/e-shell.c:1076
+#: 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"
 
@@ -2825,11 +2876,11 @@ msgstr "Protokol nije podržan"
 #: addressbook/gui/widgets/eab-gui-util.c:53
 #: 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:213
-#: calendar/gui/print.c:2349 camel/camel-service.c:728
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
+#: calendar/gui/print.c:2344 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:453
-#: camel/providers/pop3/camel-pop3-store.c:534
+#: 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"
 
@@ -2888,6 +2939,7 @@ msgid "Error removing contact"
 msgstr "Greška pri uklanjanju kontakta"
 
 #: addressbook/gui/widgets/eab-gui-util.c:207
+#, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
@@ -2903,13 +2955,13 @@ msgid ""
 msgstr ""
 "%s već postoji\n"
 "Želite li  prepisati preko njega?"
-""
 
 #: addressbook/gui/widgets/eab-gui-util.c:237
 msgid "Overwrite"
 msgstr "Prebriši"
 
 #: addressbook/gui/widgets/eab-gui-util.c:273
+#, c-format
 msgid "Error saving %s: %s"
 msgstr "Greška kod spremanja %s: %s"
 
@@ -2948,29 +3000,34 @@ msgid "Multiple VCards"
 msgstr "Višestruke VCards"
 
 #: addressbook/gui/widgets/eab-gui-util.c:770
+#, c-format
 msgid "VCard for %s"
 msgstr "VCard za %s"
 
+#.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
-#.  * addresses (and *only* the e-mail addresses) associated with an existing
-#.  * contact.
+#. * 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
-"
+msgstr "Glavna email adresa\r"
 
 #: 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\""
 
@@ -2987,6 +3044,7 @@ 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"
 
@@ -3262,17 +3320,22 @@ 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."
@@ -3384,9 +3447,9 @@ msgid "Evolution's Tasks component"
 msgstr "Komponenta zadataka Evolutiona"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1112 calendar/gui/print.c:1825
-#: calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:717
+#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
+#: calendar/importers/icalendar-importer.c:710
 #: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
 msgid "Tasks"
 msgstr "Zadaci"
@@ -3408,6 +3471,7 @@ 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"
 
@@ -3430,9 +3494,9 @@ msgstr "Vrijeme drijemanja (u minutama)"
 msgid "_Edit appointment"
 msgstr "_Promijeni sastanak"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1241
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:711
+#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Otvori"
@@ -3450,6 +3514,7 @@ msgid "No description available."
 msgstr "Opis ne postoji."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:986
+#, c-format
 msgid ""
 "Alarm on %s\n"
 "%s\n"
@@ -3479,6 +3544,7 @@ msgstr ""
 "umjesto toga pokazati normalan prozor za dijalog."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:1108
+#, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
 "configured to run the following program:\n"
@@ -3487,8 +3553,8 @@ 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"
@@ -3498,15 +3564,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovno za ovu aplikaciju."
 
-#: calendar/gui/alarm-notify/notify-main.c:159
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize Bonobo"
 msgstr "Ne mogu inicijalizirati Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:162
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize gnome-vfs"
 msgstr "Ne mogu pokrenuti gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:171
+#: calendar/gui/alarm-notify/notify-main.c:172
 msgid "Could not create the alarm notify service factory"
 msgstr "Nisam mogao pokrenuti stvaranje servisa za alarm obavijesti"
 
@@ -3658,7 +3724,7 @@ msgstr "Komentar sadrži"
 msgid "Unmatched"
 msgstr "Neupariv"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1603
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
 #: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
 msgid "Calendar"
 msgstr "Kalendar"
@@ -3668,7 +3734,9 @@ 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"
@@ -3684,7 +3752,7 @@ 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.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
@@ -3701,14 +3769,15 @@ 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:1503
+#: 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:301
+#, c-format
 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?"
 
@@ -3766,6 +3835,7 @@ msgid "Create a new calendar"
 msgstr "Kreiraj novi kalendar"
 
 #: calendar/gui/calendar-component.c:691
+#, c-format
 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"
 
@@ -3774,10 +3844,12 @@ 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"
 
@@ -3801,23 +3873,25 @@ msgstr "Mjesečni pregled"
 msgid "List View"
 msgstr "Prikaz liste"
 
-#: calendar/gui/comp-editor-factory.c:410
+#: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Greška kod otvaranja kalendara"
 
-#: calendar/gui/comp-editor-factory.c:421
+#: calendar/gui/comp-editor-factory.c:419
 msgid "Method not supported when opening the calendar"
 msgstr "Metoda nije podržana kod otvaranja kalendara"
 
-#: calendar/gui/comp-editor-factory.c:427
+#: calendar/gui/comp-editor-factory.c:425
 msgid "Permission denied to open the calendar"
 msgstr "Zabranjen pristup kalendaru"
 
-#: calendar/gui/comp-editor-factory.c:476
+#: 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
 msgid "Could not open the folder in '%s'"
 msgstr "Nisam mogao otvoriti direktorij u '%s"
 
@@ -3902,103 +3976,108 @@ msgid "Action/Trigger"
 msgstr "Akcija/okidač"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+msgid "A_dd"
+msgstr "_Dodaj"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
 msgstr "Osnove"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:3
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "Date/Time:"
 msgstr "Datum/Vrijeme:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:463
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:463
 msgid "Display a message"
 msgstr "Pokaži poruku"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:459
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:459
 msgid "Play a sound"
 msgstr "Odsviraj zvuk"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Reminders"
 msgstr "Podsjetnici"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:471
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471
 msgid "Run a program"
 msgstr "Pokreni program"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: 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/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:939 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:168
+#: calendar/gui/e-itip-control.c:938 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:164
 msgid "Summary:"
 msgstr "Sažetak:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/alarm-page.glade.h:10
 msgid "_Options..."
 msgstr "_Postavke..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "after"
 msgstr "nakon"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr "prije"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "dan(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 msgid "end of appointment"
 msgstr "kraj zakazanog sastanka"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "hour(s)"
 msgstr "sat(i)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 #: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minuta(e)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-page.glade.h:17
 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.
+#. 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:858
 msgid "Enabled"
 msgstr "Omogućeno"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:660
+#: calendar/gui/dialogs/cal-prefs-dialog.c:656
 msgid "Are you sure you want to remove this URL?"
 msgstr "Jeste li sigurni da želite obrisati ovu adresu?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:668
+#: calendar/gui/dialogs/cal-prefs-dialog.c:664
 msgid "Don't Remove"
 msgstr "Nemoj ukloniti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:714
-#: calendar/gui/dialogs/cal-prefs-dialog.c:746
-#: calendar/gui/dialogs/cal-prefs-dialog.c:777 mail/em-account-prefs.c:315
+#: 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
 msgid "Disable"
 msgstr "Onemogući"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:714
-#: calendar/gui/dialogs/cal-prefs-dialog.c:746
-#: calendar/gui/dialogs/cal-prefs-dialog.c:779 mail/em-account-prefs.c:315
+#: 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
@@ -4056,7 +4135,7 @@ msgstr "_Omogući"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:562
 msgid "Friday"
 msgstr "Petak"
 
@@ -4070,7 +4149,7 @@ msgstr "Minuta"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:558
 msgid "Monday"
 msgstr "Ponedjeljak"
 
@@ -4080,7 +4159,7 @@ msgstr "_Ned"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:563
 msgid "Saturday"
 msgstr "Subota"
 
@@ -4094,7 +4173,7 @@ msgstr "Pokaži _brojeve tjedana u navigatoru datuma"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:557
 msgid "Sunday"
 msgstr "Nedjelja"
 
@@ -4112,7 +4191,7 @@ msgstr "Lista zadataka"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:561
 msgid "Thursday"
 msgstr "Četvrtak"
 
@@ -4130,7 +4209,7 @@ msgstr "Oblik vremena:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:559
 msgid "Tuesday"
 msgstr "Utorak"
 
@@ -4140,7 +4219,7 @@ msgstr "Početak t_jedna:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:560
 msgid "Wednesday"
 msgstr "Srijeda"
 
@@ -4235,18 +4314,22 @@ 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"
@@ -4298,16 +4381,15 @@ 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"
@@ -4355,7 +4437,8 @@ 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
@@ -4383,8 +4466,7 @@ 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?"
@@ -4447,26 +4529,27 @@ 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
 msgid "Validation error: %s"
 msgstr "Greška pri provjeri: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
 msgid " to "
 msgstr "do"
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
 msgid " (Completed "
 msgstr "(Završeno "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
 msgid "Completed "
 msgstr "Završeno "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
 msgid " (Due "
 msgstr " (Do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
 msgid "Due "
 msgstr "Due "
 
@@ -4481,16 +4564,19 @@ 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"
 
@@ -4499,8 +4585,8 @@ msgstr "Stavka dnevnika - %s"
 msgid "No summary"
 msgstr "Nema sažetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1042
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Spremi kao..."
 
@@ -4508,7 +4594,8 @@ 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!"
@@ -4533,6 +4620,7 @@ msgid "Select destination source"
 msgstr "Izaberite "
 
 #: 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'?"
 
@@ -4541,6 +4629,7 @@ 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'?"
 
@@ -4549,6 +4638,7 @@ 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'?"
 
@@ -4557,14 +4647,17 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Sigurno želite izbrisati ovaj neimenovani unos u dnevnik?"
 
 #: 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?"
 
@@ -4628,7 +4721,7 @@ msgstr "Delegiraj za:"
 msgid "Enter Delegate"
 msgstr "Unesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
 msgid "Appointment"
 msgstr "Obveza"
 
@@ -4652,23 +4745,24 @@ msgstr "Raspored"
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: calendar/gui/dialogs/event-page.c:609 calendar/gui/dialogs/task-page.c:512
+#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
 msgid "Start date is wrong"
 msgstr "Početni datum je pogrešan"
 
-#: calendar/gui/dialogs/event-page.c:619
+#: calendar/gui/dialogs/event-page.c:616
 msgid "End date is wrong"
 msgstr "Završni datum je pogrešan"
 
-#: calendar/gui/dialogs/event-page.c:642
+#: calendar/gui/dialogs/event-page.c:639
 msgid "Start time is wrong"
 msgstr "Početno vrijeme je pogrešno"
 
-#: calendar/gui/dialogs/event-page.c:649
+#: calendar/gui/dialogs/event-page.c:646
 msgid "End time is wrong"
 msgstr "Završno vrijeme je pogrešno"
 
-#: calendar/gui/dialogs/event-page.c:1228
+#: calendar/gui/dialogs/event-page.c:1225
+#, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nije moguće otvoriti kalendar '%s'."
 
@@ -4743,8 +4837,8 @@ msgstr "_Početno vrijeme:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:745
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2086
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
 #: mail/mail-config.glade.h:82
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
@@ -4806,7 +4900,7 @@ msgid "Member"
 msgstr "Član"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1066 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4882,7 +4976,8 @@ 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
@@ -4903,7 +4998,8 @@ 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"
@@ -4953,10 +5049,6 @@ msgstr "ponavljanja"
 msgid "Date/Time"
 msgstr "Datum/vrijeme"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Dodaj"
-
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Svaki"
@@ -4986,6 +5078,7 @@ msgid "_No recurrence"
 msgstr "_Bez ponavljanja"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: composer/e-msg-composer-attachment-bar.c:444
 msgid "_Remove"
 msgstr "_Ukloni"
 
@@ -5027,7 +5120,7 @@ msgstr ""
 "\n"
 "Želite li spremiti izmjene?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
 msgid "_Discard Changes"
 msgstr "_Zanemari promjene"
 
@@ -5049,26 +5142,28 @@ 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
+#: calendar/gui/dialogs/task-details-page.c:402
 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"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: 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:210
-#: calendar/gui/print.c:2346
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
+#: calendar/gui/print.c:2341
 msgid "Completed"
 msgstr "Završeno"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:231
+#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:227
 #: mail/message-list.c:939
 msgid "High"
 msgstr "Visok"
@@ -5076,26 +5171,26 @@ 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:207 calendar/gui/print.c:2343
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
 msgid "In Progress"
 msgstr "Izvodi se"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:235
+#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:231
 #: mail/message-list.c:937
 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-tasks.c:233 mail/message-list.c:938
+#: calendar/gui/e-tasks.c:229 mail/message-list.c:938
 msgid "Normal"
 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:217
-#: calendar/gui/print.c:2340
+#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2335
 msgid "Not Started"
 msgstr "Nije započelo"
 
@@ -5134,15 +5229,17 @@ msgstr "Osnovno"
 msgid "Assignment"
 msgstr "Dodjela"
 
-#: calendar/gui/dialogs/task-page.c:485
+#: calendar/gui/dialogs/task-page.c:483
 msgid "Due date is wrong"
 msgstr "Datum za završetak je pogrešan"
 
-#: calendar/gui/dialogs/task-page.c:545
+#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "Datum isteka je prije datuma početka!"
 
-#: calendar/gui/dialogs/task-page.c:810
+#: calendar/gui/dialogs/task-page.c:808
+#, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nije moguće otvaranje zadataka u '%s'."
 
@@ -5150,8 +5247,8 @@ 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:994
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
+#: 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:46
 msgid "Description:"
 msgstr "Opis:"
@@ -5299,11 +5396,13 @@ msgstr "%s %s nakon završetka sastanka"
 msgid "%s at the end of the appointment"
 msgstr "%s na kraju sastanka"
 
-#: calendar/gui/e-alarm-list.c:538
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
 msgid "%s at %s"
 msgstr "%s kod %s"
 
-#: calendar/gui/e-alarm-list.c:544
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretača"
 
@@ -5381,28 +5480,28 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:932 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
 #: 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:932 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
 #: 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:979 calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1180
 #: 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:1664 camel/camel-gpg-context.c:1715
 #: camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2096
-#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2094
+#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Napoznato"
 
@@ -5418,28 +5517,28 @@ msgstr "Dodijeljeno"
 msgid "Deleting selected objects"
 msgstr "Brišem odabrane objekte"
 
-#: calendar/gui/e-cal-view.c:784 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Unosim promene u objekte"
 
-#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
 msgid "New _Appointment..."
 msgstr "Novi S_astanak..."
 
-#: calendar/gui/e-cal-view.c:1214 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
 msgid "New All Day _Event"
 msgstr "Novi cjelodnevni _događaj"
 
-#: calendar/gui/e-cal-view.c:1215 calendar/gui/e-cal-view.c:1302
+#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
 msgid "New Meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1304
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
 msgid "New Task"
 msgstr "Novi zadatak"
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1243
-#: calendar/gui/e-cal-view.c:1310 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
+#: calendar/gui/e-cal-view.c:1306 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
@@ -5447,66 +5546,66 @@ msgstr "Novi zadatak"
 msgid "_Print..."
 msgstr "_Ispis..."
 
-#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1250
-#: calendar/gui/e-cal-view.c:1308 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
+#: calendar/gui/e-cal-view.c:1304 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:1230 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "_Idi na Danas"
 
-#: calendar/gui/e-cal-view.c:1231 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
 msgid "_Go to Date..."
 msgstr "_Idi na datum..."
 
-#: calendar/gui/e-cal-view.c:1235 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi slobodnu/zauzetu informaciju"
 
-#: calendar/gui/e-cal-view.c:1242 calendar/gui/e-cal-view.c:1312
+#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:713 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Spremi Kao..."
 
-#: calendar/gui/e-cal-view.c:1248 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
 #: 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:1249 calendar/gui/e-cal-view.c:1286
+#: calendar/gui/e-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:1760 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2104 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:1254
+#: calendar/gui/e-cal-view.c:1250
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: calendar/gui/e-cal-view.c:1255
+#: calendar/gui/e-cal-view.c:1251
 msgid "_Forward as iCalendar..."
 msgstr "_Proslijedi kao iCalendar... "
 
-#: calendar/gui/e-cal-view.c:1260 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
-#: calendar/gui/e-cal-view.c:1314 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Postavke..."
 
@@ -5578,12 +5677,13 @@ msgstr "_Obilježi odabrane zadatke kao izvršene "
 msgid "_Delete Selected Tasks"
 msgstr "_Obriši odabrane zadatke"
 
-#: calendar/gui/e-calendar-table.c:1370
+#: calendar/gui/e-calendar-table.c:1368
 #: calendar/gui/e-calendar-table.etspec.h:6
 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"
 
@@ -5633,6 +5733,7 @@ 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"
@@ -5643,18 +5744,19 @@ 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.
+#. %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:1348
-#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1519
+#: 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.
+#. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1381
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -5662,403 +5764,431 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:602 calendar/gui/e-week-view.c:334
-#: calendar/gui/print.c:843
+#: 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:605 calendar/gui/e-week-view.c:337
-#: calendar/gui/print.c:845
+#: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:591
 msgid "Yes. (Complex Recurrence)"
 msgstr "Da. (Složeni povratak)"
 
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:603
 msgid "Every day"
 msgstr "svakim danom"
 
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:605
+#, c-format
 msgid "Every %d days"
 msgstr "Svakih %d dana"
 
-#: calendar/gui/e-itip-control.c:612
+#: calendar/gui/e-itip-control.c:611
 msgid "Every week"
 msgstr "Svakog tjedna"
 
-#: calendar/gui/e-itip-control.c:614
+#: calendar/gui/e-itip-control.c:613
+#, c-format
 msgid "Every %d weeks"
 msgstr "Svakih %d tjedana"
 
-#: calendar/gui/e-itip-control.c:617
+#: calendar/gui/e-itip-control.c:616
 msgid "Every week on "
 msgstr "Svake tjedna u "
 
-#: calendar/gui/e-itip-control.c:619
+#: 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:627
+#: calendar/gui/e-itip-control.c:626
 msgid " and "
 msgstr " i"
 
-#: calendar/gui/e-itip-control.c:634
+#: calendar/gui/e-itip-control.c:633
+#, c-format
 msgid "The %s day of "
 msgstr "%s dan "
 
-#: calendar/gui/e-itip-control.c:647
+#: calendar/gui/e-itip-control.c:646
+#, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:651
 msgid "every month"
 msgstr "svaki mjesec"
 
-#: calendar/gui/e-itip-control.c:657
+#: calendar/gui/e-itip-control.c:656
+#, c-format
 msgid "every %d months"
 msgstr "svakih %d mjeseci"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:662
 msgid "Every year"
 msgstr "Svake godine"
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:664
+#, c-format
 msgid "Every %d years"
 msgstr "Svakih %d godina"
 
-#: calendar/gui/e-itip-control.c:677
+#: 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:686
+#: calendar/gui/e-itip-control.c:685
 msgid ", ending on "
 msgstr ", završavajući sa "
 
-#: calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:709
 msgid "<b>Starts:</b> "
 msgstr "<b>Početak:</b> "
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:719
 msgid "<b>Ends:</b> "
 msgstr "<b>Kraj:</b> "
 
-#: calendar/gui/e-itip-control.c:740
+#: calendar/gui/e-itip-control.c:739
 msgid "<b>Completed:</b> "
 msgstr "<b>Završeno:</b> "
 
-#: calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:749
 msgid "<b>Due:</b> "
 msgstr "<b>Do:</b> "
 
-#: calendar/gui/e-itip-control.c:787 calendar/gui/e-itip-control.c:840
+#: calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:839
 msgid "iCalendar Information"
 msgstr "iCalendar informacije"
 
 #. Title
-#: calendar/gui/e-itip-control.c:802
+#: calendar/gui/e-itip-control.c:801
 msgid "iCalendar Error"
 msgstr "Greška iCalendara"
 
-#: calendar/gui/e-itip-control.c:871 calendar/gui/e-itip-control.c:887
-#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:915
+#: 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
 msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:922
+#: calendar/gui/e-itip-control.c:921
 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:937
+#: calendar/gui/e-itip-control.c:936
 msgid "<i>None</i>"
 msgstr "<i>Ništa</i>"
 
 #. write status
-#: calendar/gui/e-itip-control.c:962 calendar/gui/e-tasks.c:203
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-tasks.c:199
 msgid "Status:"
 msgstr "Stanje:"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:966 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:971 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:970 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
 
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:974 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:1034 calendar/gui/e-itip-control.c:1062
-#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-itip-control.c:1101
-#: calendar/gui/e-itip-control.c:1114 calendar/gui/e-itip-control.c:1127
+#: 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
 msgid "Choose an action:"
 msgstr "Odaberite akciju:"
 
-#: calendar/gui/e-itip-control.c:1035
+#: calendar/gui/e-itip-control.c:1034
 msgid "Update"
 msgstr "Ažuriraj"
 
-#: calendar/gui/e-itip-control.c:1036 calendar/gui/e-itip-control.c:1067
-#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1103
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/e-itip-control.c:1129
-#: shell/e-shell.c:1066 widgets/misc/e-cell-date-edit.c:265
+#: 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
+#: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "U redu"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1062
 msgid "Accept"
 msgstr "Prihvati"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1063
 msgid "Tentatively accept"
 msgstr "Prihvati sa rezervom"
 
-#: calendar/gui/e-itip-control.c:1065
+#: calendar/gui/e-itip-control.c:1064
 msgid "Decline"
 msgstr "Odbijanje"
 
-#: calendar/gui/e-itip-control.c:1089
+#: calendar/gui/e-itip-control.c:1088
 msgid "Send Free/Busy Information"
 msgstr "Pošalji slobodan/zauzet informaciju"
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1101
 msgid "Update respondent status"
 msgstr "Ažuriraj stanje stranke"
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1114
 msgid "Send Latest Information"
 msgstr "Pošalji najnoviju informaciju"
 
-#: calendar/gui/e-itip-control.c:1128 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Odustani"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1203
+#, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> je objavio podatke o sastanku."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Information"
 msgstr "Informacije o sastanku"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1209
+#, c-format
 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:1212
+#: calendar/gui/e-itip-control.c:1211
+#, c-format
 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:1213
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Proposal"
 msgstr "Prijedlog za sastanak"
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1216
+#, c-format
 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:1218
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update"
 msgstr "Ažuriranje sastanka"
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1221
+#, c-format
 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:1223
+#: calendar/gui/e-itip-control.c:1222
 msgid "Meeting Update Request"
 msgstr "Zahtjev za nove podatke o sastanku"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
 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:1231
+#: calendar/gui/e-itip-control.c:1230
 msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1237
+#, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je otkazo sastanak."
 
-#: calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1238
 msgid "Meeting Cancellation"
 msgstr "Otkaz sastanka"
 
-#: calendar/gui/e-itip-control.c:1246 calendar/gui/e-itip-control.c:1314
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1245 calendar/gui/e-itip-control.c:1313
+#: calendar/gui/e-itip-control.c:1348
+#, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> je poslao nerazumljivu poruku."
 
-#: calendar/gui/e-itip-control.c:1247
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Meeting Message"
 msgstr "Neispravna poruka o sastanku"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1271
+#, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> je objavio podatke o zadatku."
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Information"
 msgstr "Informacija o zadatku"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1277
+#, c-format
 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:1280
+#: calendar/gui/e-itip-control.c:1279
+#, c-format
 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:1281
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Proposal"
 msgstr "Prijedlog zadatka"
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1284
+#, c-format
 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:1286
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update"
 msgstr "Ažuriranje zadatka"
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1289
+#, c-format
 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:1291
+#: calendar/gui/e-itip-control.c:1290
 msgid "Task Update Request"
 msgstr "Zahtjev za osvježenje zadatka"
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1297
+#, c-format
 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:1299
+#: calendar/gui/e-itip-control.c:1298
 msgid "Task Reply"
 msgstr "Odgovor na zadatak"
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1305
+#, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je otkazao zadatak."
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1306
 msgid "Task Cancellation"
 msgstr "Otkazivanje zadatka"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1314
 msgid "Bad Task Message"
 msgstr "Neispravna poruka o zadatku"
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1333
+#, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> je objavio podatke o dostupnosti."
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Information"
 msgstr "Informacija slobodno/zauzeto"
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1338
+#, c-format
 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:1340
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Request"
 msgstr "Slobodan/zauzet zahtjev"
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1343
+#, c-format
 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:1345
+#: calendar/gui/e-itip-control.c:1344
 msgid "Free/Busy Reply"
 msgstr "Slobodan/zauzet odgovor"
 
-#: calendar/gui/e-itip-control.c:1350
+#: calendar/gui/e-itip-control.c:1349
 msgid "Bad Free/Busy Message"
 msgstr "Neispravna poruka o dostupnosti"
 
-#: calendar/gui/e-itip-control.c:1423
+#: calendar/gui/e-itip-control.c:1424
 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:1482
+#: calendar/gui/e-itip-control.c:1483
 msgid "The message contains only unsupported requests."
 msgstr "Poruka sadrži samo nepodržane zahtjeve."
 
-#: calendar/gui/e-itip-control.c:1513
+#: calendar/gui/e-itip-control.c:1514
 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:1543
+#: calendar/gui/e-itip-control.c:1544
 msgid "The attachment has no viewable calendar items"
 msgstr "Prilog nema dijelove kalendara koji se mogu pregledati"
 
-#: calendar/gui/e-itip-control.c:1774
+#: calendar/gui/e-itip-control.c:1775
 msgid "Calendar file could not be updated!\n"
 msgstr "Datoteka kalendara nije se mogla ažurirati!\n"
 
-#: calendar/gui/e-itip-control.c:1776
+#: calendar/gui/e-itip-control.c:1777
 msgid "Update complete\n"
 msgstr "Ažuriranje završeno\n"
 
-#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1878
+#: calendar/gui/e-itip-control.c:1807 calendar/gui/e-itip-control.c:1879
 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:1822 calendar/gui/e-itip-control.c:1860
+#: calendar/gui/e-itip-control.c:1823 calendar/gui/e-itip-control.c:1861
 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:1832
+#: calendar/gui/e-itip-control.c:1833
 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:1844
+#: calendar/gui/e-itip-control.c:1845
 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:1863
+#: calendar/gui/e-itip-control.c:1864
 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:1866
+#: calendar/gui/e-itip-control.c:1867
 msgid "Object could not be found\n"
 msgstr "Objekt se ne može naći\n"
 
-#: calendar/gui/e-itip-control.c:1869
+#: calendar/gui/e-itip-control.c:1870
 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:1872
+#: calendar/gui/e-itip-control.c:1873
 msgid "Attendee status updated\n"
 msgstr "Osvježeno stanje prisutne osobe\n"
 
-#: calendar/gui/e-itip-control.c:1875
+#: calendar/gui/e-itip-control.c:1876
 msgid "Attendee status could not be updated!\n"
 msgstr "Stanje prisutne osobe nije moglo biti osvježeno!\n"
 
-#: calendar/gui/e-itip-control.c:1906
+#: calendar/gui/e-itip-control.c:1907
 msgid "Removal Complete"
 msgstr "Uklanjanje završeno"
 
-#: calendar/gui/e-itip-control.c:1929 calendar/gui/e-itip-control.c:1977
+#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1978
 msgid "Item sent!\n"
 msgstr "Stavka poslana!\n"
 
-#: calendar/gui/e-itip-control.c:1931 calendar/gui/e-itip-control.c:1981
+#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:1982
 msgid "The item could not be sent!\n"
 msgstr "Unos nije mogao biti poslan!\n"
 
@@ -6176,14 +6306,14 @@ 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.
 #: 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
@@ -6191,7 +6321,7 @@ 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.
 #: 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
 msgid "%m/%d/%Y"
@@ -6257,30 +6387,31 @@ msgstr "Početno vrijeme _sastanka:"
 msgid "Meeting _end time:"
 msgstr "Završno vrijem_e sastanka:"
 
-#: calendar/gui/e-tasks.c:181
+#: calendar/gui/e-tasks.c:177
 msgid "Start Date:"
 msgstr "Početni datum"
 
-#: calendar/gui/e-tasks.c:197
+#: calendar/gui/e-tasks.c:193
 msgid "Due Date:"
 msgstr "Datum krajnjeg roka:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:225
+#: calendar/gui/e-tasks.c:221
 msgid "Priority:"
 msgstr "Prioritet:"
 
 #. URL
-#: calendar/gui/e-tasks.c:281
+#: calendar/gui/e-tasks.c:277
 msgid "Web Page:"
 msgstr "Internet stranica"
 
-#: calendar/gui/e-tasks.c:314 mail/em-folder-view.c:2137
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknite za otvaranje %s"
 
-#: calendar/gui/e-tasks.c:747 calendar/gui/gnome-cal.c:1887
+#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
@@ -6289,7 +6420,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:766 calendar/gui/gnome-cal.c:1908
+#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6297,11 +6428,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:846
+#: calendar/gui/e-tasks.c:835
+#, c-format
 msgid "Opening tasks at %s"
 msgstr "Otvaram zaduženja u %s"
 
-#: calendar/gui/e-tasks.c:867
+#: calendar/gui/e-tasks.c:856
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6310,32 +6442,28 @@ msgstr ""
 "Greška na %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:886
+#: calendar/gui/e-tasks.c:875
 msgid "Loading tasks"
 msgstr "Učitavanje zadataka"
 
-#: calendar/gui/e-tasks.c:988
+#: calendar/gui/e-tasks.c:977
 msgid "Completing tasks..."
 msgstr "Završavam zadatke..."
 
-#: calendar/gui/e-tasks.c:1011
+#: calendar/gui/e-tasks.c:1000
 msgid "Deleting selected objects..."
 msgstr "Brišem odabrane objekte..."
 
-#: calendar/gui/e-tasks.c:1036
+#: calendar/gui/e-tasks.c:1025
 msgid "Expunging"
 msgstr "Izbacujem"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1787
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Otvori u %s..."
 
-#: calendar/gui/gnome-cal.c:1763
-msgid "Could not open '%s': %s"
-msgstr "Ne mogu otvoriti '%s': %s"
-
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1936
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6343,7 +6471,7 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2803
+#: calendar/gui/gnome-cal.c:2799
 msgid "Purging"
 msgstr "Brisanje"
 
@@ -6368,41 +6496,42 @@ msgid "Go To Date"
 msgstr "Idi na datum"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Idi na danas"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Siječanj"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Srpanj"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Lipanj"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Ožujak"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Svibanj"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Studeni"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Listopad"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Rujan"
 
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Idi na danas"
+
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
 msgid "An organizer must be set."
@@ -6445,6 +6574,7 @@ 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)"
 
@@ -6486,235 +6616,242 @@ msgstr "Rođendani i obljetnice"
 msgid "On The Web"
 msgstr "Na webu"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:489
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:489
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:489
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:489
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:501
+#: calendar/gui/print.c:490
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:501
+#: calendar/gui/print.c:490
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:501
+#: calendar/gui/print.c:490
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:501
+#: calendar/gui/print.c:490
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:501
+#: calendar/gui/print.c:490
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:502
+#: calendar/gui/print.c:491
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:502
+#: calendar/gui/print.c:491
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:502
+#: calendar/gui/print.c:491
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:502
+#: calendar/gui/print.c:491
 msgid "14th"
 msgstr "14. "
 
-#: calendar/gui/print.c:502
+#: calendar/gui/print.c:491
 msgid "15th"
 msgstr "15. "
 
-#: calendar/gui/print.c:503
+#: calendar/gui/print.c:492
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:503
+#: calendar/gui/print.c:492
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:503
+#: calendar/gui/print.c:492
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:503
+#: calendar/gui/print.c:492
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:503
+#: calendar/gui/print.c:492
 msgid "20th"
 msgstr "20og"
 
-#: calendar/gui/print.c:504
+#: calendar/gui/print.c:493
 msgid "21st"
 msgstr "21og"
 
-#: calendar/gui/print.c:504
+#: calendar/gui/print.c:493
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:504
+#: calendar/gui/print.c:493
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:504
+#: calendar/gui/print.c:493
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:504
+#: calendar/gui/print.c:493
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:505
+#: calendar/gui/print.c:494
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:505
+#: calendar/gui/print.c:494
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:505
+#: calendar/gui/print.c:494
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:505
+#: calendar/gui/print.c:494
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:505
+#: calendar/gui/print.c:494
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:506
+#: calendar/gui/print.c:495
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:581
+#: calendar/gui/print.c:570
 msgid "Su"
 msgstr "Ne"
 
-#: calendar/gui/print.c:581
+#: calendar/gui/print.c:570
 msgid "Mo"
 msgstr "Mo"
 
-#: calendar/gui/print.c:581
+#: calendar/gui/print.c:570
 msgid "Tu"
 msgstr "Tu"
 
-#: calendar/gui/print.c:581
+#: calendar/gui/print.c:570
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:582
+#: calendar/gui/print.c:571
 msgid "Th"
 msgstr "Th"
 
-#: calendar/gui/print.c:582
+#: calendar/gui/print.c:571
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:582
+#: calendar/gui/print.c:571
 msgid "Sa"
 msgstr "Su"
 
 #. Day
-#: calendar/gui/print.c:1920
+#: calendar/gui/print.c:1915
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Odabrani dan (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1945 calendar/gui/print.c:1949
+#: calendar/gui/print.c:1940 calendar/gui/print.c:1944
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1946
+#: calendar/gui/print.c:1941
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1950 calendar/gui/print.c:1952
-#: calendar/gui/print.c:1953
+#: calendar/gui/print.c:1945 calendar/gui/print.c:1947
+#: calendar/gui/print.c:1948
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1957
+#: calendar/gui/print.c:1952
+#, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Odabrani tjedan (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1965
+#: calendar/gui/print.c:1960
 msgid "Selected month (%b %Y)"
 msgstr "Odabran mjesec (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1972
+#: calendar/gui/print.c:1967
 msgid "Selected year (%Y)"
 msgstr "Odabrana godina (%Y)"
 
-#: calendar/gui/print.c:2297
+#: calendar/gui/print.c:2292
 msgid "Task"
 msgstr "Zadatak"
 
-#: calendar/gui/print.c:2356
+#: calendar/gui/print.c:2351
+#, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: calendar/gui/print.c:2373
+#: calendar/gui/print.c:2368
+#, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s "
 
-#: calendar/gui/print.c:2385
+#: calendar/gui/print.c:2380
+#, c-format
 msgid "Percent Complete: %i"
 msgstr "Postotak završenog: %i"
 
-#: calendar/gui/print.c:2397
+#: calendar/gui/print.c:2392
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2411
+#: calendar/gui/print.c:2406
+#, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2417
 msgid "Contacts: "
 msgstr "Konatkti: "
 
-#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
+#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Pogled prije ispisa"
 
-#: calendar/gui/print.c:2593
+#: calendar/gui/print.c:2588
 msgid "Print Item"
 msgstr "Ispiši stavku"
 
-#: calendar/gui/print.c:2759
+#: calendar/gui/print.c:2754
 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:556
 msgid "New task"
@@ -6741,8 +6878,10 @@ msgid "Create a new task list"
 msgstr "Stvori novi popis zadataka"
 
 #: calendar/gui/tasks-component.c:632
+#, 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:644
 msgid "There is no calendar available for creating tasks"
@@ -6753,6 +6892,7 @@ 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"
 
@@ -6763,8 +6903,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?"
 
@@ -6800,15 +6940,20 @@ msgstr "iCalendar datoteke (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar datoteke (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:470
+#: calendar/importers/icalendar-importer.c:79
+#, fuzzy
+msgid "Appointments and Meetings"
+msgstr "Izbriši stare dogovore i sastanke"
+
+#: calendar/importers/icalendar-importer.c:495
 msgid "Reminder!!"
 msgstr "Podsjetnik!!"
 
-#: calendar/importers/icalendar-importer.c:710
+#: calendar/importers/icalendar-importer.c:703
 msgid "Calendar Events"
 msgstr "Kalendarski događaji"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:728
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6816,13 +6961,15 @@ msgstr ""
 "Evolution je pronašao datoteke GNOME kalendara.\n"
 "Želite li ih uvesti u Evolution?"
 
-#: calendar/importers/icalendar-importer.c:742
+#: calendar/importers/icalendar-importer.c:735
 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"
@@ -8376,10 +8523,12 @@ 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
 msgid ""
 "Could not write log entry: %s\n"
 "Further operations on this server will not be replayed when you\n"
@@ -8390,6 +8539,7 @@ msgstr ""
 "se budete ponovo povezali na mrežu."
 
 #: camel/camel-disco-diary.c:248
+#, c-format
 msgid ""
 "Could not open `%s':\n"
 "%s\n"
@@ -8412,6 +8562,7 @@ 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"
 
@@ -8421,15 +8572,18 @@ 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"
 
@@ -8438,10 +8592,12 @@ 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"
 
@@ -8454,6 +8610,7 @@ 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%%)"
 
@@ -8462,6 +8619,7 @@ 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"
 
@@ -8470,10 +8628,12 @@ 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"
 
@@ -8490,10 +8650,12 @@ 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"
@@ -8502,6 +8664,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-folder-search.c:358
+#, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
@@ -8514,18 +8677,22 @@ 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:586
+#: camel/camel-folder.c:584
+#, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepodržana operacija: priključena poruka: za %s"
 
 #: camel/camel-folder.c:1164
+#, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepodržana operacija: pretraga po izrazu: za %s"
 
 #: camel/camel-folder.c:1204
+#, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepodržana operacija: pretraga po uid-u: za %s"
 
@@ -8537,11 +8704,12 @@ msgstr "Premještam poruke"
 msgid "Copying messages"
 msgstr "Kopiram poruke"
 
-#: camel/camel-folder.c:1572
+#: camel/camel-folder.c:1571
 msgid "Filtering new message(s)"
 msgstr "Filtriranje novih poruka"
 
 #: camel/camel-gpg-context.c:709
+#, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
 "\n"
@@ -8560,6 +8728,7 @@ msgid "Failed to parse gpg passphrase request."
 msgstr "Nisam mogao pročitati zahtjev za gpg lozinkom"
 
 #: camel/camel-gpg-context.c:761
+#, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
@@ -8578,6 +8747,7 @@ 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:802
+#, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočekivan odgovor od GnuPG: %s"
 
@@ -8590,6 +8760,7 @@ msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nisam mogao dekriptirati: nisu označeni ispravni primatelji. "
 
 #: camel/camel-gpg-context.c:1129
+#, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
 "\n"
@@ -8600,15 +8771,18 @@ msgstr ""
 "%s"
 
 #: camel/camel-gpg-context.c:1134
+#, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nisam mogao primjeniti GPG %s: %s\n"
 
 #: camel/camel-gpg-context.c:1247 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:1261 camel/camel-gpg-context.c:1663
 #: camel/camel-gpg-context.c:1714
+#, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nisam mogao izvršiti gpg: %s"
 
@@ -8630,10 +8804,13 @@ msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ne mogu provjeriti potpis poruke: Neispravan format poruke"
 
 #: camel/camel-gpg-context.c:1402
+#, 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:1483
+#, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Ne mogu stvoriti podatke za kriptiranje: %s"
 
@@ -8650,63 +8827,79 @@ 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"
 
@@ -8715,14 +8908,17 @@ 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"
 
@@ -8738,15 +8934,18 @@ msgstr "Neuspješno dekodiran MIME dio: neispravna struktura"
 msgid "parse error"
 msgstr "greška pri parsiranju"
 
-#: camel/camel-provider.c:132
+#: camel/camel-provider.c:140
+#, 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:141
+#: camel/camel-provider.c:149
+#, c-format
 msgid "Could not load %s: %s"
 msgstr "Ne mogu učitati %s: %s"
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:157
+#, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ne mogu učitati %s: nema koda za pokretanje u modulu."
 
@@ -8763,6 +8962,7 @@ msgid "Authentication failed."
 msgstr "Neuspjelo spajanje."
 
 #: camel/camel-sasl-anonymous.c:121
+#, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
@@ -8771,6 +8971,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-anonymous.c:133
+#, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
@@ -8779,6 +8980,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-anonymous.c:145
+#, c-format
 msgid ""
 "Invalid trace information:\n"
 "%s"
@@ -8794,7 +8996,9 @@ 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"
@@ -8804,7 +9008,9 @@ 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"
@@ -8816,7 +9022,8 @@ 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"
@@ -8854,7 +9061,8 @@ 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 ""
@@ -8868,7 +9076,9 @@ 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 ""
@@ -8902,6 +9112,7 @@ 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"
 
@@ -8918,6 +9129,7 @@ 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"
@@ -8945,7 +9157,9 @@ 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"
@@ -8972,38 +9186,47 @@ 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"
 
@@ -9027,11 +9250,13 @@ msgstr "Ponuđač elktronske pošte sa virtualnim direktorijom"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Za čitanje pošte kao upita drugog niza mapa"
 
-#: camel/camel-session.c:351 camel/camel-session.c:401
+#: camel/camel-session.c:352 camel/camel-session.c:402
+#, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Nema dostupnog ponuđača za protokol `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:524
+#, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
@@ -9040,6 +9265,7 @@ 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'"
 
@@ -9084,23 +9310,29 @@ 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"
 
-#: camel/camel-store.c:217
+#: camel/camel-store.c:212
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ne mogu dobiti mapu: neispravna operacija"
 
-#: camel/camel-store.c:274
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne mogu napraviti mapu: neispravna operacija"
 
-#: camel/camel-store.c:796 mail/importers/netscape-importer.c:1842
+#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
+
+#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
 #: mail/mail-ops.c:1129
 msgid "Trash"
 msgstr "Smeće"
 
-#: camel/camel-store.c:798 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Smeće"
@@ -9222,6 +9454,7 @@ 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"
@@ -9242,6 +9475,7 @@ msgid "BAD"
 msgstr "LOŠ"
 
 #: camel/camel-tcp-stream-openssl.c:704
+#, c-format
 msgid ""
 "Bad certificate from %s:\n"
 "\n"
@@ -9261,6 +9495,7 @@ msgstr ""
 
 #. construct our user prompt
 #: camel/camel-tcp-stream-ssl.c:841
+#, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
 "\n"
@@ -9275,6 +9510,7 @@ msgstr ""
 "Želite li prihvatiti?"
 
 #: camel/camel-tcp-stream-ssl.c:885
+#, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
@@ -9283,6 +9519,7 @@ msgstr ""
 "Izdavač: %s"
 
 #: camel/camel-tcp-stream-ssl.c:937
+#, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
@@ -9291,6 +9528,7 @@ msgstr ""
 "Izdavač: %s"
 
 #: camel/camel-tcp-stream-ssl.c:955
+#, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
@@ -9299,6 +9537,7 @@ msgstr ""
 "Izdavač: %s"
 
 #: camel/camel-tcp-stream-ssl.c:972
+#, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
@@ -9307,34 +9546,36 @@ 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"
 
-#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
+#: camel/camel-vee-folder.c:815 camel/camel-vee-folder.c:821
 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:360
-msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
-
-#: camel/camel-vee-store.c:381
+#: camel/camel-vee-store.c:356
+#, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne mogu obrisati mapu: %s: nema takve mape"
 
-#: camel/camel-vee-store.c:394
+#: camel/camel-vee-store.c:369
+#, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
 
-#: camel/camel-vee-store.c:402
+#: camel/camel-vee-store.c:377
+#, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne mogu preimenovati mapu: %s: nema takve mape"
 
@@ -9394,7 +9635,7 @@ msgstr "Spajanje na IMAP poslužitelje korištenjem lozinke u čistom tekstu."
 #. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
 #: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1542 mail/em-folder-view.c:1580
+#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
 #: mail/mail-config.glade.h:42
 msgid "Default"
 msgstr "Uobičajeno"
@@ -9402,17 +9643,19 @@ msgstr "Uobičajeno"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2821
+#: camel/providers/imap/camel-imap-store.c:2827
 msgid "Operation cancelled"
 msgstr "Operacija je opozvana"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2824
+#: camel/providers/imap/camel-imap-store.c:2830
+#, c-format
 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:323
+#, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
@@ -9421,10 +9664,12 @@ msgstr ""
 "%s"
 
 #: camel/providers/imap/camel-imap-command.c:392
+#, 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:402
+#, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP naredba nije uspjela: %s"
 
@@ -9433,18 +9678,22 @@ msgid "Server response ended too soon."
 msgstr "Odgovor poslužitelja je prerano završen."
 
 #: camel/providers/imap/camel-imap-command.c:652
+#, 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:688
+#, 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"
 
@@ -9458,6 +9707,7 @@ msgid "Scanning for changed messages"
 msgstr "Tragam za promijenjenim porukama"
 
 #: camel/providers/imap/camel-imap-folder.c:1913
+#, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Ne mogu da pokupim poruku: %s"
 
@@ -9469,6 +9719,7 @@ 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"
@@ -9499,6 +9750,7 @@ 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"
 
@@ -9506,10 +9758,12 @@ 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"
 
@@ -9555,68 +9809,77 @@ 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:459
+#, c-format
 msgid "IMAP server %s"
 msgstr "IMAP poslužitelj %s"
 
 #: camel/providers/imap/camel-imap-store.c:461
+#, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP servis za %s na %s"
 
 #: camel/providers/imap/camel-imap-store.c:582
 #: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:236
+#: camel/providers/imapp/camel-imapp-store.c:233
 #: camel/providers/nntp/camel-nntp-store.c:140
-#: camel/providers/pop3/camel-pop3-store.c:177
+#: 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:584
-#: camel/providers/pop3/camel-pop3-store.c:179
+#: 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:599
 #: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imapp/camel-imapp-store.c:230
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
-#: camel/providers/pop3/camel-pop3-store.c:194
+#: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Povezivanje poništeno"
 
 #: camel/providers/imap/camel-imap-store.c:665
 #: camel/providers/imap/camel-imap-store.c:696
+#, c-format
 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:666
-#: camel/providers/pop3/camel-pop3-store.c:230
+#: 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:697
-#: camel/providers/pop3/camel-pop3-store.c:271
+#: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL pregovori nisu uspjeli"
 
 #: camel/providers/imap/camel-imap-store.c:834
+#, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Ne mogu se spojiti s naredbom \"%s\": %s"
 
 #: camel/providers/imap/camel-imap-store.c:1251
+#, c-format
 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:1261
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:349
+#: camel/providers/imapp/camel-imapp-store.c:346
+#, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sMolim unesite IMAP zaporku za %s@%s"
 
@@ -9625,6 +9888,7 @@ msgid "You didn't enter a password."
 msgstr "Niste unijeli lozinku."
 
 #: camel/providers/imap/camel-imap-store.c:1327
+#, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
@@ -9636,14 +9900,18 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:1674
 #: camel/providers/imap/camel-imap-store.c:1816
+#, c-format
 msgid "No such folder %s"
 msgstr "Nema takve mape %s"
 
 #: camel/providers/imap/camel-imap-store.c:2017
-msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
+#, 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\""
 
 #: camel/providers/imap/camel-imap-store.c:2029
+#, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nepoznata glavna mapa: %s"
 
@@ -9668,11 +9936,13 @@ 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:333
+#: camel/providers/imapp/camel-imapp-store.c:330
+#, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Ne mogu se spojiti na POP poslužitelj na %s "
 
@@ -9682,17 +9952,20 @@ msgstr "Indeksiranje sadržaja poruka"
 
 #. $HOME relative path + protocol string
 #: camel/providers/local/camel-local-folder.c:382
+#, c-format
 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
 msgid "mailbox:%s (%s)"
 msgstr "sandučić:%s (%s)"
 
 #. a full path + protocol
 #: camel/providers/local/camel-local-folder.c:393
+#, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
@@ -9717,8 +9990,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
@@ -9753,18 +10026,21 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:138
 #: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:331
+#: camel/providers/local/camel-mbox-store.c:335
 #: 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:170
 #: camel/providers/local/camel-local-store.c:238
+#, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne mogu dobiti mapu: %s: %s"
 
@@ -9773,34 +10049,40 @@ 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:198
+#, c-format
 msgid "Local mail file %s"
 msgstr "Lokalna datoteka pošte %s"
 
 #: camel/providers/local/camel-local-store.c:307
+#, 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:364
-#: camel/providers/local/camel-mbox-store.c:533
+#: camel/providers/local/camel-local-store.c:372
+#, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nisam mogao preimenovati '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:389
-#: camel/providers/local/camel-mbox-store.c:260
+#: camel/providers/local/camel-local-store.c:397
+#: camel/providers/local/camel-mbox-store.c:264
+#, 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:399
-#: camel/providers/local/camel-mbox-store.c:272
+#: camel/providers/local/camel-local-store.c:407
+#: camel/providers/local/camel-mbox-store.c:276
+#, 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:421
-#: camel/providers/local/camel-mbox-store.c:295
+#: camel/providers/local/camel-local-store.c:429
+#: camel/providers/local/camel-mbox-store.c:299
+#, c-format
 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:398
+#, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nisam mogao sačuvati sažetak: %s: %s"
 
@@ -9813,6 +10095,7 @@ 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"
 
@@ -9824,6 +10107,7 @@ msgstr "Neispravan sadržaj poruke"
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
 #: camel/providers/local/camel-spool-store.c:163
+#, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
@@ -9832,15 +10116,17 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:157
+#: camel/providers/local/camel-mbox-store.c:161
 #: camel/providers/local/camel-mh-store.c:209
 #: 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-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
 #: camel/providers/local/camel-spool-store.c:172
+#, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
@@ -9849,12 +10135,14 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:132
+#, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' nije maildir direktorij."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:205
 #: camel/providers/local/camel-mh-store.c:252
+#, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nisam mogao obrisati direktorij `%s': %s"
 
@@ -9865,11 +10153,13 @@ msgstr "nije maildir direktorij"
 #: camel/providers/local/camel-maildir-store.c:335
 #: 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
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Ne mogu otvoriti putanju maildir direktorija: %s: %s"
 
@@ -9891,10 +10181,12 @@ 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"
 
@@ -9903,12 +10195,14 @@ 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"
@@ -9924,7 +10218,8 @@ msgstr "Mapa izgleda nepopravljivo oštećena."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Sastavljanje poruke neuspjelo: Oštećeno sandučić?"
 
-#: camel/providers/local/camel-mbox-store.c:149
+#: camel/providers/local/camel-mbox-store.c:153
+#, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
@@ -9932,7 +10227,8 @@ msgstr ""
 "Nisam mogao otvoriti datoteku `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:166
+#: camel/providers/local/camel-mbox-store.c:170
+#, c-format
 msgid ""
 "Could not create directory `%s':\n"
 "%s"
@@ -9940,7 +10236,8 @@ msgstr ""
 "Ne mogu stvoriti direktorij `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:178
+#: camel/providers/local/camel-mbox-store.c:182
+#, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
@@ -9948,14 +10245,16 @@ msgstr ""
 "Nisam mogao napraviti datoteku `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:188
-#: camel/providers/local/camel-mbox-store.c:231
+#: camel/providers/local/camel-mbox-store.c:192
+#: camel/providers/local/camel-mbox-store.c:235
+#, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' nije regularna datoteka."
 
-#: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mbox-store.c:223
-#: camel/providers/local/camel-mbox-store.c:246
+#: camel/providers/local/camel-mbox-store.c:216
+#: camel/providers/local/camel-mbox-store.c:227
+#: camel/providers/local/camel-mbox-store.c:250
+#, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
@@ -9963,72 +10262,84 @@ msgstr ""
 "isam mogao obrisati mapu `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:238
+#: camel/providers/local/camel-mbox-store.c:242
+#, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mapa `%s' nije prazna. Nije obrisana."
 
-#: camel/providers/local/camel-mbox-store.c:337
+#: camel/providers/local/camel-mbox-store.c:341
 msgid "Cannot create a folder by this name."
 msgstr "Ne mogu stvoriti mapu s ovim imenom."
 
-#: camel/providers/local/camel-mbox-store.c:350
+#: camel/providers/local/camel-mbox-store.c:354
+#, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Ne mogu otvoriti direktorij  `%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:364
+#: camel/providers/local/camel-mbox-store.c:368
+#, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Ne mogu stvoriti mapu: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:366
+#: camel/providers/local/camel-mbox-store.c:370
 msgid "Folder already exists"
 msgstr "Mapa već postoji"
 
-#: camel/providers/local/camel-mbox-store.c:435
-msgid "Could not rename %s to %s: %s"
-msgstr "Ne mogu preimenovati direktorij %s u %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:454
+#: camel/providers/local/camel-mbox-store.c:452
 msgid "The new folder name is illegal."
 msgstr "Ime nove mape je neispravno."
 
-#: camel/providers/local/camel-mbox-store.c:467
+#: camel/providers/local/camel-mbox-store.c:465
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Nisam mogao preimenovati '%s': %s"
 
+#: camel/providers/local/camel-mbox-store.c:540
+#, fuzzy, c-format
+msgid "Could not rename '%s' to %s: %s"
+msgstr "Ne mogu preimenovati direktorij %s u %s: %s"
+
 #: camel/providers/local/camel-mbox-summary.c:343
+#, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nisam mogao otvoriti direktorij: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:391
+#, 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:447
+#, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ne mogu provjeriti mapu: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:515
 #: camel/providers/local/camel-mbox-summary.c:606
 #: 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:527
 #: 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:540
 #: camel/providers/local/camel-mbox-summary.c:704
+#, 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:549
+#, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nisam mogao zatvoriti temp mapu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1521
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisam mogao preimenovati direktorij: %s"
 
@@ -10041,19 +10352,23 @@ msgstr "Neslaganje sažetka i direktorija, čak i nakon sinhronizacije"
 
 #: camel/providers/local/camel-mbox-summary.c:779
 #: 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:814
+#, c-format
 msgid "Could not store folder: %s"
 msgstr "Nisam mogao spremiti direktorij: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:908
 #: camel/providers/local/camel-mbox-summary.c:934
+#, 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:925
+#, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Pisanje u tmp poštanskog pretinca neuspjelo: %s: %s"
 
@@ -10062,30 +10377,37 @@ 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:229
+#, c-format
 msgid "`%s' is not a directory."
 msgstr "`%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:180
+#, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "`%s' nije mailbox datoteka."
 
@@ -10094,10 +10416,12 @@ 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"
 
@@ -10112,16 +10436,19 @@ 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'"
@@ -10131,6 +10458,7 @@ 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"
 
@@ -10162,11 +10490,13 @@ 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"
 
@@ -10197,7 +10527,8 @@ msgstr "Greška pri čitanju odgovora na poslanu poruku: poruka nije poslana"
 #: camel/providers/nntp/camel-nntp-folder.c:432
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
-msgstr """Greška kod automatskog spremanja poruke: %s\n"
+msgstr ""
+"Greška kod automatskog spremanja poruke: %s\n"
 " %s"
 
 #: camel/providers/nntp/camel-nntp-folder.c:448
@@ -10214,16 +10545,20 @@ 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"
@@ -10244,14 +10579,17 @@ 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"
 
@@ -10291,7 +10629,9 @@ 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."
@@ -10299,7 +10639,9 @@ 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:229
 #, fuzzy, c-format
@@ -10307,10 +10649,12 @@ msgid "Connection error: %s"
 msgstr "Nepoznata greška: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:240
+#, c-format
 msgid "No such folder: %s"
 msgstr "Nema takve mape: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:246
+#, c-format
 msgid "Could not get group: %s"
 msgstr "Ne mogu dobiti grupu: %s"
 
@@ -10319,15 +10663,18 @@ msgid "Could not get messages: unspecificed error"
 msgstr "Ne mogu dohvatiti poruke: nenavedena greška"
 
 #: camel/providers/nntp/camel-nntp-summary.c:356
+#, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP komanda nije uspjela: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:416
 #: camel/providers/nntp/camel-nntp-summary.c:517
+#, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Tražim nove poruke"
 
 #: camel/providers/nntp/camel-nntp-summary.c:532
+#, c-format
 msgid "Unknown server response: %s"
 msgstr "Nepoznat odgovor poslužitelja: %s"
 
@@ -10336,6 +10683,7 @@ msgid "Use cancel"
 msgstr "Koristite poništi"
 
 #: camel/providers/nntp/camel-nntp-summary.c:581
+#, c-format
 msgid "Operation failed: %s"
 msgstr "Neuspjela operacija: %s"
 
@@ -10344,6 +10692,7 @@ 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"
 
@@ -10352,12 +10701,14 @@ 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)"
 
@@ -10370,6 +10721,7 @@ 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"
 
@@ -10389,7 +10741,9 @@ 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 ""
@@ -10397,50 +10751,60 @@ 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:197
+#: 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:229
-#: camel/providers/pop3/camel-pop3-store.c:258
-#: camel/providers/pop3/camel-pop3-store.c:270
+#: 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:368
+#: 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:409
-#: camel/providers/pop3/camel-pop3-store.c:523
+#: 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:425
+#: 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:437
+#: 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:456
+#: 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:482
+#: camel/providers/pop3/camel-pop3-store.c:480
+#, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:537
-#: camel/providers/pop3/camel-pop3-store.c:544
+#: 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"
@@ -10448,7 +10812,8 @@ msgstr ""
 "Nisam mogao da se povežem na POP poslužitelj %s.\n"
 "Greška kod slanja zaporke: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:643
+#: camel/providers/pop3/camel-pop3-store.c:641
+#, c-format
 msgid "No such folder `%s'."
 msgstr "Nema takve mape `%s'."
 
@@ -10461,33 +10826,40 @@ 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"
 
@@ -10613,14 +10985,17 @@ 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"
 
@@ -10629,14 +11004,17 @@ msgid "STARTTLS response error"
 msgstr "STARTTLS greška u odgovoru"
 
 #: 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
 msgid "%sPlease enter the SMTP password for %s on host %s"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:533
+#, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
 "%s\n"
@@ -10647,10 +11025,12 @@ 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"
 
@@ -10675,6 +11055,7 @@ 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"
 
@@ -10692,6 +11073,7 @@ 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"
 
@@ -10704,6 +11086,7 @@ 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"
 
@@ -10712,33 +11095,40 @@ msgid "MAIL FROM response error"
 msgstr "MAIL FROM pogrešan odgovor"
 
 #: 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:1218
+#, c-format
 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"
 
 #. we should have gotten instructions on how to use the DATA command:
-#.  * 354 Enter mail, end with "." on a line by itself
+#. * 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"
+msgstr ""
+"DATA slanju isteklo je vrijeme: završetak poruke: %s: poruka nije poslana"
 
 #: 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:1384
+#, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET zahtjevu je isteklo vrijeme: %s"
 
@@ -10747,6 +11137,7 @@ msgid "RSET response error"
 msgstr "RSET greška u odazivu"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1427
+#, c-format
 msgid "QUIT request timed out: %s"
 msgstr "QUIT zahtjevu je isteklo vrijeme: %s"
 
@@ -10755,18 +11146,21 @@ msgid "QUIT response error"
 msgstr "QUIT pogrešan odgovor"
 
 #: composer/e-msg-composer-attachment-bar.c:103
+#, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
 #: composer/e-msg-composer-attachment-bar.c:106
+#, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
 #: composer/e-msg-composer-attachment-bar.c:109
+#, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1475
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
 msgid "attachment"
 msgstr "prilog"
 
@@ -10774,20 +11168,22 @@ msgstr "prilog"
 msgid "Remove selected items from the attachment list"
 msgstr "Ukloni odabrane predmete sa liste priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Add attachment..."
 msgstr "Dodaj prilog..."
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:477
 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"
 
@@ -10824,21 +11220,27 @@ msgstr "Odaberi mape u koje će se poslati poruka."
 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.
+#. *
+#. * 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
 msgid "Reply-To:"
 msgstr "Odgovor na:"
 
+#.
 #. * From
+#.
 #: composer/e-msg-composer-hdrs.c:578
 msgid "From:"
 msgstr "Od:"
 
+#.
 #. * Subject
+#.
 #: composer/e-msg-composer-hdrs.c:584
 msgid "Subject:"
 msgstr "Tema:"
@@ -10867,9 +11269,13 @@ msgstr "Bcc:"
 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
 msgid "Post To:"
 msgstr "Oglasi na:"
@@ -10883,18 +11289,22 @@ msgid "Attach file(s)"
 msgstr "Priloži datoteku(e)"
 
 #: composer/e-msg-composer.c:656
-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:662
 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:793
+#, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
@@ -10902,27 +11312,31 @@ msgstr ""
 "Greška kod čitanja datoteke %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1163
 msgid "File exists, overwrite?"
 msgstr "Datoteka postoji, prepisai preko nje?"
 
-#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
+#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#, c-format
 msgid "Error saving file: %s"
 msgstr "Greška kod spremanja datoteke: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1214
+#, c-format
 msgid "Error loading file: %s"
 msgstr "Greška kod učitavanja datoteke: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1252
+#, c-format
 msgid "Error accessing file: %s"
 msgstr "Greška kod pristupa datoteci: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1260
 msgid "Unable to retrieve message from editor"
 msgstr "Ne mogu da povratim poruku iz urednika"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1267
+#, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
@@ -10930,7 +11344,8 @@ msgstr ""
 "Ne mogu da tražim datoteku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1274
+#, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
@@ -10938,7 +11353,8 @@ msgstr ""
 "Ne mogu da skratim datoteku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1283
+#, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
@@ -10946,7 +11362,8 @@ msgstr ""
 "Ne mogu kopirati opis datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1292
+#, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
@@ -10954,7 +11371,7 @@ msgstr ""
 "Greška kod automatskog spremanja poruke: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1396
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10962,7 +11379,8 @@ msgstr ""
 "Ximian Evolution je našao nespremljene datoteke iz prethodnih sesija.\n"
 "Želite li ih pokušati povratiti?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1560
+#, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
 "\n"
@@ -10972,43 +11390,42 @@ msgstr ""
 "\n"
 "Želite li da sačuvam promjene?"
 
-#: composer/e-msg-composer.c:1567
+#: composer/e-msg-composer.c:1569
 msgid "Warning: Modified Message"
 msgstr "Upozorenje: izmjenjena poruka"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1602
 msgid "Open file"
 msgstr "Otvori datoteku"
 
-#: composer/e-msg-composer.c:2045
+#: composer/e-msg-composer.c:2047
 msgid "Signature:"
 msgstr "Potpis:"
 
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Automatski stvoren"
 
-#. plural form
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2265
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] "------"
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2294
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Sakrij traku s privitcima (ubacite privitke ovdje)"
 
-#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3154
+#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Prikaži Traku s privicima (ovdje ubaciti privitke)"
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3038
-#: composer/e-msg-composer.c:3039
+#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
+#: composer/e-msg-composer.c:3041
 msgid "Compose a message"
 msgstr "Sastavi poruku"
 
-#: composer/e-msg-composer.c:3070
+#: composer/e-msg-composer.c:3072
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11016,7 +11433,7 @@ msgstr ""
 "Ne mogu kreirati prozor za sastavljanje:\n"
 "Ne mogu pokrenuti kontrolu biranja adresa."
 
-#: composer/e-msg-composer.c:3099
+#: composer/e-msg-composer.c:3101
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11028,7 +11445,7 @@ msgstr ""
 "Molim vas da provjerite imate li odgovarajuće inačice\n"
 "gtkhtml i libgtkhtml na sistemu.\n"
 
-#: composer/e-msg-composer.c:3199
+#: composer/e-msg-composer.c:3201
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11036,7 +11453,7 @@ msgstr ""
 "Ne mogu kreirati prozor za sastavljanje:\n"
 "Ne mogu aktivirati komponentu HTML urednika."
 
-#: composer/e-msg-composer.c:4220
+#: composer/e-msg-composer.c:4222
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11125,7 +11542,11 @@ 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\nodrediti š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\n"
+"odrediti š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"
@@ -11155,7 +11576,8 @@ 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
 msgid ""
@@ -11186,25 +11608,25 @@ 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.
 #: 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.
 #: 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"
@@ -11220,25 +11642,25 @@ 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"
@@ -11254,7 +11676,7 @@ msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
-#.  in 12-hour format.
+#. in 12-hour format.
 #: 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
 msgid "%I:%M %p"
@@ -11364,6 +11786,7 @@ msgid "You must specify a file name."
 msgstr "Morate dati ime datoteci."
 
 #: filter/filter-file.c:184
+#, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Datoteka '%s' ne postoji ili nije regularna."
 
@@ -11385,7 +11808,8 @@ msgstr "Morate odrediti mapu."
 msgid "Select Folder"
 msgstr "Označi mapu"
 
-#: filter/filter-input.c:191
+#: filter/filter-input.c:193
+#, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
@@ -11649,11 +12073,11 @@ msgstr "je"
 
 #: filter/libfilter-i18n.h:28
 msgid "is after"
-msgstr "Prenosim podatke sa %1$S
-"
+msgstr "Prenosim podatke sa %1$S\r"
 
 #: filter/libfilter-i18n.h:29
 msgid "is before"
-msgstr "Šaljem zahtjev na %1$S
-"
+msgstr "Šaljem zahtjev na %1$S\r"
 
 #: filter/libfilter-i18n.h:30
 msgid "is Flagged"
@@ -11680,7 +12104,7 @@ msgstr "nije označen"
 msgid "Junk Test"
 msgstr "Lipanj"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:744
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Oznaka"
@@ -11768,7 +12192,7 @@ msgstr "Veličina (kB)"
 
 #: filter/libfilter-i18n.h:58
 msgid "sounds like"
-msgstr "zvuči kao
-"
+msgstr "zvuči kao\r"
 
 #: filter/libfilter-i18n.h:59
 msgid "Source Account"
@@ -11797,7 +12221,8 @@ msgid "Unset Status"
 msgstr "Nedodeljen status"
 
 #: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:978
+#: mail/mail-vfolder.c:1005
+#, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Ime pravila '%s' nije jedinstveno, odaberite drugo."
 
@@ -11870,7 +12295,8 @@ 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
@@ -11909,7 +12335,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:811
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
 #: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
 #: mail/importers/pine-importer.c:572
 msgid "Mail"
@@ -11970,6 +12396,7 @@ 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"
@@ -11992,8 +12419,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."
@@ -12005,8 +12432,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
@@ -12021,10 +12448,32 @@ 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:132
+#: mail/em-folder-browser.c:133
 msgid "Create _Virtual Folder From Search..."
 msgstr "Napravi _Virtualnu mapu iz pretrage..."
 
+#: mail/em-folder-properties.c:120
+msgid "Folder properties"
+msgstr "Svojstva mape"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-properties.c:126
+msgid "Properties"
+msgstr "Svojstva"
+
+#. TODO: can this be done in a loop?
+#: mail/em-folder-properties.c:135
+msgid "Folder Name"
+msgstr "Naziv mape"
+
+#: mail/em-folder-properties.c:146
+msgid "Total messages"
+msgstr "Ukupno poruka"
+
+#: mail/em-folder-properties.c:158
+msgid "Unread messages"
+msgstr "Nepročitane poruke"
+
 #: mail/em-folder-selection-button.c:120
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
@@ -12034,378 +12483,364 @@ msgstr "<kliknite ovdje za odabir mape>"
 msgid "Create New Folder"
 msgstr "Napravi novi direktorij"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1298
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
 #: 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:271
+#: mail/em-folder-selector.c:260
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Ime mape:"
 
 #. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:201 mail/em-folder-tree-model.c:203
-#: mail/mail-component.c:164
+#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
+#: mail/mail-component.c:170
 msgid "On this Computer"
 msgstr "Na ovom računalu"
 
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-#: mail/mail-vfolder.c:826
+#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
+#: mail/mail-vfolder.c:853
 msgid "VFolders"
 msgstr "VFolder-i"
 
-#: mail/em-folder-tree-model.c:215 mail/em-folder-tree-model.c:217
+#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
 msgid "UNMATCHED"
 msgstr "Neupariv"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:243 mail/em-folder-tree-model.c:245
+#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
 #: shell/e-shortcuts.c:1085
 msgid "Inbox"
 msgstr "Dolazna pošta"
 
-#: mail/em-folder-tree-model.c:488 mail/em-folder-tree-model.c:771
+#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
 msgid "Loading..."
 msgstr "Učitavam..."
 
-#: mail/em-folder-tree-model.c:1339 mail/em-utils.c:2087
-msgid "Could not create temporary directory: %s"
-msgstr "Nisam mogao napraviti privremeni direktorij: %s"
-
-#: mail/em-folder-tree-model.c:1348
-msgid "Could not create temporary mbox store: %s"
-msgstr "Ne mogu stvoriti privremenu mbox pohranu: %s"
-
-#: mail/em-folder-tree-model.c:1357
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Ne mogu stvoriti privremenu mbox mapu: %s"
-
-#: mail/em-folder-tree-model.c:1372
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Ne mogu kopirati poruke u privremenu mbox mapu: %s"
+#: mail/em-folder-tree.c:818
+#, fuzzy
+msgid "Cannot drop message(s) into toplevel store"
+msgstr "Ne mogu kopirati ili premjestiti poruke u Virtualnu Mapu"
 
-#: mail/em-folder-tree.c:1176 mail/em-folder-tree.c:1263
+#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1192 mail/em-folder-tree.c:1205
-#: mail/em-folder-view.c:621 mail/em-folder-view.c:635
-#: shell/e-shell-importer.c:1060
+#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
+#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
 msgid "Select folder"
 msgstr "Izaberite direktorij"
 
-#: mail/em-folder-tree.c:1298
+#: mail/em-folder-tree.c:1843
 msgid "Create folder"
 msgstr "Napravi mapu"
 
-#: mail/em-folder-tree.c:1417
+#: mail/em-folder-tree.c:1962
+#, c-format
 msgid "Could not delete folder: %s"
 msgstr "Ne mogu obrisati mapu: %s"
 
-#: mail/em-folder-tree.c:1438
+#: mail/em-folder-tree.c:1983
+#, c-format
 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:1448 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#, c-format
 msgid "Delete \"%s\""
 msgstr "Obriši \"%s\""
 
-#: mail/em-folder-tree.c:1482 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj mapu „%s“ u:"
 
-#: mail/em-folder-tree.c:1484 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
 msgid "Rename Folder"
 msgstr "Preimenuj mapu"
 
-#: mail/em-folder-tree.c:1508 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#, c-format
 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:1608
-msgid "Folder properties"
-msgstr "Svojstva mape"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-tree.c:1614
-msgid "Properties"
-msgstr "Svojstva"
-
-#. TODO: can this be done in a loop?
-#: mail/em-folder-tree.c:1623
-msgid "Folder Name"
-msgstr "Naziv mape"
-
-#: mail/em-folder-tree.c:1634
-msgid "Total messages"
-msgstr "Ukupno poruka"
-
-#: mail/em-folder-tree.c:1646
-msgid "Unread messages"
-msgstr "Nepročitane poruke"
-
-#: mail/em-folder-tree.c:1755 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2099 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:1756
+#: mail/em-folder-tree.c:2100
 msgid "Open in _New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: mail/em-folder-tree.c:1761
+#: mail/em-folder-tree.c:2105
 msgid "_Move"
 msgstr "_Pomakni"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:1765
+#: mail/em-folder-tree.c:2109
 msgid "_New Folder..."
 msgstr "_Novi direktorij..."
 
-#: mail/em-folder-tree.c:1768 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
 msgid "_Rename"
 msgstr "_Promijeni ime"
 
-#: mail/em-folder-tree.c:1771 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2115 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:712 mail/em-popup.c:658
+#: mail/em-folder-view.c:748 mail/em-popup.c:658
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: mail/em-folder-view.c:714
+#: mail/em-folder-view.c:750
 msgid "_Print"
 msgstr "_Ispis"
 
-#: mail/em-folder-view.c:717 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/em-folder-view.c:718 mail/em-popup.c:778
+#: mail/em-folder-view.c:754 mail/em-popup.c:778
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Odgovori na _popis"
 
-#: mail/em-folder-view.c:719 mail/em-popup.c:779
+#: mail/em-folder-view.c:755 mail/em-popup.c:779
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "_Odgovori svima"
 
-#: mail/em-folder-view.c:720 mail/em-popup.c:781
+#: mail/em-folder-view.c:756 mail/em-popup.c:781
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Naprijed"
 
-#: mail/em-folder-view.c:723
+#: mail/em-folder-view.c:759
 msgid "Follo_w Up..."
 msgstr "Pr_ati..."
 
-#: mail/em-folder-view.c:724
+#: mail/em-folder-view.c:760
 msgid "Fla_g Completed"
 msgstr "Označ_i završene"
 
-#: mail/em-folder-view.c:725
+#: mail/em-folder-view.c:761
 msgid "Cl_ear Flag"
 msgstr "Ukloni oznaku"
 
-#: mail/em-folder-view.c:728 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Označi kao pročitano"
 
-#: mail/em-folder-view.c:729
+#: mail/em-folder-view.c:765
 msgid "Mark as _Unread"
 msgstr "Označi kao nepročitano"
 
-#: mail/em-folder-view.c:730
+#: mail/em-folder-view.c:766
 msgid "Mark as _Important"
 msgstr "Označ_i kao važno"
 
-#: mail/em-folder-view.c:731
+#: mail/em-folder-view.c:767
 msgid "_Mark as Unimportant"
 msgstr "_Označi kao nebitno "
 
-#: mail/em-folder-view.c:732 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr "Označi kao smeće"
 
-#: mail/em-folder-view.c:733 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr "Označi da nije smeće"
 
-#: mail/em-folder-view.c:737
+#: mail/em-folder-view.c:773
 msgid "U_ndelete"
 msgstr "_Poništi brisanje"
 
-#: mail/em-folder-view.c:740
+#: mail/em-folder-view.c:776
 msgid "Mo_ve to Folder..."
 msgstr "_Premjesti u mapu..."
 
-#: mail/em-folder-view.c:741 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj u mapu..."
 
-#: mail/em-folder-view.c:749
+#: mail/em-folder-view.c:785
 msgid "Add Sender to Address_book"
 msgstr "Dodaj pošiljaoca u adresa_r"
 
-#: mail/em-folder-view.c:752
+#: mail/em-folder-view.c:788
 msgid "Appl_y Filters"
 msgstr "Pri_mjeni filtere"
 
-#: mail/em-folder-view.c:755
+#: mail/em-folder-view.c:791
 msgid "Crea_te Rule From Message"
 msgstr "Na_pravi pravilo od poruke"
 
-#: mail/em-folder-view.c:756
+#: mail/em-folder-view.c:792
 msgid "VFolder on _Subject"
 msgstr "VFolder na _Naslov"
 
-#: mail/em-folder-view.c:757
+#: mail/em-folder-view.c:793
 msgid "VFolder on Se_nder"
 msgstr "VFolder na P_ošiljaoca"
 
-#: mail/em-folder-view.c:758
+#: mail/em-folder-view.c:794
 msgid "VFolder on _Recipients"
 msgstr "VFolder na _Primaoce"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:795
 msgid "VFolder on Mailing _List"
 msgstr "VFolder na dopisnu _listu "
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:797
 msgid "VFolder on Thread"
 msgstr "VFolder na niti"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:801
 msgid "Filter on Sub_ject"
 msgstr "Filter na Sub_jekt"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:802
 msgid "Filter on Sen_der"
 msgstr "Filter na P_ošiljatelja"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:803
 msgid "Filter on Re_cipients"
 msgstr "Filter na Pri_matelje"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:804
 msgid "Filter on _Mailing List"
 msgstr "Filter na _Dopisni popis"
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:806
 msgid "Filter on Thread"
 msgstr "Filtar na niti"
 
-#: mail/em-folder-view.c:1616
+#: mail/em-folder-view.c:1652
 msgid "Print Message"
 msgstr "Ispiši poruku"
 
-#: mail/em-folder-view.c:1870
+#: mail/em-folder-view.c:1906
 msgid "_Copy Link Location"
 msgstr "_Kopiraj lokaciju veze"
 
-#: mail/em-folder-view.c:2132
+#: mail/em-folder-view.c:2168
 #, 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:404
+#: mail/em-format-html-display.c:403
+#, c-format
 msgid "Matches: %d"
 msgstr "Poklapanja: %d"
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr "Nepotpisano"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
 msgid ""
 "This message is not signed.  There is no guarantee the sender of the 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 autentičan."
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr "Ispravni potpis"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "This message is signed and is valid, the sender of this message is very "
 "likely who they claim to be."
-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 koji "
+"tvrdi da jest."
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr "Neispravni potpis"
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:643 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr "Ispravni potpis, ne mogu provjeriti pošiljatelja"
 
-#: mail/em-format-html-display.c:643
+#: mail/em-format-html-display.c:642
 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:649 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr "Nekriptirano"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr "Kriptirano, slaba enkripcija"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr "Šifrirano"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:652 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr "Kriptirano, jaka enkripcija"
 
-#: mail/em-format-html-display.c:652
+#: mail/em-format-html-display.c:651
 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:736
+#: mail/em-format-html-display.c:735
 msgid "_View Certificate"
 msgstr "Po_gledaj certifikat"
 
-#: mail/em-format-html-display.c:741
+#: mail/em-format-html-display.c:740
 msgid "This certificate is not viewable"
 msgstr "Ovaj potvrda nije vidljiva"
 
@@ -12430,10 +12865,12 @@ msgid "_Hide"
 msgstr "_Sakrij"
 
 #: mail/em-format-html-print.c:99
+#, 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'"
 
@@ -12442,22 +12879,27 @@ 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) "
 
@@ -12506,32 +12948,32 @@ msgstr ""
 msgid "Date"
 msgstr "Datum"
 
-#: mail/em-format.c:964
+#: mail/em-format.c:963
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
 
-#: mail/em-format.c:1043 mail/em-format.c:1162
+#: mail/em-format.c:1042 mail/em-format.c:1161
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Ne mogu parsirati S/MIME poruku: Nepoznata greška"
 
-#: mail/em-format.c:1152
+#: mail/em-format.c:1151
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1296
+#: mail/em-format.c:1295
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nisam mogao obraditi MIME poruku. Pokazujem kao izvor."
 
-#: mail/em-format.c:1313
+#: mail/em-format.c:1312
 msgid "Unsupported signature format"
 msgstr "Nepodržani format potpisa"
 
-#: mail/em-format.c:1321
+#: mail/em-format.c:1320
 msgid "Unknown error verifying signature"
 msgstr "Nepoznata greška pri provjeri potpisa"
 
-#: mail/em-junk-filter.c:72
+#: mail/em-junk-filter.c:76
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (ugrađeni)"
 
@@ -12542,7 +12984,8 @@ 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..."
 
@@ -12557,10 +13000,12 @@ msgid "Failed to migrate folder expand state: %s"
 msgstr "Neuspjelo stvaranje veze ka '%s': %s"
 
 #: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Nije uspjelo stvaranje direktorija `%s': %s"
 
 #: mail/em-migrate.c:2140
+#, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Nisam uspio otvoriti spremište za `%s': %s"
 
@@ -12569,6 +13014,7 @@ msgid "Save As..."
 msgstr "Snimi kao..."
 
 #: mail/em-popup.c:686
+#, c-format
 msgid "untitled_image.%s"
 msgstr "nenaslovljena_slika.%s"
 
@@ -12593,6 +13039,7 @@ msgid "_Add to Addressbook"
 msgstr "_Dodaj u adresar"
 
 #: mail/em-popup.c:933
+#, c-format
 msgid "Open in %s..."
 msgstr "Otvori u %s..."
 
@@ -12622,6 +13069,7 @@ 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"
@@ -12637,17 +13085,18 @@ msgstr "Filteri"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Proslijeđena poruka --------"
 
-#: mail/em-utils.c:1138
+#: mail/em-utils.c:1136
 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'
-#: mail/em-utils.c:1148
+#. it must contain a single single %%+05d followed by a single '%%s'
+#: mail/em-utils.c:1146
 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:1425 mail/em-utils.c:1509 mail/em-utils.c:1518
+#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
@@ -12655,7 +13104,8 @@ msgstr ""
 "Ne mogu spremiti u `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1428
+#, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
@@ -12663,42 +13113,50 @@ msgstr ""
 "`%s' već postoji.\n"
 "Prepisati?"
 
-#: mail/em-utils.c:1473
+#: mail/em-utils.c:1471
 msgid "message"
 msgstr "cedulja"
 
-#: mail/em-utils.c:1525
+#: mail/em-utils.c:1523
+#, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Greška: '%s' postoji i nije obična datoteka"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:1577
 msgid "Save Message..."
 msgstr "Spremi poruku..."
 
-#: mail/em-utils.c:1617
+#: mail/em-utils.c:1615
 msgid "Add address"
 msgstr "Dodaj adresu"
 
-#: mail/em-utils.c:2405
+#: mail/em-utils.c:2085
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Nisam mogao napraviti privremeni direktorij: %s"
+
+#: mail/em-utils.c:2403
+#, c-format
 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:2431
+#: mail/em-utils.c:2429
 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?"
 
@@ -12747,258 +13205,278 @@ msgid "Default forward style"
 msgstr "Uobičajeni način proslijeđivanja"
 
 #: mail/evolution-mail.schemas.in.in.h:12
+#, fuzzy
+msgid "Default height of the Message Window"
+msgstr "Predefinirani naslov poruke."
+
+#: mail/evolution-mail.schemas.in.in.h:13
 msgid "Default reply style"
 msgstr "Uobičajeni način odgovaranja"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Default width of the Message Window"
+msgstr "Uobičajena širina za ploču trake mapa"
+
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Iscrtavanje grešaka u pravopisu prilikom utipkavanja"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Empty Trash folders on exit"
 msgstr "Ispražnjavanje mapa sa smećem prilikom izlaska"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Ispražnjavanje mapa sa smećem prilikom izlaska iz Evolutiona."
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:18
 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:17
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Enable/disable caret mode"
 msgstr "Omogući/onemogući caret način rada"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Height of the message-list pane"
 msgstr "Visina ploče s popisom poruka"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Height of the message-list pane."
 msgstr "Visina ploče s popisom poruka."
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "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:21
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "List of Labels and their associated colours"
 msgstr "Izlistavanje oznaka i njima pridruženih boja"
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "List of accounts"
 msgstr "Popis korisničkih računa"
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 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:24
+#: mail/evolution-mail.schemas.in.in.h:26
 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:25
+#: mail/evolution-mail.schemas.in.in.h:27
 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:26
+#: mail/evolution-mail.schemas.in.in.h:28
 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:27
+#: mail/evolution-mail.schemas.in.in.h:29
 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:28
+#: mail/evolution-mail.schemas.in.in.h:30
 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:29
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "Log filter actions"
 msgstr "Logiranje akcija filtra"
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Log filter actions to the specified log file."
 msgstr "Logiranje akcija filtra u navedenu log datoteku."
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "Logfile to log filter actions"
 msgstr "Logiranje akcija filtra"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Logfile to log filter actions."
 msgstr "Logiranje akcija filtra."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Mark as Seen after specified timeout"
 msgstr "Označi kao pregledano nakon određenog vremena"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Mark as Seen after specified timeout."
 msgstr "Označi kao pregledano nakon određenog vremena."
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označivanje citata u pregledu poruke"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označivanje citata u pregledu poruke."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Message Window default hight"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid "Message Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Stil prikaza poruke (normalno, puna zaglavlja, kod)"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "New Mail Notify sound file"
 msgstr "Zvučna datoteka za obavijest o novopristigloj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "New Mail Notify type"
 msgstr "Nova vrsta obavijesti o pristigloj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Prompt on empty subject"
 msgstr "Iskoči u slučaju praznog naslova"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:45
 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:42
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: mail/evolution-mail.schemas.in.in.h:46
+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:43
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt when user expunges"
 msgstr "Upitaj korisnika prilikom brisanja"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt when user only fills Bcc"
 msgstr "Upitaj kada korisnik popuni samo Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:49
 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:46
+#: mail/evolution-mail.schemas.in.in.h:50
 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:47
+#: mail/evolution-mail.schemas.in.in.h:51
 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:48
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Recognize links in text and replace them."
 msgstr "Prepoznaj veze u tekstu i zamijeni ih."
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:53
 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:50
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Run junk test on incoming mail"
 msgstr "Pokreni testiranje na smeće na dolaznoj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid ""
 "Run junk test on incoming mail for IMAP accounts (only valid if "
 "check_incoming is set to true)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "S3kr3t 0pt10n"
 msgstr "S3kr3t 0pt10n"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "S3kr3t 0pt10n."
 msgstr "S3kr3t 0pt10n."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Send HTML mail by default"
 msgstr "Pošalji poštu formatiranu kao HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Send HTML mail by default."
 msgstr "Pošalji poštu formatiranu kao HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Show Animations"
 msgstr "Prikaži animacije"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Show animated images as animations."
 msgstr "Prikaži animirane slike kao animacije"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:62
 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:59
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show deleted messages in the message-list"
 msgstr "Prikaži obrisane poruke u listi poruka"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show the \"Preview\" pane"
 msgstr "Prikaži karticu \"Pregled\""
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show the \"Preview\" pane."
 msgstr "Prikaži karticu \"Pregled\""
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:66
 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:63
+#: mail/evolution-mail.schemas.in.in.h:67
 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:64
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Spell check inline"
 msgstr "Provjera pravopisa na licu mjesta"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Terminal font"
 msgstr "Pismo terminala"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "The terminal font for mail display"
 msgstr "Pismo terminala za prikaz pošte"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "The variable width font for mail display"
 msgstr "Pismo varijabilne širine za prikaz pošte"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:72
 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;"
@@ -13006,111 +13484,111 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Thread the message list."
 msgstr "Prikaži listu poruka u obliku niti."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Thread the message-list"
 msgstr "Prikaži listu poruka u obliku niti."
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:75
 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:72
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Timeout for marking message as Seen"
 msgstr "Vremensko ograničenje poruke obilježene kao viđene"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Timeout for marking message as Seen."
 msgstr "Vremensko ograničenje poruke obilježene kao viđene"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "UID string of the default account."
 msgstr "UID string predefinirang korisničkog računa"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Use Spamasssassin daemon and client"
 msgstr "Koristi Spamassassin daemon i klijent"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Koristi Spamassassin daemon i klijent (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use custom fonts"
 msgstr "Koristi prilagođena pisma"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use custom fonts for displaying mail"
 msgstr "Koristi prilagođena pisma za prikaz pošte"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use only local spam tests."
 msgstr "Koristi samo lokalne testove za spam."
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:84
 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:81
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Variable width font"
 msgstr "Font promjenljive širine"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "View/Bcc menu item is checked"
 msgstr "Pogled/Bcc stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "View/Bcc menu item is checked."
 msgstr "Pogled/Bcc stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Cc menu item is checked"
 msgstr "Pogled/Cc stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Cc menu item is checked."
 msgstr "Pogled/Cc stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/From menu item is checked"
 msgstr "Pogled/Od stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/From menu item is checked."
 msgstr "Pogled/Od stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/PostTo menu item is checked"
 msgstr "Pogled/Za stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/PostTo menu item is checked."
 msgstr "Pogled/Za stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/ReplyTo menu item is checked"
 msgstr "Pogled/OdgovoriNa stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/ReplyTo menu item is checked."
 msgstr "Pogled/OdgovoriNa stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:96
 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:93
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:98
 #, fuzzy
 msgid "spamd port"
 msgstr "Uvoz"
@@ -13159,11 +13637,13 @@ msgstr "Molim pričekajte"
 
 #: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
 #: mail/importers/pine-importer.c:288
+#, c-format
 msgid "Importing %s as %s"
 msgstr "Uvozim %s kao %s"
 
 #: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
 #: mail/importers/pine-importer.c:425
+#, c-format
 msgid "Scanning %s"
 msgstr "Pretražujem %s"
 
@@ -13180,6 +13660,7 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/netscape-importer.c:75
+#, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetni filter \"%s\""
 
@@ -13343,22 +13824,27 @@ 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"
 
@@ -13371,6 +13857,7 @@ 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"
@@ -13380,19 +13867,23 @@ msgstr ""
 "    '%s'\n"
 "I osvježen sadržaj."
 
-#: mail/mail-component.c:449
+#: mail/mail-component.c:463
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/mail-component.c:522
 msgid "New Mail Message"
 msgstr "Nova poruka poštom"
 
-#: mail/mail-component.c:450
+#: mail/mail-component.c:523
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: mail/mail-component.c:451
+#: mail/mail-component.c:524
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
-#: mail/mail-component.c:582
+#: mail/mail-component.c:657
 msgid "URI of the mail source that the view will display"
 msgstr "URI poruke koju će pogled pokazati"
 
@@ -13405,7 +13896,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
 msgid "Receiving Mail"
@@ -13431,7 +13925,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:12
 msgid "Account Management"
@@ -13446,9 +13942,10 @@ 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šteno"
-"samo 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štenosamo za potrebe prikazivanja na "
+"zaslonu."
 
 #: mail/mail-config.c:1092
 msgid "Checking Service"
@@ -13456,7 +13953,7 @@ msgstr "Provjeravam servis"
 
 #: mail/mail-config.c:1170 mail/mail-config.c:1174
 msgid "Connecting to server..."
-msgstr "Spajam se na server...
-"
+msgstr "Spajam se na server...\r"
 
 #: mail/mail-config.glade.h:3
 msgid "    "
@@ -13742,7 +14239,8 @@ msgstr "Odabir boje"
 
 #: mail/mail-config.glade.h:92
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "Up_ozori prilikom slanja poruke kod koje su definirani samo Bcc primatelji"
+msgstr ""
+"Up_ozori prilikom slanja poruke kod koje su definirani samo Bcc primatelji"
 
 #: mail/mail-config.glade.h:93
 msgid "Pretty Good Privacy (PGP/GPG)"
@@ -13871,7 +14369,9 @@ 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:128
 msgid ""
@@ -14064,10 +14564,12 @@ msgid "description"
 msgstr "opis"
 
 #: mail/mail-folder-cache.c:787
+#, c-format
 msgid "Pinging %s"
 msgstr "Pingam %s"
 
 #: mail/mail-mt.c:260
+#, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
@@ -14076,6 +14578,7 @@ msgstr ""
 "%s"
 
 #: mail/mail-mt.c:263
+#, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
@@ -14096,10 +14599,12 @@ msgid "Fetching Mail"
 msgstr "Prikupljam poštu"
 
 #: mail/mail-ops.c:536
+#, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nisam mogao primjeniti odlazne filtere: %s"
 
 #: mail/mail-ops.c:561
+#, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
@@ -14108,18 +14613,22 @@ msgstr ""
 "Umjesto toga dodajem u lokalnu mapu „Poslano“."
 
 #: mail/mail-ops.c:570
+#, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nisam mogao smjestiti poštu u lokalnu mapu „Poslano“: %s"
 
 #: mail/mail-ops.c:612
+#, c-format
 msgid "Sending \"%s\""
 msgstr "Šaljem \"%s\""
 
 #: mail/mail-ops.c:731
+#, c-format
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
 
 #: mail/mail-ops.c:750
+#, c-format
 msgid "Failed on message %d of %d"
 msgstr "Poruka %d od %d nije poslana"
 
@@ -14132,14 +14641,17 @@ msgid "Saving message to folder"
 msgstr "Spremam poruku u mapu"
 
 #: mail/mail-ops.c:931
+#, c-format
 msgid "Moving messages to %s"
 msgstr "Premještam poruke u %s"
 
 #: mail/mail-ops.c:931
+#, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram poruke u %s"
 
 #: mail/mail-ops.c:1044
+#, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pretražujem direktorije u \"%s\""
 
@@ -14148,50 +14660,69 @@ msgid "Forwarded messages"
 msgstr "Prosljeđene poruke"
 
 #: mail/mail-ops.c:1283
+#, c-format
 msgid "Opening folder %s"
 msgstr "Otvaram mapu %s"
 
 #: mail/mail-ops.c:1355
+#, c-format
 msgid "Opening store %s"
 msgstr "Otvaram smočnica %s"
 
 #: mail/mail-ops.c:1433
+#, c-format
 msgid "Removing folder %s"
 msgstr "Uklanjam mapu %s"
 
 #: mail/mail-ops.c:1527
+#, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštam direktorij '%s'"
 
-#: mail/mail-ops.c:1578
+#: mail/mail-ops.c:1592
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr ""
+
+#: mail/mail-ops.c:1593
+#, fuzzy, c-format
+msgid "Storing account '%s'"
+msgstr "Smeštam direktorij '%s'"
+
+#: mail/mail-ops.c:1648
 msgid "Refreshing folder"
 msgstr "Osvježavam mapu"
 
-#: mail/mail-ops.c:1614 mail/mail-ops.c:1665
+#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
 msgid "Expunging folder"
 msgstr "Izbacujem mapu"
 
-#: mail/mail-ops.c:1662
+#: mail/mail-ops.c:1732
+#, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Praznim smeće u '%s'"
 
-#: mail/mail-ops.c:1663
+#: mail/mail-ops.c:1733
 msgid "Local Folders"
 msgstr "Direktoriji"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1816
+#, c-format
 msgid "Retrieving message %s"
 msgstr "Učitavam poruku %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1888
+#, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Učitavam poruke (%d)"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1972
+#, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Spremam %d poruku(e)"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:2020
+#, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
@@ -14199,7 +14730,8 @@ msgstr ""
 "Ne mogu napraviti izlaznu datoteku: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:2048
+#, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
@@ -14207,11 +14739,12 @@ msgstr ""
 "Greška kod spremanja poruka u: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2119
 msgid "Saving attachment"
 msgstr "Spremam prilog"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2136
+#, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
@@ -14219,19 +14752,22 @@ msgstr ""
 "Ne mogu napraviti izlaznu datoteku: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2166
+#, c-format
 msgid "Could not write data: %s"
 msgstr "Nisam mogao da upišem: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2314
+#, c-format
 msgid "Disconnecting from %s"
 msgstr "Prekidam vezu sa %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2314
+#, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponovo se povezujem na %s"
 
-#: mail/mail-ops.c:2346
+#: mail/mail-ops.c:2416
 msgid "Changing junk status"
 msgstr "Mijenjam status smeća"
 
@@ -14265,17 +14801,20 @@ msgstr "Podaci o sigurnosti"
 
 #: mail/mail-send-recv.c:147
 msgid "Cancelling..."
-msgstr "Poništavam...
-"
+msgstr "Poništavam...\r"
 
 #: mail/mail-send-recv.c:254
+#, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Poslužitelj: %s, tip: %s"
 
 #: mail/mail-send-recv.c:256
+#, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Putanja: %s, tip: %s"
 
 #: mail/mail-send-recv.c:258
+#, c-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
@@ -14295,27 +14834,29 @@ msgstr "Ažuriram..."
 msgid "Waiting..."
 msgstr "Pričekajte..."
 
-#: mail/mail-session.c:240
+#: mail/mail-session.c:233
 msgid "User canceled operation."
 msgstr "Korisnik je poništio operaciju."
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:266
+#, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: mail/mail-session.c:275
+#: mail/mail-session.c:268
 msgid "Enter Password"
 msgstr "Upišite šifru"
 
-#: mail/mail-session.c:301
+#: mail/mail-session.c:294
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: mail/mail-session.c:302
+#: mail/mail-session.c:295
 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"
 
@@ -14360,6 +14901,7 @@ msgid "Trying to movemail a non-mbox source `%s'"
 msgstr ""
 
 #: mail/mail-tools.c:276
+#, c-format
 msgid "Forwarded message - %s"
 msgstr "Prosljeđena poruka - %s"
 
@@ -14367,19 +14909,23 @@ msgstr "Prosljeđena poruka - %s"
 msgid "Forwarded message"
 msgstr "Prosljeđena poruka"
 
-#: mail/mail-tools.c:318
+#: 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:497
+#: mail/mail-vfolder.c:524
+#, c-format
 msgid ""
 "The following vFolder(s):\n"
 "%sUsed the removed folder:\n"
@@ -14391,19 +14937,20 @@ msgstr ""
 "    '%s'\n"
 "Potom su osvježeni."
 
-#: mail/mail-vfolder.c:896
+#: mail/mail-vfolder.c:923
 msgid "vFolders"
 msgstr "vFolders-i"
 
-#: mail/mail-vfolder.c:935
+#: mail/mail-vfolder.c:962
 msgid "Edit VFolder"
 msgstr "Promjeni VMape"
 
-#: mail/mail-vfolder.c:955
+#: mail/mail-vfolder.c:982
+#, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pokušavam promijeniti vmapu '%s' koja ne postoji."
 
-#: mail/mail-vfolder.c:1027
+#: mail/mail-vfolder.c:1054
 msgid "New VFolder"
 msgstr "New VFolder"
 
@@ -14467,7 +15014,7 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3116
+#: mail/message-list.c:3115
 msgid "Generating message list"
 msgstr "Radim popis poruka"
 
@@ -14621,15 +15168,17 @@ 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 ""
@@ -14640,8 +15189,10 @@ 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"
@@ -14720,10 +15271,12 @@ msgid "Autocompletion Folders"
 msgstr "Mape za samodopunjavanje"
 
 #: shell/e-shell-folder-commands.c:140
+#, c-format
 msgid "Cannot copy folder: %s"
 msgstr "Ne mogu kopirati mapu: %s"
 
 #: shell/e-shell-folder-commands.c:142
+#, c-format
 msgid "Cannot move folder: %s"
 msgstr "Ne mogu premjestiti mapu: %s"
 
@@ -14740,6 +15293,7 @@ msgid "Cannot move a folder into one of its descendants."
 msgstr "Ne mogu premjestiti mapu u neku od njenih potomaka."
 
 #: shell/e-shell-folder-commands.c:319
+#, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Navedite mapu u koji će se mapa „%s“ kopirati:"
 
@@ -14748,6 +15302,7 @@ msgid "Copy Folder"
 msgstr "Kopiraj mapu"
 
 #: shell/e-shell-folder-commands.c:363
+#, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Navedite mapu u koju će se mapa „%s“ premjesti:"
 
@@ -14756,6 +15311,7 @@ msgid "Move Folder"
 msgstr "Premjesti mapu"
 
 #: shell/e-shell-folder-commands.c:391
+#, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
@@ -14764,10 +15320,12 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-commands.c:405
+#, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Zaista da brišem mapu „%s“?"
 
 #: shell/e-shell-folder-commands.c:489
+#, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
@@ -14777,6 +15335,7 @@ msgstr ""
 
 #: shell/e-shell-folder-commands.c:547
 #: 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"
 
@@ -14785,6 +15344,7 @@ msgid "Selected folder does not belong to another user"
 msgstr "Odabrani mapa ne pripada drugom korisniku"
 
 #: shell/e-shell-folder-commands.c:587
+#, c-format
 msgid ""
 "Cannot remove folder:\n"
 "%s"
@@ -14793,6 +15353,7 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:137
+#, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
@@ -14804,11 +15365,11 @@ msgstr ""
 msgid "(Untitled)"
 msgstr "(Bez naziva) "
 
-#: shell/e-shell-importer.c:138
+#: shell/e-shell-importer.c:145
 msgid "Choose the type of importer to run:"
 msgstr "Odaberite vrstu uvoznika:"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:148
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -14816,16 +15377,22 @@ 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"
 
-#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:737
+#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:737
 msgid "Please select the information that you would like to import:"
 msgstr "Molim odaberite podatke koje želite uvesti:"
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:160
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -14837,7 +15404,8 @@ msgstr ""
 "nađeno podešavanje koje se može uvesti. Ako želite\n"
 "pokušati ponovo, molim pritisnite gumb \"Natrag\".\n"
 
-#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
+#: shell/e-shell-importer.c:228 shell/e-shell-importer.c:259
+#, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
@@ -14845,48 +15413,31 @@ msgstr ""
 "Uvozim %s\n"
 "Uvozim %d. stavku."
 
-#: shell/e-shell-importer.c:322
+#: shell/e-shell-importer.c:332
 msgid "Select importer"
 msgstr "Odaberite uvoznika"
 
-#: shell/e-shell-importer.c:463
+#: 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"
 
-#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
-#: shell/e-shell-importer.c:523
-msgid "Evolution Error"
-msgstr "Greška Evolucije"
-
-#: shell/e-shell-importer.c:480
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Ne postoji uvoznik koji može rukavati s\n"
-"%s"
-
-#: shell/e-shell-importer.c:489
+#: shell/e-shell-importer.c:456
 msgid "Importing"
 msgstr "Uvoz"
 
-#: shell/e-shell-importer.c:496
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Uvozim %s.\n"
-"Pokrećem %s"
-
-#: shell/e-shell-importer.c:508
-msgid "Error starting %s"
-msgstr "Greška kod pokretanja %s"
+#: shell/e-shell-importer.c:463
+#, fuzzy, c-format
+msgid "Importing %s.\n"
+msgstr "Uvoz"
 
-#: shell/e-shell-importer.c:522
+#: 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:539
+#: shell/e-shell-importer.c:490
+#, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
@@ -14894,31 +15445,31 @@ msgstr ""
 "Uvozim %s\n"
 "Uvozim 1. stavku."
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:544
 msgid "Automatic"
 msgstr "Automatski"
 
-#: shell/e-shell-importer.c:642
+#: shell/e-shell-importer.c:593
 msgid "_Filename:"
 msgstr "_Ime datoteke:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:598
 msgid "Select a file"
 msgstr "Odaberite datoteku"
 
-#: shell/e-shell-importer.c:657
+#: shell/e-shell-importer.c:608
 msgid "File _type:"
 msgstr "_Vrsta datoteke:"
 
-#: shell/e-shell-importer.c:683
+#: shell/e-shell-importer.c:647
 msgid "Import data and settings from _older programs"
 msgstr "_Uvezi podatke i postavke iz starijih programa"
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:650
 msgid "Import a _single file"
 msgstr "_Uvezi jednu datoteku"
 
-#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:566
+#: shell/e-shell-importer.c:718 shell/e-shell-startup-wizard.c:566
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14926,19 +15477,26 @@ msgstr ""
 "Molim pričekajte...\n"
 "Tražim postojeća podešavanja"
 
-#: shell/e-shell-importer.c:757
+#: shell/e-shell-importer.c:721
 msgid "Starting Intelligent Importers"
 msgstr "Pokrećem inteligentne uvoznike"
 
-#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:692
+#: 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:1061
-msgid "Select a destination folder for importing this data"
-msgstr "Odaberite odredišnu mapu za uvoz ovih podataka"
+#: shell/e-shell-importer.c:1034
+#, fuzzy, c-format
+msgid "No importer available for file %s"
+msgstr "Nema dostupnog ponuđača za protokol `%s'"
+
+#: shell/e-shell-importer.c:1046
+#, fuzzy
+msgid "Unable to execute importer"
+msgstr "Nisam mogao izvršiti gpg."
 
-#: shell/e-shell-importer.c:1190
+#: shell/e-shell-importer.c:1156
 msgid "_Import"
 msgstr "_Uvoz"
 
@@ -14951,8 +15509,8 @@ 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."
@@ -14962,14 +15520,17 @@ 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“..."
 
 #: 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"
 
@@ -15015,59 +15576,44 @@ msgstr "Ime mape ne može sadržavati znak \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' i '..' su rezervirana imena mapa."
 
-#: shell/e-shell-view-menu.c:90 shell/e-shell-window-commands.c:59
+#: shell/e-shell-window-commands.c:63
 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-view-menu.c:98 shell/e-shell-window-commands.c:67
+#: shell/e-shell-window-commands.c:71
+#, c-format
 msgid "Error executing %s."
 msgstr "Greška kod pokretanja %s."
 
-#: shell/e-shell-view-menu.c:194 shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:121
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy nije instaliran."
 
-#: shell/e-shell-view-menu.c:202 shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:129
 msgid "Bug buddy could not be run."
 msgstr "Ne mogu pokrenuti Bug buddy."
 
-#: shell/e-shell-view-menu.c:248 shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:171
 msgid "About Ximian Evolution"
 msgstr "O Ximian Evolutionu"
 
-#: shell/e-shell-view-menu.c:511
-msgid "Go to folder..."
-msgstr "Idi do mape..."
-
-#: shell/e-shell-view-menu.c:512
-msgid "Select the folder that you want to open"
-msgstr "Odaberite mapu koju želite otvoriti"
-
-#: shell/e-shell-view-menu.c:626
-msgid "Create New Shortcut"
-msgstr "Napravi novi prečac"
-
-#: shell/e-shell-view-menu.c:627
-msgid "Select the folder you want the shortcut to point to:"
-msgstr "Odaberite direktorij na koji želite da prečica ukazuje:"
-
-#: shell/e-shell-view-menu.c:779 shell/e-shell-window-commands.c:353
+#: shell/e-shell-window-commands.c:381
 msgid "_Work Online"
 msgstr "_Na mreži"
 
-#: shell/e-shell-view-menu.c:792 shell/e-shell-window-commands.c:366
-#: ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Neumreženi rad"
 
-#: shell/e-shell-view-menu.c:805 shell/e-shell-window-commands.c:379
-#: ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:407 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
@@ -15075,32 +15621,36 @@ 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:529
+#: shell/e-shell.c:537
 #, c-format
 msgid ""
 "Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
 "The data hasn't been deleted, but it will not be seen by this version of "
 "Evolution.\n"
 msgstr ""
-"Upozorenje: 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:1068
+#: shell/e-shell.c:1063
 msgid "Invalid arguments"
 msgstr "Neispravni argumenti"
 
-#: shell/e-shell.c:1070
+#: shell/e-shell.c:1065
 msgid "Cannot register on OAF"
 msgstr "Ne mogu se registrirati na OAF"
 
-#: shell/e-shell.c:1072
+#: shell/e-shell.c:1067
 msgid "Configuration Database not found"
 msgstr "Baza sa postavkama nije pronađena"
 
-#: shell/e-shell.c:1074
+#: shell/e-shell.c:1069
 msgid "Generic error"
 msgstr "Generička greška"
 
@@ -15113,6 +15663,7 @@ msgid "Group name:"
 msgstr "Ime grupe:"
 
 #: shell/e-shortcuts-view.c:179
+#, c-format
 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?"
 
@@ -15224,16 +15775,6 @@ msgstr "Kratice"
 msgid "Checkbox"
 msgstr "Kvadratić"
 
-#: shell/e-task-widget.c:211
-#, c-format
-msgid "%s (...)"
-msgstr "%s (...)"
-
-#: shell/e-task-widget.c:216
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% dovršeno)"
-
 #: shell/e-user-creatable-items-handler.c:601
 #: shell/e-user-creatable-items-handler.c:642
 #: widgets/misc/e-charset-picker.c:109
@@ -15241,10 +15782,12 @@ msgid "New"
 msgstr "Novi"
 
 #: shell/evolution-folder-selector-button.c:128
+#, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "„%s“ u „%s“"
 
 #: shell/evolution-shell-component-utils.c:124
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -15255,6 +15798,7 @@ msgstr ""
 "Nepoznata greška."
 
 #: shell/evolution-shell-component-utils.c:127
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -15267,6 +15811,7 @@ msgstr ""
 "%s"
 
 #: shell/evolution-shell-component-utils.c:134
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -15389,22 +15934,31 @@ msgid "Evolution Import Assistant"
 msgstr "Pomoćnik Evolucije za uvoz"
 
 #: shell/importer/import.glade.h:3
-msgid "Import File (step 3 of 3)"
-msgstr "Uvezite datoteku (korak 3 od 3)"
+#, fuzzy
+msgid "Import File"
+msgstr "Uvoz datoteka"
 
 #: shell/importer/import.glade.h:4
-msgid "Importer Type (step 1 of 3)"
-msgstr "Vrsta uvoznika (korak 1 od 3)"
+#, fuzzy
+msgid "Import Location"
+msgstr "Lokacija"
 
 #: shell/importer/import.glade.h:5
-msgid "Select Importers (step 2 of 3)"
-msgstr "Odaberite uvoznike (korak 2 od 3)"
+#, fuzzy
+msgid "Importer Type"
+msgstr "Uvoznici"
 
 #: shell/importer/import.glade.h:6
-msgid "Select a File (step 2 of 3)"
-msgstr "Odaberite datoteku (korak 2 od 3)"
+#, fuzzy
+msgid "Select Importers"
+msgstr "Odaberite uvoznika"
 
 #: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File"
+msgstr "Odaberite datoteku"
+
+#: shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -15434,16 +15988,9 @@ 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:"
 
-#: shell/main.c:118 shell/main.c:582
-msgid "Evolution"
-msgstr "Evolution"
-
-#: shell/main.c:124
-msgid "Evolution is now exiting ..."
-msgstr "Evolution sada izlazi..."
-
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:275
+#: 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"
@@ -15477,7 +16024,7 @@ msgstr ""
 "Nadamo se da ćete uživati u plodovima našeg napornog rada, i \n"
 "željno iščekujemo vaše doprinose!\n"
 
-#: shell/main.c:299
+#: shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -15485,43 +16032,49 @@ msgstr ""
 "Hvala\n"
 "The Ximian Evolution Team\n"
 
-#: shell/main.c:307
+#: shell/main.c:249
 msgid "Don't tell me again"
 msgstr "Nemoj mi ponovno reći"
 
-#: shell/main.c:439
+#: shell/main.c:381
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ne mogu pristupiti ljusci Ximian Evolution."
 
-#: shell/main.c:448
+#: shell/main.c:390
+#, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ne mogu pokreniti Ximian Evolution ljusku : %s"
 
-#: shell/main.c:545
+#: shell/main.c:487
 msgid "Start Evolution activating the specified component"
 msgstr "Pokreni Evolution aktiviranjem određene komponente"
 
-#: shell/main.c:547
+#: shell/main.c:489
 msgid "Start in offline mode"
 msgstr "Počni sa radom bez mreže"
 
-#: shell/main.c:549
+#: shell/main.c:491
 msgid "Start in online mode"
 msgstr "Počni sa radom na mreži"
 
-#: shell/main.c:552
+#: shell/main.c:494
 msgid "Forcibly shut down all evolution components"
 msgstr "Silom ugasi sve dijelove evolutiona"
 
-#: shell/main.c:556
+#: shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:559
+#: shell/main.c:501
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošalji izlaz o greškama iz svih komponenti u datoteku."
 
-#: shell/main.c:586
+#: shell/main.c:524
+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"
@@ -15557,6 +16110,7 @@ msgid "E-Mail Address"
 msgstr "Adresa e-pošte"
 
 #: smime/gui/certificate-viewer.c:326
+#, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Preglednik certifikata: %s"
 
@@ -15567,6 +16121,7 @@ msgstr "Unesite lozinku za %s"
 
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:116
+#, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
@@ -15575,6 +16130,7 @@ msgstr ""
 "  Naslov: %s\n"
 
 #: smime/gui/e-cert-selector.c:117
+#, c-format
 msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
@@ -15659,6 +16215,7 @@ 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?"
 
@@ -15739,8 +16296,10 @@ 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:"
@@ -15839,6 +16398,7 @@ msgid "UID"
 msgstr "UID"
 
 #: smime/lib/e-cert.c:630
+#, fuzzy, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identifikator objekta (%S)"
 
@@ -15919,6 +16479,7 @@ msgid "Extensions"
 msgstr "Nastavci"
 
 #: smime/lib/e-cert.c:978
+#, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
@@ -15979,12 +16540,15 @@ 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"
 
 #: tools/killev.c:78
+#, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Gasim %s (%s)\n"
 
@@ -16465,7 +17029,8 @@ 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
@@ -17471,7 +18036,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"
@@ -17490,6 +18055,7 @@ 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"
 
@@ -17560,6 +18126,7 @@ msgid "Visual"
 msgstr "Vidljivo"
 
 #: widgets/misc/e-charset-picker.c:168
+#, c-format
 msgid "Unknown character set: %s"
 msgstr "Nepoznata kodna strana: %s"
 
@@ -17656,6 +18223,11 @@ msgstr "_Uredi spremljene pretrage... "
 msgid "_Advanced..."
 msgstr "_Napredno..."
 
+#: widgets/misc/e-image-chooser.c:172
+#, fuzzy
+msgid "Choose Image"
+msgstr "Izaberite datoteku"
+
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "_&Traži"
@@ -17684,3 +18256,92 @@ msgstr "Tekst"
 msgid "Find _Now"
 msgstr "_Traži sad"
 
+#: widgets/misc/e-task-widget.c:211
+#, c-format
+msgid "%s (...)"
+msgstr "%s (...)"
+
+#: widgets/misc/e-task-widget.c:216
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% dovršeno)"
+
+#~ 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	JP Rosevear <jpr@ximian.com>	2004-02-10 04:46:37 +0800
committer	JP Rosevear <jpr@src.gnome.org>	2004-02-10 04:46:37 +0800
commit	6c8106d36334fc56f6d9e089b6e7d1156651945d (patch)
tree	8e8b95d5a3360fb6ff2b1ce16b6e8623a9675391 /po/hr.po
parent	c406ecad32f63137e4cb60548b519dac65f9b9a7 (diff)
download	gsoc2013-evolution-6c8106d36334fc56f6d9e089b6e7d1156651945d.tar gsoc2013-evolution-6c8106d36334fc56f6d9e089b6e7d1156651945d.tar.gz gsoc2013-evolution-6c8106d36334fc56f6d9e089b6e7d1156651945d.tar.bz2 gsoc2013-evolution-6c8106d36334fc56f6d9e089b6e7d1156651945d.tar.lz gsoc2013-evolution-6c8106d36334fc56f6d9e089b6e7d1156651945d.tar.xz gsoc2013-evolution-6c8106d36334fc56f6d9e089b6e7d1156651945d.tar.zst gsoc2013-evolution-6c8106d36334fc56f6d9e089b6e7d1156651945d.zip