bump version and requirements

2004-01-12  JP Rosevear  <jpr@ximian.com>

	* configure.in: bump version and requirements

svn path=/trunk/; revision=24193

1 files changed, 1897 insertions, 1063 deletions

diff --git a/po/hr.po b/po/hr.po
index f4cb1f6501..bff81ad209 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution \n"
-"POT-Creation-Date: 2004-01-08 03:28+0100\n"
+"POT-Creation-Date: 2004-01-12 22:53-0500\n"
 "PO-Revision-Date: 2004-01-08 08:26+CET\n"
 "Last-Translator: Robert Sedak <robert.sedak@sk.tel.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -40,11 +40,12 @@ msgid "Configure autocomple here"
 msgstr ""
 
 #. 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/calendar-component.c:583
 #: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
 msgid "Contacts"
 msgstr "Kontakti"
@@ -85,18 +86,19 @@ msgstr "Kontrola podešavanja postavki Evolucija direktorija"
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:217
+#: addressbook/gui/component/addressbook-component.c:202
+#, c-format
+msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:258
 #: addressbook/gui/component/ldap-config.glade.h:28
 msgid "New Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:218
-msgid "Properties..."
-msgstr "Postavke..."
-
-#: addressbook/gui/component/addressbook-component.c:219
+#: addressbook/gui/component/addressbook-component.c:259
 #: addressbook/gui/widgets/e-addressbook-view.c:1017
-#: calendar/gui/calendar-component.c:423 calendar/gui/tasks-component.c:418
+#: calendar/gui/calendar-component.c:410 calendar/gui/tasks-component.c:399
 #: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -104,32 +106,32 @@ msgstr "Postavke..."
 msgid "Delete"
 msgstr "Obriši"
 
-#: addressbook/gui/component/addressbook-component.c:220
-#: calendar/gui/calendar-component.c:422 calendar/gui/tasks-component.c:416
-msgid "Rename"
-msgstr "Preimenuj"
+#: addressbook/gui/component/addressbook-component.c:260
+#: calendar/gui/calendar-component.c:411 calendar/gui/tasks-component.c:401
+msgid "Properties..."
+msgstr "Postavke..."
 
-#: addressbook/gui/component/addressbook-component.c:291
+#: addressbook/gui/component/addressbook-component.c:331
 msgid "New Contact"
 msgstr "Novi kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:292
+#: addressbook/gui/component/addressbook-component.c:332
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:293
+#: addressbook/gui/component/addressbook-component.c:333
 msgid "Create a new contact"
 msgstr "Unesi novi kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:298
+#: addressbook/gui/component/addressbook-component.c:338
 msgid "New Contact List"
 msgstr "Nova lista kontakata"
 
-#: addressbook/gui/component/addressbook-component.c:299
+#: addressbook/gui/component/addressbook-component.c:339
 msgid "Contact _List"
 msgstr "Kontakt _lista"
 
-#: addressbook/gui/component/addressbook-component.c:300
+#: addressbook/gui/component/addressbook-component.c:340
 msgid "Create a new contact list"
 msgstr "Napravi novi kontakt popis"
 
@@ -166,6 +168,50 @@ msgstr "Greška kod čitanja podataka sheme"
 msgid "Server did not respond with valid schema information"
 msgstr "Poslužitelj nije odgovorio sa ispravnim podacima sheme"
 
+#: addressbook/gui/component/addressbook-migrate.c:45 mail/em-migrate.c:120
+msgid "Migrating..."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-migrate.c:53
+msgid ""
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-migrate.c:86 mail/em-migrate.c:161
+#, c-format
+msgid "Migrating `%s':"
+msgstr ""
+
+#. create the local source group
+#: addressbook/gui/component/addressbook-migrate.c:313
+#: calendar/gui/calendar-component.c:540 calendar/gui/calendar-component.c:550
+#: calendar/gui/tasks-component.c:502 calendar/gui/tasks-component.c:508
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-migrate.c:323
+#: calendar/gui/calendar-component.c:557 calendar/gui/migration.c:124
+#: calendar/gui/migration.c:147 calendar/gui/tasks-component.c:515
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:88
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Osobni podaci"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-migrate.c:331
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Mjenjaj LDAP server"
+
+#: addressbook/gui/component/addressbook-migrate.c:463
+#, fuzzy
+msgid "LDAP Servers"
+msgstr "Mjenjaj LDAP server"
+
 #: addressbook/gui/component/addressbook.c:273
 msgid ""
 "More cards matched this query than either the server is \n"
@@ -241,6 +287,7 @@ msgid "Failed to authenticate.\n"
 msgstr "Neuspjela prijava.\n"
 
 #: addressbook/gui/component/addressbook.c:776
+#, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sUnesite zaporku za %s (korisnik %s)"
 
@@ -278,12 +325,13 @@ msgstr " P_rikaži podržane baze "
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/calendar-setup.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
 #: calendar/gui/dialogs/new-task-list.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
@@ -320,19 +368,24 @@ msgid "Addressbook Creation Assistant"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "Addressbook Properties"
+msgstr "Izvori adresara"
+
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Addressbook Sources"
 msgstr "Izvori adresara"
 
-#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:66
+#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:66
 #: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Uvijek"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid "Anonymously"
 msgstr "Anonimno"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid ""
 "Congratulations, you are finished setting up this addressbook.\n"
 "\n"
@@ -340,18 +393,14 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr "Povezivanje"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Distinguished _name:"
 msgstr "Posebno _ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
-msgid "Edit LDAP Server"
-msgstr "Mjenjaj LDAP server"
-
 #: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "Poštanska adresa"
@@ -361,20 +410,24 @@ 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
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Završeno"
 
 #: addressbook/gui/component/ldap-config.glade.h:25
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Općenito"
 
 #: addressbook/gui/component/ldap-config.glade.h:26
+#: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "Grupa:"
 
@@ -392,8 +445,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 "
@@ -408,7 +461,7 @@ msgid "S_earch scope: "
 msgstr "Ops_eg pretrage:"
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:605
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:660
 #: calendar/gui/gnome-cal.c:586
 msgid "Searching"
 msgstr "Pretraživanje"
@@ -439,8 +492,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."
 
@@ -458,14 +510,14 @@ msgstr ""
 "napade. "
 
 #: addressbook/gui/component/ldap-config.glade.h:45
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
 #, fuzzy
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
-"Odabiranje ove opcije omogućiće promenu uobičajenih podeÅ¡avanja  "
-"Evolucije\n"
+"Odabiranje ove opcije omogućiće promenu uobičajenih podeÅ¡avanja  Evolucije\n"
 "za LDAP pretrage, i za upisivanje i mijenjanje kontakata. "
 
 #: addressbook/gui/component/ldap-config.glade.h:47
@@ -475,6 +527,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
+#: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
@@ -506,7 +559,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."
 
@@ -565,9 +619,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 ""
@@ -579,6 +632,7 @@ msgstr ""
 "Služi samo za potrebe prikazivanja."
 
 #: addressbook/gui/component/ldap-config.glade.h:74
+#: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
 "display purposes only. "
@@ -625,6 +679,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:85
+#: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Ime:"
 
@@ -632,11 +687,13 @@ msgstr "_Ime:"
 msgid "_Download limit:"
 msgstr "Limit za _preuzimanje:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:43
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:20
 msgid "_Edit"
@@ -793,7 +850,7 @@ msgstr "Suradnja"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:1520
+#: addressbook/gui/contact-editor/e-contact-editor.c:1989
 msgid "Contact Editor"
 msgstr "Sva polja"
 
@@ -809,18 +866,32 @@ msgid "Details"
 msgstr "Detalji"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "Enter the person's instant messenger accounts here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "F_ree/Busy URL:"
 msgstr "URL za s_lobodan/zauzet:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "File a_s:"
 msgstr "Smjesti k_ao:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Full _Name..."
 msgstr "Pu_no ime..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#, fuzzy
+msgid ""
+"If this person has the ability to participate in a video conference, enter "
+"their address here."
+msgstr ""
+"Ako ova osoba objavi slobodan/zauzet ili druge informacije o svom kalendaru "
+"na Internet, unesite\n"
+"adresu te informacije ovde."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
 "Internet, enter the address\n"
@@ -830,50 +901,55 @@ msgstr ""
 "na Internet, unesite\n"
 "adresu te informacije ovde."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#, fuzzy
+msgid "Instant Messaging"
+msgstr "Sljedeća _važna poruka"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "New phone type"
 msgstr "Novi tip telefona"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "No_tes:"
 msgstr "_Bilješke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Organi_zation:"
 msgstr "_Organizacija:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "P_rofession:"
 msgstr "Z_animanje:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Primary _email:"
 msgstr "Osnovna adresa _elektronske pošte:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "S_pouse:"
 msgstr "Su_pružnik:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Wants to receive _HTML mail"
 msgstr "Želi primati _HTML poruke"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Business:"
 msgstr "_Posao:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Categories..."
 msgstr "_Kategorije..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1236
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-calendar-table.c:1053
-#: calendar/gui/e-calendar-table.c:1071 mail/em-folder-tree.c:1502
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1264
+#: calendar/gui/e-cal-view.c:1295 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-table.c:1073 mail/em-folder-tree.c:1654
 #: mail/em-folder-view.c:731 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
@@ -881,39 +957,43 @@ msgstr "_Kategorije..."
 msgid "_Delete"
 msgstr "_Obriši"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr "_Kućni:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Job title:"
 msgstr "_Poslovna titula: "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager's name:"
 msgstr "Ime _menadžera:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Mobile:"
 msgstr "_Mobilni:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Nickname:"
 msgstr "_Nadimak:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Office:"
 msgstr "_Ured: "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Public Calendar URL:"
 msgstr "URL za _javni kalendar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_This is the mailing address"
 msgstr "Ovo je adresa za _slanje"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:43
+msgid "_Video Conferencing URL:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Web page address:"
 msgstr "Adresa _stranice na Internetu:"
 
@@ -923,7 +1003,7 @@ msgstr "Adresa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor.c:226
+#: addressbook/gui/contact-editor/e-contact-editor.c:242
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -1902,46 +1982,56 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#: addressbook/gui/contact-editor/e-contact-editor.c:207
 msgid "Source Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:198
+#: addressbook/gui/contact-editor/e-contact-editor.c:214
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:205
+#: addressbook/gui/contact-editor/e-contact-editor.c:221
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:212
+#: addressbook/gui/contact-editor/e-contact-editor.c:228
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:219
+#: addressbook/gui/contact-editor/e-contact-editor.c:235
 msgid "Writable Fields"
 msgstr "Upisna polja"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:233
+#: addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Changed"
 msgstr "Promijenjen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:976
+#: addressbook/gui/contact-editor/e-contact-editor.c:708
+#, fuzzy
+msgid "Service"
+msgstr "Servis spreman"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:722
+#, fuzzy
+msgid "Account Name"
+msgstr "Ime računa"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1426
 msgid "Category editor not available."
 msgstr "Uređivač kategorija nije dostupan."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:984
+#: addressbook/gui/contact-editor/e-contact-editor.c:1434
 msgid "This contact belongs to these categories:"
 msgstr "Ovaj kontakt pripada sljedećim kategorijama:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1206
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Save Contact as VCard"
 msgstr "Spremi kontakt kao VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1697
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1949,7 +2039,7 @@ msgstr ""
 "Sigurni ste da želite\n"
 "obrisati ove kontakte?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1249
+#: addressbook/gui/contact-editor/e-contact-editor.c:1700
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1957,20 +2047,40 @@ msgstr ""
 "Sigurni ste da želite\n"
 "obrisati ovaj kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2028
+#: addressbook/gui/contact-editor/e-contact-editor.c:2497
 msgid "Business"
 msgstr "Posao"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2498
 msgid "Home"
 msgstr "Polazno"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2030
+#: addressbook/gui/contact-editor/e-contact-editor.c:2499
 msgid "Other"
 msgstr "Ostalo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2569
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
+msgid "AIM"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2808
+msgid "Jabber"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2809
+msgid "Yahoo"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2810
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2811
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3098
+#, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nisam mogao da pronađem pomoć đa polje: `%s'"
 
@@ -2185,7 +2295,7 @@ msgid "1 contact"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-model.c:154
-#, fuzzy
+#, fuzzy, c-format
 msgid "%d contacts"
 msgstr "Ispis odabranih kontakata "
 
@@ -2316,9 +2426,9 @@ msgstr "Izreži"
 
 #. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:1015
-#: calendar/gui/calendar-component.c:420
+#: calendar/gui/calendar-component.c:408
 #: calendar/gui/dialogs/copy-source-dialog.c:136
-#: calendar/gui/tasks-component.c:414 ui/evolution-addressbook.xml.h:2
+#: calendar/gui/tasks-component.c:397 ui/evolution-addressbook.xml.h:2
 #: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiraj"
@@ -2329,11 +2439,12 @@ msgid "Paste"
 msgstr "Umetni"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1021
-#: calendar/gui/e-cal-view.c:1205
+#: calendar/gui/e-cal-view.c:1233
 msgid "Current View"
 msgstr "Trenutačni pogled"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1206
+#, c-format
 msgid ""
 "The addressbook backend for\n"
 "%s\n"
@@ -2341,8 +2452,8 @@ 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:1526
@@ -2526,8 +2637,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"
@@ -2655,9 +2765,9 @@ msgid "Protocol not supported"
 msgstr "Protokol nije podržan"
 
 #: addressbook/gui/widgets/eab-gui-util.c:50
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:601
-#: calendar/gui/e-calendar-table.c:465 calendar/gui/e-tasks.c:213
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:212
 #: calendar/gui/print.c:2319 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
@@ -2734,13 +2844,13 @@ msgid ""
 msgstr ""
 "%s već postoji\n"
 "Želite li  prepisati preko njega?"
-""
 
 #: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Prebriši"
 
 #: addressbook/gui/widgets/eab-gui-util.c:270
+#, c-format
 msgid "Error saving %s: %s"
 msgstr "Greška kod spremanja %s: %s"
 
@@ -2774,29 +2884,34 @@ msgid "Multiple VCards"
 msgstr "Višestruke VCards"
 
 #: addressbook/gui/widgets/eab-gui-util.c:714
+#, 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\""
 
@@ -2842,17 +2957,17 @@ msgstr "Kartični pogled"
 msgid "GTK Tree View"
 msgstr "Pogled GTK stabla"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr ""
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr ""
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr ""
 
@@ -2861,12 +2976,12 @@ msgstr ""
 msgid "Print envelope"
 msgstr "Ispis koverte "
 
-#: addressbook/printing/e-contact-print.c:1003
+#: addressbook/printing/e-contact-print.c:1004
 msgid "Print contacts"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1069
-#: addressbook/printing/e-contact-print.c:1096
+#: addressbook/printing/e-contact-print.c:1070
+#: addressbook/printing/e-contact-print.c:1097
 msgid "Print contact"
 msgstr ""
 
@@ -3089,7 +3204,8 @@ msgid "Export in asynchronous mode "
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode,default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:63
@@ -3097,7 +3213,8 @@ msgid "NUMBER"
 msgstr "NUMBER"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:105
@@ -3132,7 +3249,8 @@ msgstr "Ime datoteke nije dano"
 msgid "Unnamed List"
 msgstr "Lista bez imena"
 
-#: calendar/common/authentication.c:34
+#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
+#: smime/gui/component.c:39
 msgid "Enter password"
 msgstr "Upišite lozinku"
 
@@ -3209,8 +3327,8 @@ msgid "Evolution's Tasks component"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1091 calendar/gui/print.c:1795
-#: calendar/gui/tasks-control.c:506
+#: calendar/gui/e-tasks.c:1042 calendar/gui/print.c:1795
+#: calendar/gui/tasks-control.c:505
 #: calendar/importers/icalendar-importer.c:717
 #: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
 msgid "Tasks"
@@ -3233,6 +3351,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"
 
@@ -3255,11 +3374,26 @@ msgstr "Vrijeme drijemanja (u minutama)"
 msgid "_Edit appointment"
 msgstr "_Promijeni sastanak"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:882
+#: calendar/gui/alarm-notify/alarm-queue.c:900 calendar/gui/e-cal-view.c:1246
+#: calendar/gui/e-cal-view.c:1311 calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1076 mail/em-folder-view.c:706
+#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Otvori"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:902
+msgid "_Dismiss"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:904
+msgid "Dismiss _All"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 msgid "No description available."
 msgstr "Opis ne postoji."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:900
+#: calendar/gui/alarm-notify/alarm-queue.c:987
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3268,12 +3402,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:987
-#: calendar/gui/alarm-notify/alarm-queue.c:1011
+#: calendar/gui/alarm-notify/alarm-queue.c:1079
+#: calendar/gui/alarm-notify/alarm-queue.c:1103
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:991
+#: calendar/gui/alarm-notify/alarm-queue.c:1083
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3285,7 +3419,8 @@ msgstr ""
 "podsjetnik podešen za slanje poruke. Evolucija će\n"
 "umjesto toga pokazati normalan prozor za dijalog."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1017
+#: calendar/gui/alarm-notify/alarm-queue.c:1109
+#, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
 "configured to run the following program:\n"
@@ -3294,32 +3429,32 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Podsjetnik Evolutions kalendara će biti pokrenut. Ovaj podsjetnik je podešen da "
-"pokrene slijedeći program:\n"
+"Podsjetnik Evolutions kalendara će biti pokrenut. Ovaj podsjetnik je podešen "
+"da pokrene slijedeći program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Sigurno želite pokrenite ovaj program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1031
+#: calendar/gui/alarm-notify/alarm-queue.c:1123
 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
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Nisam mogao da učitam  gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:171
+#: calendar/gui/alarm-notify/notify-main.c:172
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "Nisam mogao da pokrenem stvaranje servisa za alarm obaveštenja"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:110
 msgid "invalid time"
 msgstr "pogrešno vrijeme"
 
@@ -3360,90 +3495,94 @@ msgid "Intervals shown in Day and Work Week views"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
-msgid "Minute the workday ends on"
+msgid "List of urls for free/busy publishing"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
-msgid "Minute the workday starts on"
+msgid "Minute the workday ends on"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
-msgid "Number of units for default reminder"
+msgid "Minute the workday starts on"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
-msgid "Number of units for determining when to hide tasks"
+msgid "Number of units for default reminder"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Position of the horizontal pane"
+msgid "Number of units for determining when to hide tasks"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Position of the horizontal pane in the month view"
+msgid "Position of the horizontal pane"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
-msgid "Position of the vertical pane"
+msgid "Position of the horizontal pane in the month view"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
-msgid "Position of the vertical pane in the month view"
+msgid "Position of the vertical pane"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Position of the vertical pane in the task view"
+msgid "Position of the vertical pane in the month view"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
-msgid "Programs that can run as part of alarms"
+msgid "Position of the vertical pane in the task view"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
-msgid "Show where events end in week and month views"
+msgid "Programs that can run as part of alarms"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
-msgid "The view showing when the calendar starts"
+msgid "Show where events end in week and month views"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
-msgid "Time last alarm ran"
+msgid "The view showing when the calendar starts"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
-msgid "Units for determining when to hide tasks"
+msgid "Time last alarm ran"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-msgid "Units of default reminder"
+msgid "Units for determining when to hide tasks"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
-msgid "Weekday the week starts on"
+msgid "Units of default reminder"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
-msgid "Whether to ask for confirmation on appointment deletion"
+msgid "Weekday the week starts on"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
-msgid "Whether to ask for confirmation when folder is expunged"
+msgid "Whether to ask for confirmation on appointment deletion"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
-msgid "Whether to hide completed tasks"
+msgid "Whether to ask for confirmation when folder is expunged"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
-msgid "Whether to set a default reminder for events"
+msgid "Whether to hide completed tasks"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
-msgid "Whether to show times in 24h format instead of using am/pm"
+msgid "Whether to set a default reminder for events"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
@@ -3459,152 +3598,142 @@ msgstr "Opis sadrži"
 msgid "Comment contains"
 msgstr "Komentar sadrži"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1113
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1117
 msgid "Unmatched"
 msgstr "Neupariv"
 
-#: calendar/gui/calendar-commands.c:371
+#: calendar/gui/calendar-commands.c:342
 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 ""
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:348
 msgid "Purge events older than"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:383
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/calendar-commands.c:353
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "dana"
 
-#: calendar/gui/calendar-commands.c:452
+#: calendar/gui/calendar-commands.c:422
 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.
-#.  strftime format %a = abbreviated weekday name,
-#.  %d = day of month, %b = abbreviated month name.
-#.  You can change the order but don't change the
-#.  specifiers or add anything.
-#: calendar/gui/calendar-commands.c:455 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:329
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:425 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"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:457 calendar/gui/calendar-commands.c:462
-#: calendar/gui/calendar-commands.c:464
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:481 calendar/gui/calendar-commands.c:487
-#: calendar/gui/calendar-commands.c:493 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:463 calendar/gui/calendar-commands.c:465
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
-#.  month name. You can change the order but don't
-#.  change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:485
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:455
 #: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1516
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:361
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:397
-msgid "Rename this calendar to"
-msgstr ""
-
-#: calendar/gui/calendar-component.c:418
+#: calendar/gui/calendar-component.c:406
+#: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:533 calendar/gui/tasks-component.c:519
-msgid "On This Computer"
+#. create the remote source group
+#: calendar/gui/calendar-component.c:544 calendar/gui/calendar-component.c:573
+msgid "On The Web"
 msgstr ""
 
-#. orange
-#: calendar/gui/calendar-component.c:541 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:527
-#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:88
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Osobni podaci"
-
 #. red
-#: calendar/gui/calendar-component.c:548 filter/filter-label.c:122
+#: calendar/gui/calendar-component.c:564 filter/filter-label.c:122
 #: mail/mail-config.c:64 mail/mail-config.glade.h:135
 #: shell/e-config-upgrade.c:1455
 msgid "Work"
 msgstr "Posao"
 
-#. create the remote source group
-#: calendar/gui/calendar-component.c:555
-msgid "On The Web"
+#: calendar/gui/calendar-component.c:584 calendar/gui/calendar-component.c:596
+msgid "Birthdays & Anniversaries"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:655
+#: calendar/gui/calendar-component.c:595
+#, fuzzy
+msgid "Birthdays"
+msgstr "_Rođendan:"
+
+#: calendar/gui/calendar-component.c:720
 msgid "New appointment"
 msgstr "Novi zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:656
+#: calendar/gui/calendar-component.c:721
 msgid "_Appointment"
 msgstr "_Obveza"
 
-#: calendar/gui/calendar-component.c:657
+#: calendar/gui/calendar-component.c:722
 msgid "Create a new appointment"
 msgstr "Napravi novi sastanak"
 
-#: calendar/gui/calendar-component.c:662
+#: calendar/gui/calendar-component.c:727
 msgid "New meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/calendar-component.c:663
+#: calendar/gui/calendar-component.c:728
 msgid "M_eeting"
 msgstr "_Sastanak"
 
-#: calendar/gui/calendar-component.c:664
+#: calendar/gui/calendar-component.c:729
 msgid "Create a new meeting request"
 msgstr "Unesite novi zahtjev za sastankom"
 
-#: calendar/gui/calendar-component.c:669
+#: calendar/gui/calendar-component.c:734
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Novi cjelodnevni sastanak"
 
-#: calendar/gui/calendar-component.c:670
+#: calendar/gui/calendar-component.c:735
 msgid "All _Day Appointment"
 msgstr "Cijelo_dnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:671
+#: calendar/gui/calendar-component.c:736
 msgid "Create a new all-day appointment"
 msgstr "Unesite novi cjelodnevni sastanak"
 
-#: calendar/gui/calendar-component.c:676
+#: calendar/gui/calendar-component.c:741
 #, fuzzy
 msgid "New calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:677
+#: calendar/gui/calendar-component.c:742
 msgid "C_alendar"
 msgstr "_Kalendar"
 
-#: calendar/gui/calendar-component.c:678
+#: calendar/gui/calendar-component.c:743
 msgid "Create a new calendar"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:745
+#: calendar/gui/calendar-component.c:810
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:758
+#: calendar/gui/calendar-component.c:822
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -3650,12 +3779,13 @@ msgstr "Metoda nije podržana kod otvaranja kalendara"
 msgid "Permission denied to open the calendar"
 msgstr "Zabranjen pristup kalendaru"
 
-#: calendar/gui/comp-editor-factory.c:519
+#: calendar/gui/comp-editor-factory.c:518
 #, c-format
 msgid "open_client(): %s"
 msgstr ""
 
 #: calendar/gui/control-factory.c:140
+#, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Nisam mogao otvoriti direktorij u '%s"
 
@@ -3688,74 +3818,53 @@ msgstr "Opcije za program alarma"
 msgid "Unknown Alarm Options"
 msgstr "Nepoznate opcije za alarm"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-msgid "    "
-msgstr "    "
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "Alarm Repeat"
+msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "<b>Alarm Action</b>"
-msgstr ""
+#, fuzzy
+msgid "Message to Display:"
+msgstr "Prikaz poruka"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "<b>Alarm Email</b>"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "<b>Alarm Repeat</b>"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "<b>Alarm Sound</b>"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "<b>Message to Display</b>"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
 msgid "Message to Send"
 msgstr "Poruka za slanje"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "Pusti zvuk:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Ponovi alarm"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "Pokreni program:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
+#: calendar/gui/dialogs/alarm-options.glade.h:8
 #, fuzzy
 msgid "Send To:"
 msgstr "Za:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "Sa ovim argumentima:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:15 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialog1"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:16
+#: calendar/gui/dialogs/alarm-options.glade.h:12
 msgid "extra times every"
 msgstr "pokaži još na svakih"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:17 filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
 msgid "hours"
 msgstr "sati"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:18 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "minute"
 
@@ -3763,215 +3872,226 @@ msgstr "minute"
 msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "<b>Basics</b>"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "<b>Reminders</b>"
-msgstr ""
+#, fuzzy
+msgid "Basics"
+msgstr "Osnovno"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "Date/Time:"
 msgstr "Datum/Vrijeme:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:463
 msgid "Display a message"
 msgstr "Pokaži poruku"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:459
 msgid "Play a sound"
 msgstr "Odsviraj zvuk"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#, fuzzy
+msgid "Reminders"
+msgstr "Podsjetnik"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:471
 msgid "Run a program"
 msgstr "Pokreni program"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 #, fuzzy
 msgid "Send an Email"
 msgstr "Pošalji elektronsku poruku"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-itip-control.c:933 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:168
+#: calendar/gui/e-tasks.c:167
 msgid "Summary:"
 msgstr "Sažetak:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:9
 msgid "_Options..."
 msgstr "_Postavke..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:10
 msgid "after"
 msgstr "nakon"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "before"
 msgstr "prije"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "dan(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "end of appointment"
 msgstr "kraj zakazanog sastanka"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 msgid "hour(s)"
 msgstr "sat(i)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minuta(e)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "start of appointment"
 msgstr "početak zakazanog sastanka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
 msgstr "05 minuta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "10 minutes"
 msgstr "10 minuta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "15 minutes"
 msgstr "15 minuta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minuta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minuta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "<b>Alerts</b>"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "<b>Task List</b>"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<b>Time</b>"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "<b>Work Week</b>"
-msgstr ""
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
+msgid "Alerts"
+msgstr "Uzbune"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Postave kalendara i zadataka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Boja zakašnjelih zadataka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Boja zadataka kojima danas ističe rok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Day _ends:"
 msgstr "Dan _konačni:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "dani"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: mail/mail-config.glade.h:51
+msgid "E_nable"
+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:557
 msgid "Friday"
 msgstr "Petak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Hours"
 msgstr "Sati"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Minutes"
 msgstr "Minuta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:553
 msgid "Monday"
 msgstr "Ponedjeljak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "S_un"
 msgstr "_Ned"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:558
 msgid "Saturday"
 msgstr "Subota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Sh_ow a reminder"
 msgstr "Po_kaži podsjetnik"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Show week _numbers in date navigator"
 msgstr "Pokaži _brojeve tjedana u navigatoru datuma"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:552
 msgid "Sunday"
 msgstr "Nedjelja"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_asks due today:"
 msgstr "Z_adaci za danas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "T_hu"
 msgstr "_Čet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#, fuzzy
+msgid "Task List"
+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:556
 msgid "Thursday"
 msgstr "Četvrtak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Time"
+msgstr "Naslov"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time _zone:"
 msgstr "Vremenska _zona:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Time format:"
 msgstr "Oblik vremena:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:554
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "W_eek starts:"
 msgstr "Početak t_jedna:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:555
 msgid "Wednesday"
 msgstr "Srijeda"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ui/evolution-calendar.xml.h:32
+msgid "Work Week"
+msgstr "Radni tjedan"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Work days:"
 msgstr "Radni dani:"
@@ -3985,66 +4105,203 @@ msgid "_24 hour"
 msgstr "_24-očasovni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "_Add URL"
+msgstr "_Dodaj"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Ask for confirmation when deleting items"
 msgstr "Tr_aži potvrdu za brisanje podataka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Compress weekends in month view"
 msgstr "_Skupi tjedne u mjesečni prikaz"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Day begins:"
 msgstr "Početak _dana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Display"
 msgstr "_Zaslon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#, fuzzy
+msgid "_Free/Busy Publishing"
+msgstr "Slobodan/zauzet zahtjev"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Fri"
 msgstr "_Pet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Općenito"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Hide completed tasks after"
 msgstr "_Sakrij ispunjene zadatke nakon "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Mon"
 msgstr "_Pon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Overdue tasks:"
 msgstr "_Neispunjena zaduženja:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Sat"
 msgstr "_Sub"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Show appointment end times in week and month views"
 msgstr "_Pokaži završetke zakazanih sastanaka u tjednim i mjesečnim prikazima"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Time divisions:"
 msgstr "Podjela _vrijemena:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Tue"
 msgstr "_Uto"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Wed"
 msgstr "_Sri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "before every appointment"
 msgstr "prije svakog zakazanog sastanka"
 
+#: calendar/gui/dialogs/calendar-setup.c:155
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Morate dati ime datoteci."
+
+#: calendar/gui/dialogs/calendar-setup.c:163
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:213
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:226
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:254
+msgid "Could not create directory for new calendar"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Calendar Creation Assistant"
+msgstr "Informacije o kalendaru"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Calendar Properties"
+msgstr "Svojstva mape"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid ""
+"Congratulations, you are finished setting up this calendar.\n"
+"\n"
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid ""
+"Congratulations, you are finished setting up this task list.\n"
+"\n"
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+#: calendar/gui/tasks-component.c:395
+msgid "New Task List"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#, fuzzy
+msgid "Remote"
+msgstr "Ukloni"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid ""
+"Specifying a display name and group is the first step in setting up a "
+"calendar."
+msgstr ""
+
+#: 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 ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:21
+msgid "Step 2: Remote Folder Parameters"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:22
+msgid "Task List Creation Assistant"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23
+#, fuzzy
+msgid "Task List Properties"
+msgstr "Osobine pisma"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:24
+msgid ""
+"This assistant will help you create a new calendar. \n"
+"\n"
+"Depending on the type of calendar you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:29
+msgid ""
+"This assistant will help you create a new task list.\n"
+"\n"
+"Depending on the type of task list you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:35
+msgid ""
+"You're creating a folder in a group that's stored in a remote location. This "
+"requires you\n"
+"to specify additional parameters."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:38
+#, fuzzy
+msgid "_Refresh Interval:"
+msgstr "Osvježi popis"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:39
+#, fuzzy
+msgid "_Source URL:"
+msgstr "POP izvorna URI"
+
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4127,6 +4384,7 @@ 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"
 
@@ -4150,7 +4408,7 @@ msgstr " (Do "
 msgid "Due "
 msgstr "Due "
 
-#: calendar/gui/dialogs/comp-editor.c:402
+#: calendar/gui/dialogs/comp-editor.c:404
 msgid "Could not update object"
 msgstr "Nisam mogao ažurirati objekt"
 
@@ -4161,16 +4419,19 @@ msgstr "Promijeni zakazani sastanak"
 
 #: calendar/gui/dialogs/comp-editor.c:875
 #: calendar/gui/dialogs/comp-editor.c:912
+#, c-format
 msgid "Appointment - %s"
 msgstr "Zakazani sastanak - %s"
 
 #: calendar/gui/dialogs/comp-editor.c:878
 #: calendar/gui/dialogs/comp-editor.c:915
+#, c-format
 msgid "Task - %s"
 msgstr "Zadatak - %s"
 
 #: calendar/gui/dialogs/comp-editor.c:881
 #: calendar/gui/dialogs/comp-editor.c:918
+#, c-format
 msgid "Journal entry - %s"
 msgstr "Stavka dnevnika - %s"
 
@@ -4179,8 +4440,8 @@ msgstr "Stavka dnevnika - %s"
 msgid "No summary"
 msgstr "Nema sažetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1353 calendar/gui/e-cal-view.c:992
-#: calendar/gui/e-calendar-table.c:1185 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1353 calendar/gui/e-cal-view.c:1047
+#: calendar/gui/e-calendar-table.c:1187 composer/e-msg-composer.c:1128
 msgid "Save as..."
 msgstr "Spremi kao..."
 
@@ -4188,9 +4449,10 @@ msgstr "Spremi kao..."
 #: calendar/gui/dialogs/comp-editor.c:1480
 #: calendar/gui/dialogs/comp-editor.c:1506
 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:1545
+#: calendar/gui/dialogs/comp-editor.c:1562
 msgid "Unable to use current version!"
 msgstr ""
 
@@ -4199,6 +4461,7 @@ msgid "Select destination source"
 msgstr ""
 
 #: 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'?"
 
@@ -4207,6 +4470,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'?"
 
@@ -4215,6 +4479,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'?"
 
@@ -4223,14 +4488,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?"
 
@@ -4341,86 +4609,82 @@ msgstr "Završno vrijeme je pogrešno"
 msgid "Unable to open the calendar '%s'."
 msgstr ""
 
+#: calendar/gui/dialogs/event-page.glade.h:2
+msgid "A_ll day event"
+msgstr "Cije_lodnevni događaj"
+
 #: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "<b>Classification</b>"
-msgstr ""
+msgid "B_usy"
+msgstr "_Zauzeto"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "<b>Date &amp; Time</b>"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:2
+msgid "Ca_tegories..."
+msgstr "_Kategorije..."
 
 #: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "<b>Description</b>"
-msgstr "Opis"
+msgid "Calendar:"
+msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-msgid "<b>L_ocation</b>"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/e-cal-list-view.etspec.h:2
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
+msgstr "Klasifikacija"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "<b>Show Time As</b>"
-msgstr ""
+msgid "Co_nfidential"
+msgstr "_Povjerljivo"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:6
-msgid "<b>Su_mmary</b>"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Date & Time"
+msgstr "Datum/vrijeme"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "A_ll day event"
-msgstr "Cije_lodnevni događaj"
+msgid "F_ree"
+msgstr "_Slobodno"
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "B_usy"
-msgstr "_Zauzeto"
+#, fuzzy
+msgid "L_ocation:"
+msgstr "Lokacija:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Ca_tegories..."
-msgstr "_Kategorije..."
+#: calendar/gui/dialogs/task-page.glade.h:8
+msgid "Pri_vate"
+msgstr "_Privatno"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-msgid "Calendar:"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "Pu_blic"
+msgstr "_Javno"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Co_nfidential"
-msgstr "_Povjerljivo"
+#, fuzzy
+msgid "Show Time As"
+msgstr "_Pokaži animirane slike"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
-msgid "F_ree"
-msgstr "_Slobodno"
-
-#: calendar/gui/dialogs/event-page.glade.h:15
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Pri_vate"
-msgstr "_Privatno"
-
-#: calendar/gui/dialogs/event-page.glade.h:16
 #: calendar/gui/dialogs/task-page.glade.h:11
-msgid "Pu_blic"
-msgstr "_Javno"
+#, fuzzy
+msgid "Su_mmary:"
+msgstr "Sažetak:"
 
-#: calendar/gui/dialogs/event-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_End time:"
 msgstr "_Krajnje vrijeme:"
 
-#: calendar/gui/dialogs/event-page.glade.h:18
+#: calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Start time:"
 msgstr "_Početno vrijeme:"
 
 #. an empty string is the same as 'None'
-#.  add a "None" option to the stores menu
-#.  Put the "None" and "UTC" entries at the top of the combo's list.
-#.  When "None" is selected we want the field to be cleared.
-#.  Note that we don't show this here, since by default a 'None' date
-#.  is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:593 composer/e-msg-composer.c:2050
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2066
 #: mail/em-account-prefs.c:448 mail/em-folder-view.c:740
 #: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
 #: mail/mail-config.glade.h:80
@@ -4514,42 +4778,6 @@ msgstr "_Promijeni organizatora"
 msgid "_Invite Others..."
 msgstr "_Pozovi druge..."
 
-#: calendar/gui/dialogs/new-calendar.c:102
-#: calendar/gui/dialogs/new-task-list.c:46
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/new-calendar.c:116
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-
-#: calendar/gui/dialogs/new-calendar.c:125
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr ""
-
-#: calendar/gui/dialogs/new-calendar.c:138
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/new-calendar.c:155
-msgid "Could not create cache for new calendar"
-msgstr ""
-
-#: calendar/gui/dialogs/new-calendar.c:174
-msgid "Could not create directory for new calendar"
-msgstr ""
-
-#: calendar/gui/dialogs/new-calendar.c:254
-#: calendar/gui/dialogs/new-task-list.c:131
-msgid "A group must be selected"
-msgstr ""
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr ""
@@ -4570,10 +4798,6 @@ msgstr ""
 msgid "Calendar Name"
 msgstr ""
 
-#: calendar/gui/dialogs/new-task-list.c:56
-msgid "Could not create directory for new task list"
-msgstr ""
-
 #: calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr ""
@@ -4599,28 +4823,30 @@ 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:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Samo ova pojava"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 msgid "This and Prior Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Ova i buduće pojave"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 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"
@@ -4670,67 +4896,70 @@ msgstr "ponavljanja"
 msgid "Date/Time"
 msgstr "Datum/vrijeme"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "<b>Exceptions</b>"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+msgid "A_dd"
+msgstr "_Dodaj"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Pregled</b>"
+msgid "Every"
+msgstr "Svaki"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "<b>Recurrence Rule</b>"
-msgstr ""
+#, fuzzy
+msgid "Exceptions"
+msgstr "Izvrši akcije"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "A_dd"
-msgstr "_Dodaj"
+#, fuzzy
+msgid "Preview"
+msgstr "Pregled:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "Every"
-msgstr "Svaki"
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#, fuzzy
+msgid "Recurrence Rule"
+msgstr "Ponavljanje"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "_Custom recurrence"
 msgstr "_Posebno ponavljanje"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "_Modify"
 msgstr "_Izmijeni"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "_No recurrence"
 msgstr "_Bez ponavljanja"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "_Simple recurrence"
 msgstr "_Jednostavno ponavljanje"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "Za"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
 msgid "forever"
 msgstr "uvijek"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
 msgid "month(s)"
 msgstr "mjesec(i)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "until"
 msgstr "do"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "week(s)"
 msgstr "tjedan(a)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
 msgid "year(s)"
 msgstr "godina(e)"
 
@@ -4744,11 +4973,11 @@ msgstr ""
 "\n"
 "Želite li spremiti izmjene?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1555
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1545
 msgid "_Discard Changes"
 msgstr "_Zanemari promjene"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Spremi događaj"
 
@@ -4773,76 +5002,79 @@ msgstr "Informacija o zaduženju je izmjenjena. Da pošaljem noviju verziju?"
 msgid "Completed date is wrong"
 msgstr "Datum završetka je pogrešan"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: 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
-msgid "<b>Progress</b>"
-msgstr ""
-
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "<b>Web Page</b>"
-msgstr ""
-
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:599
-#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:209
 #: calendar/gui/print.c:2316
 msgid "Completed"
 msgstr "Završeno"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:389 calendar/gui/e-tasks.c:231
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:230
 #: mail/message-list.c:919
 msgid "High"
 msgstr "Visok"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:597
-#: calendar/gui/e-cal-model-tasks.c:659 calendar/gui/e-calendar-table.c:463
-#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2313
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:465
+#: calendar/gui/e-tasks.c:206 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "Izvodi se"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:235
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:234
 #: mail/message-list.c:917
 msgid "Low"
 msgstr "Nisko"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:390
-#: calendar/gui/e-tasks.c:233 mail/message-list.c:918
+#: 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:232 mail/message-list.c:918
 msgid "Normal"
 msgstr "Obično"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:595
-#: calendar/gui/e-calendar-table.c:462 calendar/gui/e-tasks.c:217
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:216
 #: calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr "Nije započelo"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:392
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#, fuzzy
+msgid "Progress"
+msgstr "Izvodi se"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:394
 msgid "Undefined"
 msgstr "Neodređeno"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "_Date Completed:"
 msgstr "_Datum izvršenja:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "_Stanje:"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Web Page:"
+msgstr "Internet stranica"
+
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Osnovno"
@@ -4866,133 +5098,136 @@ msgstr "Datum isteka je prije datuma početka!"
 msgid "Unable to open tasks in '%s'."
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Con_fidential"
 msgstr "_Povjerljivo"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:988
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:246
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
+msgid "Description:"
+msgstr "Opis:"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Folder:"
 msgstr "Mapa:"
 
-#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt Date:"
 msgstr "_Početni datum"
 
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:12
 msgid "_Due Date:"
 msgstr "_Datum dospijeća:"
 
-#: calendar/gui/e-alarm-list.c:397
+#: calendar/gui/e-alarm-list.c:395
 #, c-format
 msgid "%d days"
 msgstr "%d dani"
 
-#: calendar/gui/e-alarm-list.c:400
+#: calendar/gui/e-alarm-list.c:398
 msgid "1 day"
 msgstr "1 dan"
 
-#: calendar/gui/e-alarm-list.c:405
+#: calendar/gui/e-alarm-list.c:403
 #, c-format
 msgid "%d weeks"
 msgstr "%d tjedana"
 
-#: calendar/gui/e-alarm-list.c:408
+#: calendar/gui/e-alarm-list.c:406
 msgid "1 week"
 msgstr "1 tjedan"
 
-#: calendar/gui/e-alarm-list.c:413
+#: calendar/gui/e-alarm-list.c:411
 #, c-format
 msgid "%d hours"
 msgstr "%d sati"
 
-#: calendar/gui/e-alarm-list.c:416
+#: calendar/gui/e-alarm-list.c:414
 msgid "1 hour"
 msgstr "1 sat"
 
-#: calendar/gui/e-alarm-list.c:421
+#: calendar/gui/e-alarm-list.c:419
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuta"
 
-#: calendar/gui/e-alarm-list.c:424
+#: calendar/gui/e-alarm-list.c:422
 msgid "1 minute"
 msgstr "1 minuta"
 
-#: calendar/gui/e-alarm-list.c:429
+#: calendar/gui/e-alarm-list.c:427
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekundi"
 
-#: calendar/gui/e-alarm-list.c:432
+#: calendar/gui/e-alarm-list.c:430
 msgid "1 second"
 msgstr "1 sekunda"
 
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/e-alarm-list.c:467
 msgid "Send an email"
 msgstr "Pošalji e-poštu"
 
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:477
 msgid "Unknown action to be performed"
 msgstr "Izvršit će se nepoznata akcija"
 
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:489
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s prije početka sastanka"
 
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:492
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s nakon početka sastanka"
 
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s na početku sastanka"
 
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:506
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s prije kraja sastanka"
 
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:509
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s nakon završetka sastanka"
 
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:514
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s na kraju sastanka"
 
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:538
+#, c-format
 msgid "%s at %s"
 msgstr "%s kod %s"
 
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:544
+#, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretača"
 
 #: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:367
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:369
 msgid "Public"
 msgstr "Javno"
 
 #: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:368
+#: calendar/gui/e-calendar-table.c:370
 msgid "Private"
 msgstr "Privatno"
 
 #: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-calendar-table.c:371
 msgid "Confidential"
 msgstr "Povjerljivo"
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#: calendar/gui/e-calendar-table.etspec.h:5
-msgid "Classification"
-msgstr "Klasifikacija"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Description"
@@ -5017,11 +5252,11 @@ msgstr "boja"
 msgid "component"
 msgstr "element"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Slobodno"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:444
 #: calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Zauzeto"
@@ -5052,7 +5287,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:934 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -5060,7 +5295,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/e-cal-model-tasks.c:934 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -5077,7 +5312,7 @@ msgstr "Ne"
 #: 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:2003
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2094
 #: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Napoznato"
@@ -5090,183 +5325,177 @@ msgstr "Ponavljajući"
 msgid "Assigned"
 msgstr "Dodijeljeno"
 
-#: calendar/gui/e-cal-view.c:626 calendar/gui/e-calendar-table.c:696
+#: calendar/gui/e-cal-view.c:681 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Brišem odabrane objekte"
 
-#: calendar/gui/e-cal-view.c:730 calendar/gui/e-calendar-table.c:857
+#: calendar/gui/e-cal-view.c:785 calendar/gui/e-calendar-table.c:859
 msgid "Updating objects"
 msgstr "Unosim promene u objekte"
 
-#: calendar/gui/e-cal-view.c:1190 calendar/gui/e-cal-view.c:1275
+#: calendar/gui/e-cal-view.c:1218 calendar/gui/e-cal-view.c:1303
 msgid "New _Appointment..."
 msgstr "Novi S_astanak..."
 
-#: calendar/gui/e-cal-view.c:1191 calendar/gui/e-cal-view.c:1277
+#: calendar/gui/e-cal-view.c:1219 calendar/gui/e-cal-view.c:1305
 msgid "New All Day _Event"
 msgstr "Novi cjelodnevni _događaj"
 
-#: calendar/gui/e-cal-view.c:1192 calendar/gui/e-cal-view.c:1279
+#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1307
 msgid "New Meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/e-cal-view.c:1193 calendar/gui/e-cal-view.c:1281
+#: calendar/gui/e-cal-view.c:1221 calendar/gui/e-cal-view.c:1309
 msgid "New Task"
 msgstr "Novi zadatak"
 
-#: calendar/gui/e-cal-view.c:1197 calendar/gui/e-cal-view.c:1220
-#: calendar/gui/e-cal-view.c:1287 calendar/gui/e-calendar-table.c:1036
-#: calendar/gui/e-calendar-table.c:1078 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1248
+#: calendar/gui/e-cal-view.c:1315 calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Ispis..."
 
-#: calendar/gui/e-cal-view.c:1201 calendar/gui/e-cal-view.c:1227
-#: calendar/gui/e-cal-view.c:1285 calendar/gui/e-calendar-table.c:1042
-#: calendar/gui/e-calendar-table.c:1076 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-cal-view.c:1229 calendar/gui/e-cal-view.c:1255
+#: calendar/gui/e-cal-view.c:1313 calendar/gui/e-calendar-table.c:1044
+#: calendar/gui/e-calendar-table.c:1078 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:1207 calendar/gui/e-cal-view.c:1271
+#: calendar/gui/e-cal-view.c:1235 calendar/gui/e-cal-view.c:1299
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "_Idi na Danas"
 
-#: calendar/gui/e-cal-view.c:1208 calendar/gui/e-cal-view.c:1273
+#: calendar/gui/e-cal-view.c:1236 calendar/gui/e-cal-view.c:1301
 msgid "_Go to Date..."
 msgstr "_Idi na datum..."
 
-#: calendar/gui/e-cal-view.c:1212 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1240 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi slobodnu/zauzetu informaciju"
 
-#: calendar/gui/e-cal-view.c:1218 calendar/gui/e-cal-view.c:1283
-#: calendar/gui/e-calendar-table.c:1033 calendar/gui/e-calendar-table.c:1074
-#: mail/em-folder-view.c:706 shell/e-shortcuts-view.c:422
-#: ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Otvori"
-
-#: calendar/gui/e-cal-view.c:1219 calendar/gui/e-cal-view.c:1289
-#: calendar/gui/e-calendar-table.c:1035 calendar/gui/e-calendar-table.c:1080
+#: calendar/gui/e-cal-view.c:1247 calendar/gui/e-cal-view.c:1317
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1082
 #: mail/em-folder-view.c:708 mail/em-popup.c:597 mail/em-popup.c:712
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Spremi Kao..."
 
-#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1265
-#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1069
+#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1293
+#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1071
 #: 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:1226 calendar/gui/e-cal-view.c:1263
-#: calendar/gui/e-calendar-table.c:1041 calendar/gui/e-calendar-table.c:1067
-#: mail/em-folder-tree.c:1497 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1069
+#: mail/em-folder-tree.c:1649 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:1231
+#: calendar/gui/e-cal-view.c:1259
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: calendar/gui/e-cal-view.c:1232
+#: calendar/gui/e-cal-view.c:1260
 msgid "_Forward as iCalendar..."
 msgstr "_Proslijedi kao iCalendar... "
 
-#: calendar/gui/e-cal-view.c:1237 calendar/gui/e-cal-view.c:1268
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1296
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1269
+#: calendar/gui/e-cal-view.c:1266 calendar/gui/e-cal-view.c:1297
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
-#: calendar/gui/e-cal-view.c:1291 ui/evolution.xml.h:30
+#: calendar/gui/e-cal-view.c:1319 ui/evolution.xml.h:30
 msgid "_Settings..."
 msgstr "_Postavke..."
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:414
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:415
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:416
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:417
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:418
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:419
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:418
+#: calendar/gui/e-calendar-table.c:420
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:421
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:422
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:423
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:1034
+#: calendar/gui/e-calendar-table.c:1036
 msgid "Open _Web Page"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-calendar-table.c:1048
 msgid "_Assign Task"
 msgstr "_Dodijeli zadatak"
 
-#: calendar/gui/e-calendar-table.c:1047
+#: calendar/gui/e-calendar-table.c:1049
 msgid "_Forward as iCalendar"
 msgstr "_Proslijedi kao iCalendar "
 
-#: calendar/gui/e-calendar-table.c:1048
+#: calendar/gui/e-calendar-table.c:1050
 msgid "_Mark as Complete"
 msgstr "_Obilježi kao izvršeno "
 
-#: calendar/gui/e-calendar-table.c:1049
+#: calendar/gui/e-calendar-table.c:1051
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Obilježi odabrane zadatke kao izvršene "
 
-#: calendar/gui/e-calendar-table.c:1054 calendar/gui/e-calendar-table.c:1072
+#: calendar/gui/e-calendar-table.c:1056 calendar/gui/e-calendar-table.c:1074
 msgid "_Delete Selected Tasks"
 msgstr "_Obriši odabrane zadatke"
 
-#: calendar/gui/e-calendar-table.c:1365
+#: calendar/gui/e-calendar-table.c:1367
 #: 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"
 
@@ -5304,26 +5533,19 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#.  strptime format of a weekday, a date and a time,
-#.  in 24-hour format.
-#.  strftime format of a weekday, a date and a
-#.  time, in 24-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#.  strptime format of a weekday, a date and a time,
-#.  in 12-hour format.
-#.  strftime format of a weekday, a date and a
-#.  time, in 12-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
 #: calendar/gui/e-cell-date-edit-text.c:125
+#, c-format
 msgid ""
 "The date must be entered in the format: \n"
 "\n"
@@ -5334,38 +5556,32 @@ 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.
-#.  strftime format %A = full weekday name, %d = day of
-#.  month, %B = full month name. You can change the
-#.  order but don't change the specifiers or add
-#.  anything.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1342
+#. %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:1532
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
-#.  Don't use any other specifiers.
-#.  strftime format %d = day of month, %b = abbreviated
-#.  month name. You can change the order but don't
-#.  change the specifiers or add anything.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1375
+#. 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"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
+#: calendar/gui/e-day-view.c:602 calendar/gui/e-week-view.c:334
 #: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
+#: calendar/gui/e-day-view.c:605 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
@@ -5379,6 +5595,7 @@ msgid "Every day"
 msgstr "svakim danom"
 
 #: calendar/gui/e-itip-control.c:600
+#, c-format
 msgid "Every %d days"
 msgstr "Svakih %d dana"
 
@@ -5387,6 +5604,7 @@ msgid "Every week"
 msgstr "Svakog tjedna"
 
 #: calendar/gui/e-itip-control.c:608
+#, c-format
 msgid "Every %d weeks"
 msgstr "Svakih %d tjedana"
 
@@ -5395,6 +5613,7 @@ msgid "Every week on "
 msgstr "Svake tjedna u "
 
 #: calendar/gui/e-itip-control.c:613
+#, c-format
 msgid "Every %d weeks on "
 msgstr "Svakih %d tjedana u "
 
@@ -5403,10 +5622,12 @@ msgid " and "
 msgstr " i"
 
 #: calendar/gui/e-itip-control.c:628
+#, c-format
 msgid "The %s day of "
 msgstr "%s dan "
 
 #: calendar/gui/e-itip-control.c:641
+#, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
@@ -5415,6 +5636,7 @@ msgid "every month"
 msgstr "svaki mjesec"
 
 #: calendar/gui/e-itip-control.c:651
+#, c-format
 msgid "every %d months"
 msgstr "svakih %d mjeseci"
 
@@ -5423,10 +5645,12 @@ msgid "Every year"
 msgstr "Svake godine"
 
 #: calendar/gui/e-itip-control.c:659
+#, c-format
 msgid "Every %d years"
 msgstr "Svakih %d godina"
 
 #: calendar/gui/e-itip-control.c:671
+#, c-format
 msgid " a total of %d times"
 msgstr "ukupno %d puta"
 
@@ -5464,11 +5688,13 @@ msgstr "Greška iCalendara"
 msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
+#. Describe what the user can do
 #: calendar/gui/e-itip-control.c:916
 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:931
 msgid "<i>None</i>"
@@ -5479,35 +5705,29 @@ msgid "Location:"
 msgstr "Lokacija:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-tasks.c:203
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-tasks.c:202
 msgid "Status:"
 msgstr "Stanje:"
 
 #: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Prihvaćeno"
 
-#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:421
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
 
 #: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
-#: calendar/gui/itip-utils.c:450
+#: 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:988 calendar/gui/e-itip-control.glade.h:6
-#: calendar/gui/e-tasks.c:247 composer/e-msg-composer-attachment.glade.h:3
-#: mail/mail-config.glade.h:45
-msgid "Description:"
-msgstr "Opis:"
-
 #: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
 #: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
 #: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
@@ -5551,13 +5771,14 @@ msgstr "Ažuriraj stanje stranke"
 msgid "Send Latest Information"
 msgstr "Pošalji najnoviju informaciju"
 
-#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:438
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
-#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
+#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Odustani"
 
 #: calendar/gui/e-itip-control.c:1198
+#, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> je objavio podatke o sastanku."
 
@@ -5566,10 +5787,12 @@ msgid "Meeting Information"
 msgstr "Informacije o sastanku"
 
 #: calendar/gui/e-itip-control.c:1204
+#, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> traži da %s bude prisutan na sastanku."
 
 #: calendar/gui/e-itip-control.c:1206
+#, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> traži da budete prisutni na sastanku."
 
@@ -5578,6 +5801,7 @@ msgid "Meeting Proposal"
 msgstr "Prijedlog za sastanak"
 
 #: calendar/gui/e-itip-control.c:1211
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> želi dodati postojećem sastanku."
 
@@ -5586,6 +5810,7 @@ msgid "Meeting Update"
 msgstr "Ažuriranje sastanka"
 
 #: calendar/gui/e-itip-control.c:1216
+#, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> želi dobiti posljednje podatke o sastanku."
 
@@ -5594,6 +5819,7 @@ msgid "Meeting Update Request"
 msgstr "Zahtjev za nove podatke o sastanku"
 
 #: calendar/gui/e-itip-control.c:1224
+#, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> je odgovorio na zahtjev o sastanku."
 
@@ -5602,6 +5828,7 @@ msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
 #: calendar/gui/e-itip-control.c:1232
+#, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je otkazo sastanak."
 
@@ -5611,6 +5838,7 @@ msgstr "Otkaz sastanka"
 
 #: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
 #: calendar/gui/e-itip-control.c:1343
+#, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> je poslao nerazumljivu poruku."
 
@@ -5619,6 +5847,7 @@ msgid "Bad Meeting Message"
 msgstr "Neispravna poruka o sastanku"
 
 #: calendar/gui/e-itip-control.c:1266
+#, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> je objavio podatke o zadatku."
 
@@ -5627,10 +5856,12 @@ msgid "Task Information"
 msgstr "Informacija o zadatku"
 
 #: calendar/gui/e-itip-control.c:1272
+#, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> traži obavljanje zadatka od %s."
 
 #: calendar/gui/e-itip-control.c:1274
+#, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> traži da izvršite zadatak."
 
@@ -5639,6 +5870,7 @@ msgid "Task Proposal"
 msgstr "Prijedlog zadatka"
 
 #: calendar/gui/e-itip-control.c:1279
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> želi dodati postojećem zadatku."
 
@@ -5647,6 +5879,7 @@ msgid "Task Update"
 msgstr "Ažuriranje zadatka"
 
 #: calendar/gui/e-itip-control.c:1284
+#, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> želi dobiti posljednje podatke o zadatku."
 
@@ -5655,6 +5888,7 @@ msgid "Task Update Request"
 msgstr "Zahtjev za osvježenje zadatka"
 
 #: calendar/gui/e-itip-control.c:1292
+#, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> je odgovorio na dodijeljeni zadatak."
 
@@ -5663,6 +5897,7 @@ msgid "Task Reply"
 msgstr "Odgovor na zadatak"
 
 #: calendar/gui/e-itip-control.c:1300
+#, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je otkazao zadatak."
 
@@ -5675,6 +5910,7 @@ msgid "Bad Task Message"
 msgstr "Neispravna poruka o zadatku"
 
 #: calendar/gui/e-itip-control.c:1328
+#, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> je objavio podatke o dostupnosti."
 
@@ -5683,6 +5919,7 @@ msgid "Free/Busy Information"
 msgstr "Informacija slobodno/zauzeto"
 
 #: calendar/gui/e-itip-control.c:1333
+#, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> traži vaše podatke o dostupnosti."
 
@@ -5691,6 +5928,7 @@ msgid "Free/Busy Request"
 msgstr "Slobodan/zauzet zahtjev"
 
 #: calendar/gui/e-itip-control.c:1338
+#, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> je odgovorio na zahtjev o dostupnosti."
 
@@ -5740,7 +5978,8 @@ msgstr "Ovaj odgovor nije poslao trenutni sudionik. Dodati ga u sudionike?"
 
 #: calendar/gui/e-itip-control.c:1839
 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:1858
 msgid "There was an error on the CORBA system\n"
@@ -5905,18 +6144,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.
-#.  This is a strftime() format string %a = abbreviated weekday name,
-#.  %m = month number, %d = month day, %Y = full year.
-#.  strptime format of a weekday and a date.
-#.  strftime format of a weekday and a date.
+#. 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
@@ -5924,11 +6159,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.
-#.  strptime format of a weekday and a date.
-#.  This is the preferred date format for the locale.
-#.  This is a strftime() format for a short date. %m = month,
-#.  %d = day of month, %Y = year (all digits).
+#. %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"
@@ -5994,38 +6225,26 @@ 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:180
 msgid "Start Date:"
 msgstr "Početni datum"
 
-#: calendar/gui/e-tasks.c:197
+#: calendar/gui/e-tasks.c:196
 msgid "Due Date:"
 msgstr "Datum krajnjeg roka:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:225
+#: calendar/gui/e-tasks.c:224
 msgid "Priority:"
 msgstr "Prioritet:"
 
 #. URL
-#: calendar/gui/e-tasks.c:281
+#: calendar/gui/e-tasks.c:280
 msgid "Web Page:"
 msgstr "Internet stranica"
 
-#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:203
-#, fuzzy
-msgid "Could not load the tasks in `%s'"
-msgstr "Nisam mogao da učitam zaduženja u `%s"
-
-#: calendar/gui/e-tasks.c:725
-msgid "The method required to load `%s' is not supported"
-msgstr "Metoda potrebna za učitavanje `%s' nije podržana"
-
-#: calendar/gui/e-tasks.c:739
-msgid "You don't have permission to open the folder in `%s'"
-msgstr "Nemate dozvolu otvoriti direktorij u `%s"
-
-#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1877
+#: calendar/gui/e-tasks.c:730 calendar/gui/gnome-cal.c:1890
+#, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
@@ -6033,30 +6252,54 @@ msgstr ""
 "Greška na %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:793
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "Otvaram smočnica %s"
+
+#: calendar/gui/e-tasks.c:808
+#, fuzzy, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Greška na %s:\n"
+" %s"
+
+#: calendar/gui/e-tasks.c:825
+#, fuzzy
+msgid "Loading tasks"
+msgstr "Učitavanje slika"
+
+#: calendar/gui/e-tasks.c:918
 msgid "Completing tasks..."
 msgstr "Završavam zadatke..."
 
-#: calendar/gui/e-tasks.c:990
+#: calendar/gui/e-tasks.c:941
 msgid "Deleting selected objects..."
 msgstr "Brišem odabrane objekte..."
 
-#: calendar/gui/e-tasks.c:1015
+#: calendar/gui/e-tasks.c:966
 msgid "Expunging"
 msgstr "Izbacujem"
 
-#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
+#: calendar/gui/gnome-cal.c:1607 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: calendar/gui/gnome-cal.c:1758
+#: calendar/gui/gnome-cal.c:1755
+#, fuzzy, c-format
+msgid "Opening %s"
+msgstr "Otvori u %s..."
+
+#: calendar/gui/gnome-cal.c:1766
 #, c-format
 msgid "Could not open '%s': %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1898
-#, fuzzy
+#: calendar/gui/gnome-cal.c:1911
+#, fuzzy, c-format
 msgid ""
 "The task backend for\n"
 "%s\n"
@@ -6066,7 +6309,8 @@ msgstr ""
 "%s\n"
 " je pao. Moraćete da ponovo pokrenete Evoluciju da bi nastavili da koristite"
 
-#: calendar/gui/gnome-cal.c:1906
+#: calendar/gui/gnome-cal.c:1919
+#, c-format
 msgid ""
 "The calendar backend for\n"
 "%s\n"
@@ -6074,9 +6318,10 @@ msgid ""
 msgstr ""
 "Osnovni proces kalendara za\n"
 "%s\n"
-" je pao. Morat ćete ponovo pokreneti Evolution da biste ga mogli ponovno koristiti."
+" je pao. Morat ćete ponovo pokreneti Evolution da biste ga mogli ponovno "
+"koristiti."
 
-#: calendar/gui/gnome-cal.c:2785
+#: calendar/gui/gnome-cal.c:2798
 msgid "Purging"
 msgstr ""
 
@@ -6136,59 +6381,65 @@ msgstr "Listopad"
 msgid "September"
 msgstr "Rujan"
 
-#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
-#: calendar/gui/itip-utils.c:347
+#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
+#: calendar/gui/itip-utils.c:351
 msgid "An organizer must be set."
 msgstr "Organizator mora biti poslan."
 
-#: calendar/gui/itip-utils.c:302
+#: calendar/gui/itip-utils.c:306
 msgid "At least one attendee is necessary"
 msgstr "Nužna je najmanje jedna prisutna osoba"
 
-#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Event information"
 msgstr "Informacije o događaju"
 
-#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
 msgid "Task information"
 msgstr "Informacija o zadatku"
 
-#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
+#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
 msgid "Journal information"
 msgstr "Informacije o dnevniku"
 
-#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
+#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
 msgid "Free/Busy information"
 msgstr "Slobodan/zauzet informacija"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:402
 msgid "Calendar information"
 msgstr "Informacije o kalendaru"
 
-#: calendar/gui/itip-utils.c:434
+#: calendar/gui/itip-utils.c:438
 msgid "Updated"
 msgstr "Ažurirano"
 
-#: calendar/gui/itip-utils.c:442
+#: calendar/gui/itip-utils.c:446
 msgid "Refresh"
 msgstr "Osvježi"
 
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/itip-utils.c:450
 msgid "Counter-proposal"
 msgstr "Kontra-prijedlog"
 
-#: calendar/gui/itip-utils.c:517
+#: calendar/gui/itip-utils.c:521
+#, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Slobodan/zauzet informacija (%s do %s)"
 
-#: calendar/gui/itip-utils.c:527
+#: calendar/gui/itip-utils.c:531
 msgid "iCalendar information"
 msgstr "iCalendar informacije"
 
-#: calendar/gui/itip-utils.c:667
+#: calendar/gui/itip-utils.c:671
 msgid "You must be an attendee of the event."
 msgstr "Morate biti sudionik događaja"
 
+#: calendar/gui/itip-utils.c:1155
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Unesite lozinku za %s"
+
 #: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1."
@@ -6360,6 +6611,7 @@ msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
 #: calendar/gui/print.c:1927
+#, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Odabrani tjedan (%s - %s)"
 
@@ -6378,14 +6630,17 @@ msgid "Task"
 msgstr "Zadatak"
 
 #: calendar/gui/print.c:2326
+#, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
 #: calendar/gui/print.c:2343
+#, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s "
 
 #: calendar/gui/print.c:2355
+#, c-format
 msgid "Percent Complete: %i"
 msgstr "Postotak završenog: %i"
 
@@ -6395,6 +6650,7 @@ msgid "URL: %s"
 msgstr "URL: %s"
 
 #: calendar/gui/print.c:2381
+#, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
@@ -6403,7 +6659,7 @@ msgid "Contacts: "
 msgstr "Konatkti: "
 
 #: calendar/gui/print.c:2530 calendar/gui/print.c:2616
-#: calendar/gui/tasks-control.c:583 mail/em-format-html-print.c:147
+#: calendar/gui/tasks-control.c:582 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Pogled prije ispisa"
 
@@ -6420,44 +6676,36 @@ msgstr "Podešavanje ispisa"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:391
-msgid "Rename this task list to"
-msgstr ""
-
-#: calendar/gui/tasks-component.c:412
-msgid "New Task List"
-msgstr ""
-
-#: calendar/gui/tasks-component.c:630
+#: calendar/gui/tasks-component.c:622
 msgid "New task"
 msgstr "Novi zadatak"
 
-#: calendar/gui/tasks-component.c:631
+#: calendar/gui/tasks-component.c:623
 msgid "_Task"
 msgstr "_Zadatak"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:624
 msgid "Create a new task"
 msgstr "Unesi novi zadatak"
 
-#: calendar/gui/tasks-component.c:637
+#: calendar/gui/tasks-component.c:629
 msgid "New task list"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:638
+#: calendar/gui/tasks-component.c:630
 msgid "_Task List"
 msgstr "_Lista zadataka"
 
-#: calendar/gui/tasks-component.c:639
+#: calendar/gui/tasks-component.c:631
 msgid "Create a new task list"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:706
+#: calendar/gui/tasks-component.c:698
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:719
+#: calendar/gui/tasks-component.c:710
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -6465,6 +6713,11 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "URI za prikaz direktorija zadataka"
 
+#: calendar/gui/tasks-control.c:203
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Nisam mogao da učitam zaduženja u `%s"
+
 #: calendar/gui/tasks-control.c:466
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6472,16 +6725,16 @@ 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?"
 
-#: calendar/gui/tasks-control.c:470
+#: calendar/gui/tasks-control.c:469
 msgid "Do not ask me again."
 msgstr "Ne pitaj me ponovno."
 
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:611
 msgid "Print Tasks"
 msgstr "Ispiši zadatke"
 
@@ -6529,9 +6782,11 @@ msgstr ""
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
+#.
 #. * These are the timezone names from the Olson timezone data.
-#.  * We only place them here so gettext picks them up for translation.
-#.  * Don't include in any C files.
+#. * We only place them here so gettext picks them up for translation.
+#. * Don't include in any C files.
+#.
 #: calendar/zones.h:7
 msgid "Africa/Abidjan"
 msgstr "Afrika/Abidjan"
@@ -8085,10 +8340,12 @@ msgid "Unable to create cache path"
 msgstr "Nisam mogao napraviti putanju za skrivenu memoriju"
 
 #: camel/camel-data-cache.c:370
+#, 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"
@@ -8099,7 +8356,7 @@ msgstr ""
 "se budete ponovo povezali na mrežu."
 
 #: camel/camel-disco-diary.c:248
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Could not open `%s':\n"
 "%s\n"
@@ -8113,11 +8370,16 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Sinkronizovanje sa poslužiteljem"
 
-#: camel/camel-disco-folder.c:90
+#: camel/camel-disco-folder.c:41
+msgid "Copy folder content locally for offline operation"
+msgstr ""
+
+#: camel/camel-disco-folder.c:101
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:351
+#: camel/camel-disco-folder.c:441
+#, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Pripremam mapu '%s' za neumreženi rad"
 
@@ -8127,15 +8389,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"
 
@@ -8144,10 +8409,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"
 
@@ -8160,6 +8427,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%%)"
 
@@ -8168,6 +8436,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"
 
@@ -8176,10 +8445,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"
 
@@ -8196,10 +8467,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"
@@ -8208,6 +8481,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-folder-search.c:358
+#, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
@@ -8220,18 +8494,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
+#, 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"
 
@@ -8248,6 +8526,7 @@ msgid "Filtering new message(s)"
 msgstr ""
 
 #: camel/camel-gpg-context.c:709
+#, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
 "\n"
@@ -8266,6 +8545,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\""
@@ -8284,6 +8564,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"
 
@@ -8296,6 +8577,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"
@@ -8306,6 +8588,7 @@ 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"
 
@@ -8316,6 +8599,7 @@ msgstr ""
 
 #: 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"
 
@@ -8337,8 +8621,10 @@ msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
 #: 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
@@ -8358,68 +8644,80 @@ msgid "Unable to parse message content"
 msgstr ""
 
 #: 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
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Nisam mogao da zaključam '%s': greška u protokolu sa pomoćnikom zaključavanja"
+msgstr ""
+"Nisam mogao da zaključam '%s': greška u protokolu sa pomoćnikom zaključavanja"
 
 #: camel/camel-lock-client.c:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not lock '%s'"
 msgstr "Nisam mogao da zaključam '%s"
 
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nisam mogao napraviti zaključanu 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
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nisam mogao napraviti vezu: %s"
 
 #: camel/camel-movemail.c:199
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not fork: %s"
 msgstr "Nisam mogao da podelim: %s"
 
 #: camel/camel-movemail.c:237
+#, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program za premeštanje pošte nije uspio: %s"
 
@@ -8428,14 +8726,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"
 
@@ -8452,17 +8753,17 @@ msgid "parse error"
 msgstr "greška pri parsiranju"
 
 #: camel/camel-provider.c:132
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Nisam mogao da učitam %s: ovaj sistem ne podržava učitavanje modula."
 
 #: camel/camel-provider.c:141
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not load %s: %s"
 msgstr "Nisam mogao da učitam %s: %s"
 
 #: camel/camel-provider.c:149
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nisam mogao da učitam %s: nema koda za pokretanje u modulu."
 
@@ -8479,6 +8780,7 @@ msgid "Authentication failed."
 msgstr "Neuspjelo spajanje."
 
 #: camel/camel-sasl-anonymous.c:121
+#, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
@@ -8487,6 +8789,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-anonymous.c:133
+#, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
@@ -8495,6 +8798,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-anonymous.c:145
+#, c-format
 msgid ""
 "Invalid trace information:\n"
 "%s"
@@ -8510,7 +8814,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
 #, fuzzy
@@ -8521,7 +8827,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"
@@ -8533,7 +8841,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"
@@ -8571,7 +8880,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 ""
@@ -8585,7 +8895,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 ""
@@ -8614,11 +8926,12 @@ msgstr "Važenje traženih uverenja je isteklo."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1217
+#: camel/providers/imap/camel-imap-store.c:1221
 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"
 
@@ -8635,7 +8948,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
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
@@ -8663,7 +8976,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"
@@ -8690,38 +9005,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:278
+#, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s traži dio sa korisničkim imenom'"
 
 #: camel/camel-service.c:286
+#, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s traži dio sa imenom računala"
 
 #: camel/camel-service.c:294
+#, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' traži dio sa putanjom"
 
 #: camel/camel-service.c:739
+#, c-format
 msgid "Resolving: %s"
 msgstr "Razlučujem: %s"
 
 #: camel/camel-service.c:770 camel/camel-service.c:894
+#, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Greška kod pretrage za imenom: %s"
 
 #: camel/camel-service.c:791 camel/camel-service.c:915
+#, 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:804
+#, 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:807
+#, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Neuspjelo nalaženje domaćina: %s: nepoznat razlog"
 
@@ -8746,10 +9070,12 @@ 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: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:525
+#, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
@@ -8817,11 +9143,11 @@ msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne mogu napraviti mapu: neispravna operacija"
 
 #: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1098
+#: mail/mail-ops.c:1102
 msgid "Trash"
 msgstr "Smeće"
 
-#: camel/camel-store.c:793 mail/mail-ops.c:1104
+#: camel/camel-store.c:793 mail/mail-ops.c:1108
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Smeće"
@@ -8944,6 +9270,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"
@@ -8964,6 +9291,7 @@ msgid "BAD"
 msgstr "LOŠ"
 
 #: camel/camel-tcp-stream-openssl.c:704
+#, c-format
 msgid ""
 "Bad certificate from %s:\n"
 "\n"
@@ -8983,6 +9311,7 @@ msgstr ""
 
 #. construct our user prompt
 #: camel/camel-tcp-stream-ssl.c:841
+#, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
 "\n"
@@ -8997,6 +9326,7 @@ msgstr ""
 "Želite li prihvatiti?"
 
 #: camel/camel-tcp-stream-ssl.c:885
+#, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
@@ -9005,6 +9335,7 @@ msgstr ""
 "Izdavač: %s"
 
 #: camel/camel-tcp-stream-ssl.c:937
+#, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
@@ -9013,6 +9344,7 @@ msgstr ""
 "Izdavač: %s"
 
 #: camel/camel-tcp-stream-ssl.c:955
+#, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
@@ -9021,6 +9353,7 @@ msgstr ""
 "Izdavač: %s"
 
 #: camel/camel-tcp-stream-ssl.c:972
+#, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
@@ -9029,14 +9362,17 @@ msgstr ""
 "Izdavač: %s"
 
 #: camel/camel-url.c:290 mail/mail-tools.c:138
+#, 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"
 
@@ -9045,71 +9381,62 @@ 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:278
+#, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
 
 #: camel/camel-vee-store.c:299
+#, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne mogu obrisati mapu: %s: nema takve mape"
 
 #: camel/camel-vee-store.c:312
+#, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
 
 #: camel/camel-vee-store.c:320
+#, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne mogu preimenovati mapu: %s: nema takve mape"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:49
+#: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Provjeravam za novu poštu"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:51
+#: camel/providers/groupwise/camel-groupwise-provider.c:55
 #: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "Provjeri za nove poruke u svim mapama"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:56
-msgid "Address Book"
-msgstr "Adresar"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:59
-msgid "LDAP Server Name:"
-msgstr ""
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:62
-#, c-format
-msgid "LDAP Download limit: %s"
-msgstr ""
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:67
+#: camel/providers/groupwise/camel-groupwise-provider.c:71
 #, fuzzy
 msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Primjeni filtere na nove poruke u INBOXu ovog servera"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:70
+#: camel/providers/groupwise/camel-groupwise-provider.c:74
 #: camel/providers/imap/camel-imap-provider.c:66
 msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:78
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:84
 msgid "For accesing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:95
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
 #: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
-#: camel/providers/nntp/camel-nntp-store.c:265
+#: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Lozinka"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:101
 #: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -9118,17 +9445,19 @@ msgstr "Spajanje na IMAP poslužitelje korištenjem lozinke u čistom tekstu."
 #: 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:2817
+#: camel/providers/imap/camel-imap-store.c:2821
 msgid "Operation cancelled"
 msgstr "Operacija je opozvana"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2820
+#: camel/providers/imap/camel-imap-store.c:2824
+#, 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"
@@ -9137,10 +9466,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"
 
@@ -9149,36 +9480,40 @@ 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
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not load summary for %s"
 msgstr "Nisam mogao da učitam sažetak za %s"
 
-#: camel/providers/imap/camel-imap-folder.c:308
+#: camel/providers/imap/camel-imap-folder.c:314
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mapa je uništena i ponovo kreirana na serveru."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:550
+#: camel/providers/imap/camel-imap-folder.c:560
 msgid "Scanning for changed messages"
 msgstr "Tragam za promijenjenim porukama"
 
-#: camel/providers/imap/camel-imap-folder.c:1886
+#: camel/providers/imap/camel-imap-folder.c:1899
+#, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Ne mogu da pokupim poruku: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9186,6 +9521,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"
@@ -9193,29 +9529,31 @@ msgstr ""
 "Ne mogu dobiti poruku: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Nema takve poruke"
 
-#: camel/providers/imap/camel-imap-folder.c:1946
-#: camel/providers/imap/camel-imap-folder.c:2542
+#: camel/providers/imap/camel-imap-folder.c:1959
+#: camel/providers/imap/camel-imap-folder.c:2555
+#: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Ova poruka je trenutno nedostupna"
 
-#: camel/providers/imap/camel-imap-folder.c:2206
-#: camel/providers/imap/camel-imap-folder.c:2276
+#: camel/providers/imap/camel-imap-folder.c:2219
+#: camel/providers/imap/camel-imap-folder.c:2289
 msgid "Fetching summary information for new messages"
 msgstr "Prikupljam sažetu informaciju za nove poruke"
 
-#: camel/providers/imap/camel-imap-folder.c:2580
+#: camel/providers/imap/camel-imap-folder.c:2593
 #, fuzzy
 msgid "Could not find message body in FETCH response."
 msgstr "Nisam mogao da pronađem 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"
 
@@ -9223,10 +9561,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"
 
@@ -9243,6 +9583,7 @@ msgid "Command:"
 msgstr "Naredba:"
 
 #: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Folders"
 msgstr "Mape"
 
@@ -9271,20 +9612,23 @@ 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/nntp/camel-nntp-store.c:131
+#: camel/providers/nntp/camel-nntp-store.c:140
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: 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"
 
@@ -9297,16 +9641,18 @@ msgstr ""
 #: 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/nntp/camel-nntp-store.c:128
-#: camel/providers/nntp/camel-nntp-store.c:146
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
 #: camel/providers/pop3/camel-pop3-store.c:194
 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
@@ -9323,25 +9669,29 @@ msgstr "SSL pregovori nisu uspjeli"
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1247
+#: 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:1257
+#: 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:1280
+#: camel/providers/imap/camel-imap-store.c:1284
 #: camel/providers/imapp/camel-imapp-store.c:349
+#, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sMolim unesite IMAP zaporku za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1294
+#: camel/providers/imap/camel-imap-store.c:1298
 msgid "You didn't enter a password."
 msgstr "Niste unijeli lozinku."
 
-#: camel/providers/imap/camel-imap-store.c:1323
+#: camel/providers/imap/camel-imap-store.c:1327
+#, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
@@ -9351,20 +9701,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1670
-#: camel/providers/imap/camel-imap-store.c:1812
+#: 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:2013
-msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
+#: camel/providers/imap/camel-imap-store.c:2017
+#, 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:2025
+#: camel/providers/imap/camel-imap-store.c:2029
+#, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nepoznata glavna mapa: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2061
+#: camel/providers/imap/camel-imap-store.c:2065
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Glavni direktorij ne smije sadržati direktorije "
 
@@ -9396,17 +9750,20 @@ msgstr ""
 
 #. $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)"
 
@@ -9431,8 +9788,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
@@ -9469,16 +9826,19 @@ msgstr ""
 #: camel/providers/local/camel-local-store.c:227
 #: camel/providers/local/camel-mbox-store.c:331
 #: 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"
 
@@ -9487,27 +9847,30 @@ 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:501
+#, 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
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nisam mogao da obrišem sažetak direktorija `%s': %s"
 
 #: camel/providers/local/camel-local-store.c:399
 #: camel/providers/local/camel-mbox-store.c:272
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nisam mogao da obrišem indeks datoteku direktorija `%s': %s"
 
@@ -9518,6 +9881,7 @@ msgid "Could not delete folder meta file `%s': %s"
 msgstr ""
 
 #: 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"
 
@@ -9530,6 +9894,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"
 
@@ -9541,6 +9906,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"
@@ -9552,13 +9918,14 @@ msgstr ""
 #: camel/providers/local/camel-mbox-store.c:157
 #: 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
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
@@ -9567,13 +9934,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
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nisam mogao da obrišem direktorij `%s': %s"
 
@@ -9584,11 +9952,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"
 
@@ -9610,10 +9980,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"
 
@@ -9622,12 +9994,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"
@@ -9644,6 +10018,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Sastavljanje poruke neuspjelo: Oštećeno sandučić?"
 
 #: camel/providers/local/camel-mbox-store.c:149
+#, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
@@ -9659,7 +10034,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:178
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
@@ -9669,13 +10044,14 @@ msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:188
 #: camel/providers/local/camel-mbox-store.c:231
+#, 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
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
@@ -9684,6 +10060,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:238
+#, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mapa `%s' nije prazna. Nije obrisana."
 
@@ -9706,7 +10083,7 @@ msgid "Folder already exists"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:435
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Nisam mogao preimenovati direktorij %s u %s: %s"
 
@@ -9715,38 +10092,46 @@ msgid "The new folder name is illegal."
 msgstr ""
 
 #: 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:1286
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1410
+#, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisam mogao preimenovati direktorij: %s"
 
@@ -9759,19 +10144,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"
 
@@ -9780,30 +10169,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."
 
@@ -9812,10 +10208,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"
 
@@ -9830,16 +10228,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'"
@@ -9848,6 +10249,7 @@ msgstr ""
 "Direktorij je možda oštećen, kopirajte sačuvano u `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
+#: camel/providers/nntp/camel-nntp-store.c:998
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
@@ -9864,27 +10266,71 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:114
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
+#: camel/providers/nntp/camel-nntp-folder.c:140
+#: camel/providers/nntp/camel-nntp-folder.c:230
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Korisnik poništen"
 
-#: camel/providers/nntp/camel-nntp-folder.c:155
-#: camel/providers/nntp/camel-nntp-folder.c:161
+#: camel/providers/nntp/camel-nntp-folder.c:142
+#: camel/providers/nntp/camel-nntp-folder.c:226
+#: camel/providers/nntp/camel-nntp-folder.c:232
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: 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:159
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Korisnik poništen"
+#: 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 ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:170
+#, fuzzy, c-format
+msgid "Could not get article %s from NNTP server"
+msgstr "Nisam mogao pokrenuti wombat server"
+
+#: camel/providers/nntp/camel-nntp-folder.c:353
+msgid "Posting not allowed by news server"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:364
+#, c-format
+msgid "Failed to send newsgroups header: %s: message not posted"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:404
+#: camel/providers/nntp/camel-nntp-folder.c:417
+#, c-format
+msgid "Error posting to newsgroup: %s: message not posted"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:429
+msgid "Error reading response to posted message: message not posted"
+msgstr ""
+
+#: 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"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:448
+msgid "You cannot post NNTP messages while working offline!"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:459
+#, fuzzy
+msgid "You cannot copy messages from a NNTP folder!"
+msgstr "Ne mogu kopirati ili premjestiti poruke u Virtualnu Mapu"
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
@@ -9901,59 +10347,129 @@ msgstr ""
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:41
+#: 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 ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:45
+msgid "In the subscription dialog, show relative folder names"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:52
 msgid "USENET news"
 msgstr "USENET vijesti"
 
-#: camel/providers/nntp/camel-nntp-provider.c:43
+#: camel/providers/nntp/camel-nntp-provider.c:54
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Dobavljač za čitanje i slanje na USENET grupe."
 
-#: camel/providers/nntp/camel-nntp-store.c:149
+#: camel/providers/nntp/camel-nntp-provider.c:73
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+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:161
+#: 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:260
+#: camel/providers/nntp/camel-nntp-store.c:326
+#, c-format
 msgid "USENET News via %s"
 msgstr "USENET vijesti preko %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/nntp/camel-nntp-store.c:641
+#, fuzzy
+msgid "Stream error"
+msgstr "greška pri parsiranju"
+
+#: camel/providers/nntp/camel-nntp-store.c:644
+#, fuzzy, c-format
 msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr "Prijava na NNTP server korištenjem lozinke u čistom tekstu."
+"Error retrieving newsgroups:\n"
+"\n"
+"%s"
+msgstr ""
+"Greška kod spremanja poruka u: %s:\n"
+" %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:237
+#: camel/providers/nntp/camel-nntp-store.c:736
+msgid ""
+"You cannot subscribe to this newsgroup:\n"
+"\n"
+"No such newsgroup. The selected item is a probably a parent folder."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:768
+msgid ""
+"You cannot unsubscribe to this newsgroup:\n"
+"\n"
+"newsgroup does not exist!"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:793
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:801
+#, fuzzy
+msgid "You cannot rename a folder in a News store."
+msgstr "Nisam mogao preimenovati direktorij %s u %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:809
+#, fuzzy
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr "Ne mogu premjestiti mapu u neku od njenih potomaka."
+
+#: camel/providers/nntp/camel-nntp-summary.c:229
+#, fuzzy, c-format
+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:241
-#, fuzzy
+#: camel/providers/nntp/camel-nntp-summary.c:246
+#, fuzzy, c-format
 msgid "Could not get group: %s"
 msgstr "Nisam mogao da dobijem grupu: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:347
+#: camel/providers/nntp/camel-nntp-summary.c:311
+#, fuzzy
+msgid "Could not get messages: unspecificed error"
+msgstr "Nisam mogao poslati poruku: %s"
+
+#: 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:407
-#: camel/providers/nntp/camel-nntp-summary.c:508
+#: 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:523
+#: camel/providers/nntp/camel-nntp-summary.c:532
+#, c-format
 msgid "Unknown server response: %s"
 msgstr "Nepoznat odgovor poslužitelja: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:569
+#: camel/providers/nntp/camel-nntp-summary.c:579
 msgid "Use cancel"
 msgstr "Koristite poništi"
 
-#: camel/providers/nntp/camel-nntp-summary.c:571
+#: camel/providers/nntp/camel-nntp-summary.c:581
+#, c-format
 msgid "Operation failed: %s"
 msgstr "Neuspjela operacija: %s"
 
@@ -9962,6 +10478,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"
 
@@ -9970,12 +10487,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)"
 
@@ -9988,6 +10507,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"
 
@@ -10007,7 +10527,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 ""
@@ -10015,50 +10537,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
+#, 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
+#, 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
+#, 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:519
+#, 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
+#, 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
+#, 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
+#, 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:478
+#, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sMolim unesite POP zaporku za %s@%s"
 
 #: camel/providers/pop3/camel-pop3-store.c:533
 #: camel/providers/pop3/camel-pop3-store.c:540
+#, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
@@ -10067,6 +10599,7 @@ msgstr ""
 "Greška kod slanja zaporke: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:639
+#, c-format
 msgid "No such folder `%s'."
 msgstr "Nema takve mape `%s'."
 
@@ -10079,36 +10612,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
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Nisam mogao napraviti vezu na sendmail: %s: poruka nije poslata"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:165
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nisam mogao da podelim sendmail: %s: poruka nije poslata"
 
 #: 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
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nisam mogao da izvršim %s: poruka nije poslata"
 
 #: 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"
 
@@ -10234,14 +10771,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"
 
@@ -10250,14 +10790,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@%s"
 msgstr "%sMolim unesite SMTP zaporku za %s@%s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:533
+#, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
 "%s\n"
@@ -10268,10 +10811,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"
 
@@ -10297,6 +10842,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"
 
@@ -10314,6 +10860,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"
 
@@ -10326,6 +10873,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"
 
@@ -10334,20 +10882,23 @@ 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
-#, fuzzy
+#, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA zahtjevu je isteklo vrijeme: %s: poruka nije poslata"
 
 #. we should have gotten instructions on how to use the DATA command:
-#.  * 354 Enter mail, end with "." on a line by itself
+#. * 354 Enter mail, end with "." on a line by itself
+#.
 #: camel/providers/smtp/camel-smtp-transport.c:1277
 #, fuzzy
 msgid "DATA response error"
@@ -10355,9 +10906,10 @@ msgstr "DATA pogrešan odgovor"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1318
 #: camel/providers/smtp/camel-smtp-transport.c:1341
-#, fuzzy
+#, fuzzy, 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 poslata"
+msgstr ""
+"DATA slanju isteklo je vrijeme: završetak poruke: %s: poruka nije poslata"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1361
 #, fuzzy
@@ -10365,6 +10917,7 @@ 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"
 
@@ -10373,6 +10926,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"
 
@@ -10381,18 +10935,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:1382
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
 msgid "attachment"
 msgstr "prilog"
 
@@ -10410,10 +10967,12 @@ 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"
 
@@ -10434,87 +10993,105 @@ msgstr "Mime tip:"
 msgid "Suggest automatic display of attachment"
 msgstr "Predloži automatsko otvaranje privitka"
 
-#: composer/e-msg-composer-hdrs.c:287
+#: composer/e-msg-composer-hdrs.c:304
 msgid "You need to configure an account before you can compose mail."
 msgstr "Morate da podesite nalog da biste mogli sastaviti poruku."
 
-#: composer/e-msg-composer-hdrs.c:480
+#: composer/e-msg-composer-hdrs.c:507
+msgid "Posting destination"
+msgstr "Odredište slanja"
+
+#: composer/e-msg-composer-hdrs.c:508
+#, fuzzy
+msgid "Choose folders to post the message to."
+msgstr "Dodaj datoteku poruci"
+
+#: composer/e-msg-composer-hdrs.c:542
 msgid "Click here for the address book"
 msgstr "Kliknite ovdje za adresar."
 
+#.
 #. * Reply-To:
-#.  *
-#.  * Create this before we call create_from_optionmenu,
-#.  * because that causes from_changed to be called, which
-#.  * expects the reply_to fields to be initialized.
-#: composer/e-msg-composer-hdrs.c:510
+#. *
+#. * 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:516
+#.
+#: composer/e-msg-composer-hdrs.c:578
 msgid "From:"
 msgstr "Od:"
 
+#.
 #. * Subject
-#: composer/e-msg-composer-hdrs.c:522
+#.
+#: composer/e-msg-composer-hdrs.c:584
 msgid "Subject:"
 msgstr "Tema:"
 
-#: composer/e-msg-composer-hdrs.c:531
+#: composer/e-msg-composer-hdrs.c:593
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:532
+#: composer/e-msg-composer-hdrs.c:594
 msgid "Enter the recipients of the message"
 msgstr "Unesite primatelje poruke"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:597
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:536
+#: composer/e-msg-composer-hdrs.c:598
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Unesite adrese na koje će se slati kopija poruke"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:601
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:540
+#: composer/e-msg-composer-hdrs.c:602
 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:547
+#.
+#: composer/e-msg-composer-hdrs.c:609
 msgid "Post To:"
 msgstr "Oglasi na:"
 
-#: composer/e-msg-composer-hdrs.c:548
-msgid "Posting destination"
-msgstr "Odredište slanja"
-
-#: composer/e-msg-composer-hdrs.c:548
-msgid "Choose a folder to post the message to."
-msgstr ""
+#: composer/e-msg-composer-hdrs.c:614
+#, fuzzy
+msgid "Click here to select folders to post to"
+msgstr "<kliknite ovdje za odabir mape>"
 
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Priloži datoteku(e)"
 
-#: composer/e-msg-composer.c:651
-msgid "Cannot sign outgoing message: No signing certificate set for from account"
+#: composer/e-msg-composer.c:654
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 
-#: composer/e-msg-composer.c:657
+#: composer/e-msg-composer.c:660
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:788
+#: composer/e-msg-composer.c:791
+#, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
@@ -10522,27 +11099,31 @@ msgstr ""
 "Greška kod čitanja datoteke %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1153
+#: composer/e-msg-composer.c:1143
 msgid "File exists, overwrite?"
 msgstr "Datoteka postoji, prepisai preko nje?"
 
-#: composer/e-msg-composer.c:1164 composer/e-msg-composer.c:1180
+#: composer/e-msg-composer.c:1154 composer/e-msg-composer.c:1170
+#, c-format
 msgid "Error saving file: %s"
 msgstr "Greška kod spremanja datoteke: %s"
 
-#: composer/e-msg-composer.c:1204
+#: composer/e-msg-composer.c:1194
+#, c-format
 msgid "Error loading file: %s"
 msgstr "Greška kod učitavanja datoteke: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1232
+#, c-format
 msgid "Error accessing file: %s"
 msgstr "Greška kod pristupa datoteci: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1240
 msgid "Unable to retrieve message from editor"
 msgstr "Ne mogu da povratim poruku iz urednika"
 
-#: composer/e-msg-composer.c:1257
+#: composer/e-msg-composer.c:1247
+#, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
@@ -10550,7 +11131,8 @@ msgstr ""
 "Ne mogu da tražim datoteku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1264
+#: composer/e-msg-composer.c:1254
+#, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
@@ -10558,7 +11140,8 @@ msgstr ""
 "Ne mogu da skratim datoteku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1273
+#: composer/e-msg-composer.c:1263
+#, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
@@ -10566,7 +11149,8 @@ msgstr ""
 "Ne mogu kopirati opis datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1282
+#: composer/e-msg-composer.c:1272
+#, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
@@ -10574,15 +11158,17 @@ msgstr ""
 "Greška kod automatskog spremanja poruke: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1386
+#: composer/e-msg-composer.c:1376
+#, fuzzy
 msgid ""
-"Ximian Evolution has found unsaved files from a previous session.\n"
+"Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 "Ximian Evolution je našao nesačuvane datoteke iz prethodnih sesija.\n"
 "Želite li da ih pokuša povratiti?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1540
+#, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
 "\n"
@@ -10592,28 +11178,43 @@ msgstr ""
 "\n"
 "Želite li da sačuvam promjene?"
 
-#: composer/e-msg-composer.c:1559
+#: composer/e-msg-composer.c:1549
 msgid "Warning: Modified Message"
 msgstr "Upozorenje: izmjenjena poruka"
 
-#: composer/e-msg-composer.c:1592
+#: composer/e-msg-composer.c:1582
 msgid "Open file"
 msgstr "Otvori datoteku"
 
-#: composer/e-msg-composer.c:2011
+#: composer/e-msg-composer.c:2027
 msgid "Signature:"
 msgstr "Potpis:"
 
-#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2067 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Automatski stvoren"
 
-#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
-#: composer/e-msg-composer.c:2930
+#: composer/e-msg-composer.c:2245
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2274
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2277 composer/e-msg-composer.c:3136
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2294 composer/e-msg-composer.c:3020
+#: composer/e-msg-composer.c:3021
 msgid "Compose a message"
 msgstr "Sastavi poruku"
 
-#: composer/e-msg-composer.c:2961
+#: composer/e-msg-composer.c:3052
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10621,7 +11222,7 @@ msgstr ""
 "Ne mogu kreirati prozor za sastavljanje:\n"
 "Ne mogu pokrenuti kontrolu biranja adresa."
 
-#: composer/e-msg-composer.c:2990
+#: composer/e-msg-composer.c:3081
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10633,7 +11234,7 @@ msgstr ""
 "Molim vas da provjerite imate li odgovarajuće inačice\n"
 "gtkhtml i libgtkhtml na sistemu.\n"
 
-#: composer/e-msg-composer.c:3060
+#: composer/e-msg-composer.c:3182
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10641,7 +11242,7 @@ msgstr ""
 "Ne mogu kreirati prozor za sastavljanje:\n"
 "Ne mogu aktivirati komponentu HTML urednika."
 
-#: composer/e-msg-composer.c:4070
+#: composer/e-msg-composer.c:4190
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10730,7 +11331,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"
@@ -10760,7 +11365,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 ""
@@ -10791,29 +11397,25 @@ msgid "Sync Categories:"
 msgstr "Sinkroniziram kategorije:"
 
 #. strptime format of a weekday, a date and a time,
-#.  in 12-hour format, without seconds.
-#.  strftime 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.
-#.  strftime 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"
@@ -10829,55 +11431,47 @@ msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
-#.  without seconds.
+#. without seconds.
 #: e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
-#.  without seconds.
+#. without seconds.
 #: e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y. %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
-#.  without minutes or seconds.
+#. without minutes or seconds.
 #: e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
-#.  without minutes or seconds.
+#. without minutes or seconds.
 #: e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#.  strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#.  strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
-#.  in 12-hour format.
-#.  strftime format of a time in 12-hour format,
-#.  without seconds.
-#.  This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#. 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"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#.  strftime format of a time in 24-hour format,
-#.  without seconds.
-#.  This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
@@ -10981,6 +11575,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."
 
@@ -11003,6 +11598,7 @@ msgid "Select Folder"
 msgstr "Označi mapu"
 
 #: filter/filter-input.c:191
+#, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
@@ -11027,7 +11623,7 @@ msgstr "Za napraviti"
 msgid "Later"
 msgstr "Kasnije"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531 shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
@@ -11225,6 +11821,7 @@ msgid "Follow Up"
 msgstr "Sljedi"
 
 #: filter/libfilter-i18n.h:18 mail/em-folder-view.c:739
+#: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Oznaka"
 
@@ -11357,11 +11954,11 @@ msgstr "je označen"
 
 #: filter/libfilter-i18n.h:51
 msgid "is after"
-msgstr "Prenosim podatke sa %1$S
"
+msgstr "Prenosim podatke sa %1$S\r"
 
 #: filter/libfilter-i18n.h:52
 msgid "is before"
-msgstr "Šaljem zahtjev na %1$S
"
+msgstr "Šaljem zahtjev na %1$S\r"
 
 #: filter/libfilter-i18n.h:53
 msgid "is greater than"
@@ -11397,7 +11994,7 @@ msgstr "vraća"
 
 #: filter/libfilter-i18n.h:61
 msgid "sounds like"
-msgstr "zvuči kao
"
+msgstr "zvuči kao\r"
 
 #: filter/libfilter-i18n.h:62
 msgid "starts with"
@@ -11405,6 +12002,7 @@ msgstr "počinje sa"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
 #: mail/mail-vfolder.c:915
+#, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Ime pravila '%s' nije jedinstveno, odaberite drugo."
 
@@ -11478,7 +12076,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
@@ -11517,7 +12116,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:807
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:806
 #: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
 #: mail/importers/pine-importer.c:572
 msgid "Mail"
@@ -11557,7 +12156,7 @@ msgid "[Default]"
 msgstr "[Predefinirano]"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
-#.  has "activatable" set.
+#. has "activatable" set.
 #: mail/em-account-prefs.c:487 mail/em-composer-prefs.c:708
 #: mail/em-composer-prefs.c:854
 msgid "Enabled"
@@ -11617,8 +12216,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."
@@ -11630,15 +12229,15 @@ 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:301
+#: mail/em-composer-utils.c:305
 msgid "You must specify recipients in order to send this message."
 msgstr "Morate da odredite primatelje da biste poslali poruku."
 
-#: mail/em-composer-utils.c:543
+#: mail/em-composer-utils.c:579
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11650,7 +12249,7 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Napravi _Virtualnu mapu iz pretrage..."
 
-#: mail/em-folder-selection-button.c:116
+#: mail/em-folder-selection-button.c:120
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<kliknite ovdje za odabir mape>"
@@ -11659,7 +12258,7 @@ 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:1091
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1189
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Navedite gdje napraviti mapu:"
@@ -11669,8 +12268,8 @@ msgstr "Navedite gdje napraviti mapu:"
 msgid "Folder _name:"
 msgstr "_Ime mape:"
 
-#: mail/em-folder-tree-model.c:560 mail/em-utils.c:1994
-#, fuzzy
+#: mail/em-folder-tree-model.c:560 mail/em-utils.c:2085
+#, fuzzy, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisam mogao napraviti privrijemeni direktorij: %s"
 
@@ -11693,85 +12292,99 @@ msgstr ""
 msgid "Loading..."
 msgstr "Učitavam..."
 
-#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#: mail/em-folder-tree.c:1067 mail/em-folder-tree.c:1154
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-tree.c:1083 mail/em-folder-tree.c:1096
 #: mail/em-folder-view.c:616 mail/em-folder-view.c:630
 #: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Izaberite direktorij"
 
-#: mail/em-folder-tree.c:1091
+#: mail/em-folder-tree.c:1189
 #, fuzzy
 msgid "Create folder"
 msgstr "Načini direktorij"
 
-#: mail/em-folder-tree.c:1182
+#: mail/em-folder-tree.c:1306
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1203
+#: mail/em-folder-tree.c:1327
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr ""
 
-#: mail/em-folder-tree.c:1213 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:1337 shell/e-shell-folder-commands.c:416
+#, c-format
 msgid "Delete \"%s\""
 msgstr "Obriši \"%s\""
 
-#: mail/em-folder-tree.c:1247 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:1371 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:1249 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:1373 shell/e-shell-folder-commands.c:541
 msgid "Rename Folder"
 msgstr "Preimenuj mapu"
 
-#: mail/em-folder-tree.c:1273 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:1397 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:1371
+#: mail/em-folder-tree.c:1497
 #, fuzzy
 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:1377
+#: mail/em-folder-tree.c:1503
 msgid "Properties"
 msgstr "Svojstva"
 
-#: mail/em-folder-tree.c:1385
+#. TODO: can this be done in a loop?
+#: mail/em-folder-tree.c:1512
 msgid "Folder Name"
 msgstr "Naziv mape"
 
-#: mail/em-folder-tree.c:1492 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:1523
+#, fuzzy
+msgid "Total messages"
+msgstr "Poruka o pomoći"
+
+#: mail/em-folder-tree.c:1535
+#, fuzzy
+msgid "Unread messages"
+msgstr "Sljedeća _nepročitana poruka"
+
+#: mail/em-folder-tree.c:1644 ui/evolution-addressbook.xml.h:45
 #: ui/evolution-mail-global.xml.h:20 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:32
 msgid "_View"
 msgstr "P_ogled"
 
-#: mail/em-folder-tree.c:1493
+#: mail/em-folder-tree.c:1645
 msgid "Open in _New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: mail/em-folder-tree.c:1498
+#: mail/em-folder-tree.c:1650
 msgid "_Move"
 msgstr "_Pomakni"
 
-#: mail/em-folder-tree.c:1501
+#: mail/em-folder-tree.c:1653
 msgid "_New Folder..."
 msgstr "_Novi direktorij..."
 
-#: mail/em-folder-tree.c:1503 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:1655 shell/e-shortcuts-view.c:427
 msgid "_Rename"
 msgstr "_Promijeni ime"
 
-#: mail/em-folder-tree.c:1506 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:1658 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Postavke..."
 
@@ -11918,10 +12531,12 @@ msgid "_Copy Link Location"
 msgstr "_Kopiraj lokaciju veze"
 
 #: mail/em-folder-view.c:2113
+#, c-format
 msgid "Click to mail %s"
 msgstr ""
 
 #: mail/em-folder-view.c:2115
+#, c-format
 msgid "Click to open %s"
 msgstr ""
 
@@ -12026,7 +12641,7 @@ msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
 #: mail/em-format-html-display.c:931 mail/em-format-html.c:1051
-#: mail/em-format.c:1199
+#: mail/em-format.c:1201
 msgid "Unsupported signature format"
 msgstr ""
 
@@ -12043,6 +12658,7 @@ msgid "_Hide"
 msgstr "_Sakrij"
 
 #: mail/em-format-html-print.c:99
+#, c-format
 msgid "Page %d of %d"
 msgstr "Strana %d od %d"
 
@@ -12056,22 +12672,27 @@ msgid "Malformed external-body part."
 msgstr "Neispravan vanjski dio poruke."
 
 #: mail/em-format-html.c:864
+#, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pokazivač na FTP adresu (%s)"
 
 #: mail/em-format-html.c:875
+#, 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:877
+#, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pokazivač na lokalnu datoteku (%s)"
 
 #: mail/em-format-html.c:898
+#, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pokazivač na mrežne podatke (%s) "
 
 #: mail/em-format-html.c:909
+#, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pokazivač na nepoznati vanjski podatak (\"%s\" tipa) "
 
@@ -12124,31 +12745,27 @@ msgstr ""
 msgid "Date"
 msgstr "Datum"
 
-#: mail/em-format.c:894
+#: mail/em-format.c:896
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
 
-#: mail/em-format.c:1187
+#: mail/em-format.c:1189
 msgid "Session not initialised"
 msgstr ""
 
-#: mail/em-format.c:1213
+#: mail/em-format.c:1215
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Ova poruka je digitalno potpisana, i odgovara potpisu."
 
-#: mail/em-format.c:1215
+#: mail/em-format.c:1217
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Ova poruka je digitalno potpisana, ali ne može biti provjerena."
 
-#: mail/em-junk-filter.c:72
+#: mail/em-junk-filter.c:73
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-migrate.c:120
-msgid "Migrating..."
-msgstr ""
-
 #: mail/em-migrate.c:128
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -12157,17 +12774,13 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:161
-#, c-format
-msgid "Migrating `%s':"
-msgstr ""
-
 #: mail/em-migrate.c:833
 #, c-format
 msgid "Failed to migrate `%s': %s"
 msgstr ""
 
 #: mail/em-migrate.c:857 mail/em-migrate.c:872
+#, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr ""
 
@@ -12212,27 +12825,28 @@ msgid "_Add to Addressbook"
 msgstr ""
 
 #: mail/em-popup.c:871
+#, c-format
 msgid "Open in %s..."
 msgstr "Otvori u %s..."
 
-#: mail/em-subscribe-editor.c:583
+#: mail/em-subscribe-editor.c:605
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:612
+#: mail/em-subscribe-editor.c:634
 msgid "Subscribed"
 msgstr "U pretplati"
 
-#: mail/em-subscribe-editor.c:616 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:638 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mapa"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:803
+#: mail/em-subscribe-editor.c:826
 msgid "Please select a server."
 msgstr "Molim odaberite server."
 
-#: mail/em-subscribe-editor.c:824
+#: mail/em-subscribe-editor.c:847
 msgid "No server has been selected"
 msgstr "Nije odabran poslužitelj"
 
@@ -12241,6 +12855,7 @@ msgid "Don't show this message again."
 msgstr "Ne pokazuj ponovno ovu poruku."
 
 #: mail/em-utils.c:277
+#, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
@@ -12252,21 +12867,22 @@ msgstr ""
 msgid "Filters"
 msgstr "Filteri"
 
-#: mail/em-utils.c:493
+#: mail/em-utils.c:531
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-utils.c:1046
+#: 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:1056
+#. 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 ""
 
-#: mail/em-utils.c:1332 mail/em-utils.c:1416 mail/em-utils.c:1425
+#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
@@ -12274,7 +12890,8 @@ msgstr ""
 "Ne mogu spremiti u `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1337
+#: mail/em-utils.c:1428
+#, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
@@ -12282,24 +12899,24 @@ msgstr ""
 "`%s' već postoji.\n"
 "Prepisati?"
 
-#: mail/em-utils.c:1380
+#: mail/em-utils.c:1471
 msgid "message"
 msgstr "cedulja"
 
-#: mail/em-utils.c:1432
+#: mail/em-utils.c:1523
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr ""
 
-#: mail/em-utils.c:1486
+#: mail/em-utils.c:1577
 msgid "Save Message..."
 msgstr ""
 
-#: mail/em-utils.c:1524
+#: mail/em-utils.c:1615
 msgid "Add address"
 msgstr "Dodaj adresu"
 
-#: mail/em-utils.c:2314
+#: mail/em-utils.c:2405
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -12308,7 +12925,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/em-utils.c:2340
+#: mail/em-utils.c:2431
 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"
@@ -12487,7 +13104,8 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:41
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:42
@@ -12621,58 +13239,66 @@ msgid "UID string of the default account."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:73
-msgid "Use custom fonts"
+msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:74
-msgid "Use custom fonts for displaying mail"
+msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:75
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Variable width font"
 msgstr "Font promjenljive širine"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12722,11 +13348,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"
 
@@ -12743,6 +13371,7 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/netscape-importer.c:75
+#, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetni filter \"%s\""
 
@@ -12810,7 +13439,7 @@ msgstr "Pretražujem filtere za poštu"
 msgid "Scanning directory"
 msgstr "Pretražujem mapu"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
 msgid "Starting import"
 msgstr "Počinjem uvoz"
 
@@ -12907,18 +13536,22 @@ 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:74
+#, c-format
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
 #: mail/mail-autofilter.c:260
+#, c-format
 msgid "Subject is %s"
 msgstr "Subjekt je %s"
 
 #: mail/mail-autofilter.c:276
+#, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
 #: mail/mail-autofilter.c:293
+#, c-format
 msgid "%s mailing list"
 msgstr "%s dopisna lista"
 
@@ -12936,6 +13569,7 @@ msgid "The following filter rule(s):\n"
 msgstr "Sljedeća pravila filtera:\n"
 
 #: mail/mail-autofilter.c:425
+#, c-format
 msgid ""
 "Used the removed folder:\n"
 "    '%s'\n"
@@ -12949,18 +13583,23 @@ msgstr ""
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:389
+#: mail/mail-component.c:438
 msgid "New Mail Message"
 msgstr "Nova poruka poštom"
 
-#: mail/mail-component.c:390
+#: mail/mail-component.c:439
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: mail/mail-component.c:391
+#: mail/mail-component.c:440
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
+#: mail/mail-component.c:582
+#, fuzzy
+msgid "URI of the mail source that the view will display"
+msgstr "URI koju će kalendar pokazati"
+
 #: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identitet"
@@ -12970,7 +13609,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"
@@ -12996,7 +13638,9 @@ msgstr "Slanje pošte"
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
-msgstr "Molim unesite podatke o načinu na koji želite slati poštu. Ako niste sigurni, pitajte sustav administratora ili davatelja Internet usluga."
+msgstr ""
+"Molim unesite podatke o načinu na koji želite slati poštu. Ako niste "
+"sigurni, pitajte sustav administratora ili davatelja Internet usluga."
 
 #: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
@@ -13011,9 +13655,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:1090
 msgid "Checking Service"
@@ -13021,7 +13666,7 @@ msgstr "Provjeravam servis"
 
 #: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
-msgstr "Spajam se na server...
"
+msgstr "Spajam se na server...\r"
 
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
@@ -13063,10 +13708,6 @@ msgstr "Dodaj novi potpis..."
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Uvij_ek šifriraj na mene kod slanja šifrirane pošte"
 
-#: mail/mail-config.glade.h:15
-msgid "Alerts"
-msgstr "Uzbune"
-
 #: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Uvijek pošalji _skrivenu kopiju (Bcc) na:"
@@ -13187,10 +13828,6 @@ msgstr "Gotovo"
 msgid "Drafts _folder:"
 msgstr "M_apa sa skicama:"
 
-#: mail/mail-config.glade.h:51
-msgid "E_nable"
-msgstr "_Omogući"
-
 #: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Korisnički računi za e-mail"
@@ -13307,7 +13944,8 @@ msgstr "Odabir boje"
 
 #: mail/mail-config.glade.h:90
 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:91
 msgid "Pretty Good Privacy (PGP/GPG)"
@@ -13439,7 +14077,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:126
 msgid ""
@@ -13632,10 +14272,12 @@ msgid "description"
 msgstr "opis"
 
 #: mail/mail-folder-cache.c:786
+#, c-format
 msgid "Pinging %s"
 msgstr "Pingam %s"
 
 #: mail/mail-mt.c:260
+#, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
@@ -13644,6 +14286,7 @@ msgstr ""
 "%s"
 
 #: mail/mail-mt.c:263
+#, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
@@ -13664,10 +14307,12 @@ msgid "Fetching Mail"
 msgstr "Prikupljam poštu"
 
 #: mail/mail-ops.c:537
+#, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nisam mogao primjeniti odlazne filtere: %s"
 
 #: mail/mail-ops.c:558
+#, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
@@ -13676,20 +14321,22 @@ msgstr ""
 "Umjesto toga dodajem u lokalnu mapu „Poslano“."
 
 #: mail/mail-ops.c:567
+#, 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:609
-#, fuzzy
+#, fuzzy, c-format
 msgid "Sending \"%s\""
 msgstr "Šaljem \"%s\""
 
 #: mail/mail-ops.c:727
-#, fuzzy
+#, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
 
 #: mail/mail-ops.c:746
+#, c-format
 msgid "Failed on message %d of %d"
 msgstr "Poruka %d od %d nije poslana"
 
@@ -13701,67 +14348,79 @@ msgstr "Gotovo."
 msgid "Saving message to folder"
 msgstr "Spremam poruku u mapu"
 
-#: mail/mail-ops.c:923
+#: mail/mail-ops.c:927
+#, c-format
 msgid "Moving messages to %s"
 msgstr "Premještam poruke u %s"
 
-#: mail/mail-ops.c:923
+#: mail/mail-ops.c:927
+#, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram poruke u %s"
 
-#: mail/mail-ops.c:1036
+#: mail/mail-ops.c:1040
+#, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pretražujem direktorije u \"%s\""
 
-#: mail/mail-ops.c:1239
+#: mail/mail-ops.c:1243
 msgid "Forwarded messages"
 msgstr "Prosljeđene poruke"
 
-#: mail/mail-ops.c:1282
+#: mail/mail-ops.c:1286
+#, c-format
 msgid "Opening folder %s"
 msgstr "Otvaram mapu %s"
 
-#: mail/mail-ops.c:1354
+#: mail/mail-ops.c:1358
+#, c-format
 msgid "Opening store %s"
 msgstr "Otvaram smočnica %s"
 
-#: mail/mail-ops.c:1432
+#: mail/mail-ops.c:1436
+#, c-format
 msgid "Removing folder %s"
 msgstr "Uklanjam mapu %s"
 
-#: mail/mail-ops.c:1526
+#: mail/mail-ops.c:1530
+#, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštam direktorij '%s'"
 
-#: mail/mail-ops.c:1577
+#: mail/mail-ops.c:1581
 msgid "Refreshing folder"
 msgstr "Osvježavam mapu"
 
-#: mail/mail-ops.c:1613 mail/mail-ops.c:1664
+#: mail/mail-ops.c:1617 mail/mail-ops.c:1668
 msgid "Expunging folder"
 msgstr "Izbacujem mapu"
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1665
+#, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Praznim smeće u '%s'"
 
-#: mail/mail-ops.c:1662
+#: mail/mail-ops.c:1666
 msgid "Local Folders"
 msgstr "Direktoriji"
 
-#: mail/mail-ops.c:1745
+#: mail/mail-ops.c:1749
+#, c-format
 msgid "Retrieving message %s"
 msgstr "Učitavam poruku %s"
 
-#: mail/mail-ops.c:1817
+#: mail/mail-ops.c:1821
+#, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Učitavam poruke (%d)"
 
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1905
+#, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Spremam %d poruku(e)"
 
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1953
+#, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
@@ -13769,7 +14428,8 @@ msgstr ""
 "Ne mogu napraviti izlaznu datoteku: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1981
+#, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
@@ -13777,11 +14437,12 @@ msgstr ""
 "Greška kod spremanja poruka u: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2052
 msgid "Saving attachment"
 msgstr "Spremam prilog"
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:2069
+#, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
@@ -13789,19 +14450,22 @@ msgstr ""
 "Ne mogu napraviti izlaznu datoteku: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2095
+#: mail/mail-ops.c:2099
+#, c-format
 msgid "Could not write data: %s"
 msgstr "Nisam mogao da upišem: %s"
 
-#: mail/mail-ops.c:2243
+#: mail/mail-ops.c:2247
+#, c-format
 msgid "Disconnecting from %s"
 msgstr "Prekidam vezu sa %s"
 
-#: mail/mail-ops.c:2243
+#: mail/mail-ops.c:2247
+#, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponovo se povezujem na %s"
 
-#: mail/mail-ops.c:2345
+#: mail/mail-ops.c:2349
 msgid "Changing junk status"
 msgstr ""
 
@@ -13835,17 +14499,20 @@ msgstr "Podaci o sigurnosti"
 
 #: mail/mail-send-recv.c:146
 msgid "Cancelling..."
-msgstr "Poništavam...
"
+msgstr "Poništavam...\r"
 
 #: mail/mail-send-recv.c:253
+#, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Poslužitelj: %s, tip: %s"
 
 #: mail/mail-send-recv.c:255
+#, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Putanja: %s, tip: %s"
 
 #: mail/mail-send-recv.c:257
+#, c-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
@@ -13866,27 +14533,29 @@ msgstr "Ažuriram..."
 msgid "Waiting..."
 msgstr "Pričekajte..."
 
-#: mail/mail-session.c:234
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Korisnik je poništio operaciju."
 
-#: mail/mail-session.c:267
+#: mail/mail-session.c:273
+#, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: mail/mail-session.c:269
+#: mail/mail-session.c:275
 msgid "Enter Password"
 msgstr "Upišite šifru"
 
-#: mail/mail-session.c:292
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: mail/mail-session.c:293
+#: mail/mail-session.c:299
 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"
 
@@ -13921,6 +14590,7 @@ msgid "Name:"
 msgstr "Ime:"
 
 #: mail/mail-tools.c:271
+#, c-format
 msgid "Forwarded message - %s"
 msgstr "Prosljeđena poruka - %s"
 
@@ -13934,14 +14604,17 @@ msgid "Invalid folder: `%s'"
 msgstr ""
 
 #: mail/mail-vfolder.c:87
+#, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Postavljam vfolder: %s"
 
 #: mail/mail-vfolder.c:205
+#, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Osvežavam vfolder-e za uri: %s"
 
 #: mail/mail-vfolder.c:463
+#, c-format
 msgid ""
 "The following vFolder(s):\n"
 "%sUsed the removed folder:\n"
@@ -13966,6 +14639,7 @@ msgid "Edit VFolder"
 msgstr "Promjeni VMape"
 
 #: mail/mail-vfolder.c:892
+#, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pokušavam promijeniti vmapu '%s' koja ne postoji."
 
@@ -14194,7 +14868,8 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
@@ -14274,10 +14949,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"
 
@@ -14294,6 +14971,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:"
 
@@ -14302,6 +14980,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:"
 
@@ -14310,6 +14989,7 @@ msgid "Move Folder"
 msgstr "Premjesti mapu"
 
 #: shell/e-shell-folder-commands.c:391
+#, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
@@ -14318,10 +14998,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"
@@ -14331,6 +15013,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"
 
@@ -14339,6 +15022,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"
@@ -14347,6 +15031,7 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:137
+#, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
@@ -14370,12 +15055,13 @@ 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:147 shell/e-shell-startup-wizard.c:731
+#: shell/e-shell-importer.c:147 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:"
 
@@ -14392,6 +15078,7 @@ msgstr ""
 "pokušati ponovo, molim pritisnite gumb \"Natrag\".\n"
 
 #: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
+#, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
@@ -14404,6 +15091,7 @@ msgid "Select importer"
 msgstr "Odaberite uvoznika"
 
 #: shell/e-shell-importer.c:463
+#, c-format
 msgid "File %s does not exist"
 msgstr "Datoteka %s ne postoji"
 
@@ -14413,7 +15101,7 @@ msgid "Evolution Error"
 msgstr "Greška Evolucije"
 
 #: shell/e-shell-importer.c:480
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
@@ -14426,6 +15114,7 @@ msgid "Importing"
 msgstr "Uvoz"
 
 #: shell/e-shell-importer.c:496
+#, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
@@ -14434,14 +15123,17 @@ msgstr ""
 "Pokrećem %s"
 
 #: shell/e-shell-importer.c:508
+#, c-format
 msgid "Error starting %s"
 msgstr "Greška kod pokretanja %s"
 
 #: shell/e-shell-importer.c:522
+#, c-format
 msgid "Error loading %s"
 msgstr "Greška prilikom učitavanja %s"
 
 #: shell/e-shell-importer.c:539
+#, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
@@ -14473,7 +15165,7 @@ msgstr "_Uvezi podatke i postavke iz starijih programa"
 msgid "Import a _single file"
 msgstr "_Uvezi jednu datoteku"
 
-#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:566
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14485,7 +15177,8 @@ msgstr ""
 msgid "Starting Intelligent Importers"
 msgstr "Pokrećem inteligentne uvoznike"
 
-#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:692
+#, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
@@ -14506,8 +15199,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."
@@ -14517,14 +15210,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"
 
@@ -14532,7 +15228,7 @@ msgstr "Ne mogu otvoriti djeljeni direktorij: %s"
 msgid "Cannot find the specified shared folder."
 msgstr "Ne mogu naći navedenu dijeljenu mapu."
 
-#: shell/e-shell-startup-wizard.c:778
+#: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14546,7 +15242,7 @@ msgstr ""
 "\n"
 "Želite li sada zatvoriti pomoćnika?"
 
-#: shell/e-shell-startup-wizard.c:789
+#: shell/e-shell-startup-wizard.c:795
 msgid "Quit Assistant"
 msgstr "Zatvorite pomoćnika"
 
@@ -14575,6 +15271,7 @@ 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:97 shell/e-shell-window-commands.c:66
+#, c-format
 msgid "Error executing %s."
 msgstr "Greška kod pokretanja %s."
 
@@ -14621,8 +15318,10 @@ msgid "Work Offline"
 msgstr "Neumreženi rad"
 
 #: shell/e-shell-window.c:324
-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:331
@@ -14630,8 +15329,11 @@ 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:337
-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:1002
 msgid "Invalid arguments"
@@ -14658,6 +15360,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?"
 
@@ -14790,10 +15493,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"
@@ -14804,6 +15509,7 @@ msgstr ""
 "Nepoznata greška."
 
 #: shell/evolution-shell-component-utils.c:127
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -14816,6 +15522,7 @@ msgstr ""
 "%s"
 
 #: shell/evolution-shell-component-utils.c:134
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -14827,13 +15534,20 @@ msgstr ""
 "Greška koju je poslao sustav za pokretanje:\n"
 "%s"
 
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Vrsta probe"
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "Novi zadatak"
 
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Probni dio Evolucije"
+#: shell/evolution-test-component.c:141
+#, fuzzy
+msgid "_Test"
+msgstr "Test"
+
+#: shell/evolution-test-component.c:142
+#, fuzzy
+msgid "Create a new test item"
+msgstr "Unesi novi zadatak"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
@@ -14987,7 +15701,9 @@ msgstr "Evolution"
 msgid "Evolution is now exiting ..."
 msgstr "Evolution sada izlazi..."
 
+#. Preview/Alpha/Beta version warning message
 #: shell/main.c:269
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
@@ -15046,6 +15762,7 @@ msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ne mogu pristupiti ljusci Ximian Evolution."
 
 #: shell/main.c:419
+#, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ne mogu pokreniti Ximian Evolution ljusku : %s"
 
@@ -15071,6 +15788,7 @@ msgid "Send the debugging output of all components to a file."
 msgstr "Pošalji izlaz o greškama iz svih delova u datoteku."
 
 #: shell/main.c:562
+#, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
@@ -15110,6 +15828,11 @@ msgstr "Adresa e-pošte"
 msgid "Certificate Viewer: %s"
 msgstr ""
 
+#: smime/gui/component.c:36
+#, fuzzy, c-format
+msgid "Enter the password for `%s'"
+msgstr "Unesite lozinku za %s"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:116
 #, c-format
@@ -15282,8 +16005,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:"
@@ -15382,7 +16107,7 @@ msgid "UID"
 msgstr "UID"
 
 #: smime/lib/e-cert.c:630
-#, fuzzy
+#, fuzzy, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identifikator objekta (%S)"
 
@@ -15463,7 +16188,7 @@ msgid "Extensions"
 msgstr "Nastavci"
 
 #: smime/lib/e-cert.c:978
-#, fuzzy
+#, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%~3s= %d...%d Duljina jedne osi"
 
@@ -15524,13 +16249,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
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Nisam mogao da izvršim „%s“: %s\n"
 
 #: tools/killev.c:78
+#, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Gasim %s (%s)\n"
 
@@ -15761,10 +16488,6 @@ msgstr ""
 msgid "Week"
 msgstr "Tjedan"
 
-#: ui/evolution-calendar.xml.h:32
-msgid "Work Week"
-msgstr "Radni tjedan"
-
 #: ui/evolution-calendar.xml.h:37
 msgid "_Open Appointment"
 msgstr ""
@@ -15827,7 +16550,7 @@ msgstr "Spremi ovu stavku na disk"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:13
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:25
 msgid "_File"
@@ -15835,7 +16558,7 @@ msgstr "_Datoteka"
 
 #: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
 #: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:50
 #: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Spremi"
@@ -16031,7 +16754,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
@@ -16515,7 +17239,7 @@ msgid "Close this window"
 msgstr "Zatvori ovaj prozor"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:24
 msgid "_Close"
 msgstr "_Zatvori"
@@ -16654,46 +17378,66 @@ msgid "Toggles whether the From chooser is displayed"
 msgstr "Prikazati polje From ili ne"
 
 #: ui/evolution-message-composer.xml.h:35
-msgid "Toggles whether the Reply-To field is displayed"
+#, fuzzy
+msgid "Toggles whether the Post-To field is displayed"
 msgstr "Prikazati polje Reply-To ili ne"
 
 #: ui/evolution-message-composer.xml.h:36
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Prikazati polje Reply-To ili ne"
+
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Toggles whether the To field is displayed"
+msgstr "Prikazati polje CC ili ne"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Attachment..."
 msgstr "_Prilog..."
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:39
 msgid "_Bcc Field"
 msgstr "_Bcc zaglavlje"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Cc Field"
 msgstr "_Cc zaglavlje"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:42
 msgid "_Delete all"
 msgstr "Obri_ši sve"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:45
 msgid "_From Field"
 msgstr "O_d zaglavlje"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:46
 #: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Ubaci"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Open..."
 msgstr "_Otvori..."
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:48
+#, fuzzy
+msgid "_Post-To Field"
+msgstr "Odgo_vori-na polje"
+
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Reply-To Field"
 msgstr "Odgo_vori-na polje"
 
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Security"
 msgstr "Sigurnost"
 
+#: ui/evolution-message-composer.xml.h:52
+#, fuzzy
+msgid "_To Field"
+msgstr "O_d zaglavlje"
+
 #: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "_HTML"
@@ -17013,7 +17757,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"
@@ -17032,7 +17776,7 @@ msgid "Today"
 msgstr "Danas"
 
 #: widgets/misc/e-cell-date-edit.c:805
-#, fuzzy
+#, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr "Vrijeme mora biti u formatu: %s"
 
@@ -17103,6 +17847,7 @@ msgid "Visual"
 msgstr "Vidljivo"
 
 #: widgets/misc/e-charset-picker.c:168
+#, c-format
 msgid "Unknown character set: %s"
 msgstr "Nepoznata kodna strana: %s"
 
@@ -17171,3 +17916,92 @@ msgstr "Tekst"
 msgid "Find _Now"
 msgstr "_Traži sad"
 
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Probni dio Evolucije"
+
+#: widgets/misc/e-expander.c:181
+msgid "Expanded"
+msgstr ""
+
+#: widgets/misc/e-expander.c:182
+msgid "Whether or not the expander is expanded"
+msgstr ""
+
+#: widgets/misc/e-expander.c:190
+msgid "Text of the expander's label"
+msgstr ""
+
+#: widgets/misc/e-expander.c:197
+#, fuzzy
+msgid "Use underline"
+msgstr "Neodređeno"
+
+#: widgets/misc/e-expander.c:198
+msgid ""
+"If set, an underline in the text indicates the next character should be used "
+"for the mnemonic accelerator key"
+msgstr ""
+
+#: widgets/misc/e-expander.c:205
+#, fuzzy
+msgid "Spacing"
+msgstr "Španjolska"
+
+#: widgets/misc/e-expander.c:206
+msgid "Space to put between the label and the child"
+msgstr ""
+
+#: widgets/misc/e-expander.c:215
+msgid "Label widget"
+msgstr ""
+
+#: widgets/misc/e-expander.c:216
+msgid "A widget to display in place of the usual expander label"
+msgstr ""
+
+#: widgets/misc/e-expander.c:222
+msgid "Expander Size"
+msgstr ""
+
+#: widgets/misc/e-expander.c:223
+msgid "Size of the expander arrow"
+msgstr ""
+
+#: widgets/misc/e-expander.c:231
+msgid "Indicator Spacing"
+msgstr ""
+
+#: widgets/misc/e-expander.c:232
+msgid "Spacing around expander arrow"
+msgstr ""
+
+#~ msgid "Rename"
+#~ msgstr "Preimenuj"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "<b>Description</b>"
+#~ msgstr "Opis"
+
+#~ msgid "<b>Preview</b>"
+#~ msgstr "<b>Pregled</b>"
+
+#~ msgid "The method required to load `%s' is not supported"
+#~ msgstr "Metoda potrebna za učitavanje `%s' nije podržana"
+
+#~ msgid "You don't have permission to open the folder in `%s'"
+#~ msgstr "Nemate dozvolu otvoriti direktorij u `%s"
+
+#~ msgid "Address Book"
+#~ msgstr "Adresar"
+
+#~ msgid "Test type"
+#~ msgstr "Vrsta probe"