Fix msgfmt check by setting strings to fuzzy

author: Andre Klapper <a9016009@gmx.de> 2009-08-11 02:32:04 +0800
committer: Matthew Barnes <mbarnes@redhat.com> 2009-08-12 06:15:01 +0800
commit: 36bbdb81c671cf55a334af6dc97be44a0c41bbdb (patch)
tree: 211afbe177ec87f1cffc5b60a29f4159dff67f13 /po
parent: 32fae4047923ca8153e432b9b14704e901b77b82 (diff)
download: gsoc2013-evolution-36bbdb81c671cf55a334af6dc97be44a0c41bbdb.tar
gsoc2013-evolution-36bbdb81c671cf55a334af6dc97be44a0c41bbdb.tar.gz
gsoc2013-evolution-36bbdb81c671cf55a334af6dc97be44a0c41bbdb.tar.bz2
gsoc2013-evolution-36bbdb81c671cf55a334af6dc97be44a0c41bbdb.tar.lz
gsoc2013-evolution-36bbdb81c671cf55a334af6dc97be44a0c41bbdb.tar.xz
gsoc2013-evolution-36bbdb81c671cf55a334af6dc97be44a0c41bbdb.tar.zst
gsoc2013-evolution-36bbdb81c671cf55a334af6dc97be44a0c41bbdb.zip
1 files changed, 13286 insertions, 8316 deletions
diff --git a/po/bs.po b/po/bs.po
index 91c27c5989..6df027809b 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -1,10 +1,11 @@
 # translation of bs.po to Bosnian
 # Translators: Amila Akagić <bono@linux.org.ba>, 2004.
+#: ../shell/main.c:631
 msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-11 17:30+0200\n"
+"POT-Creation-Date: 2009-08-10 20:28+0200\n"
 "PO-Revision-Date: 2004-09-08 18:41+0200\n"
 "Last-Translator: Amila Akagić <bono@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -17,31 +18,30 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:169
-msgid "evolution addressbook"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+#, fuzzy
+msgid "evolution address book"
 msgstr "evolution adresar"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:208
 msgid "New Contact"
 msgstr "Novi kontakt"
 
-#: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:216
 msgid "New Contact List"
 msgstr "Nova lista kontakata"
 
-#: ../a11y/addressbook/ea-minicard-view.c:152
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, fuzzy, c-format
-msgid "current addressbook folder has %d card"
-msgid_plural "current addressbook folder has %d cards"
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "tekući direktorij adresara"
 msgstr[1] "tekući direktorij adresara"
 msgstr[2] "tekući direktorij adresara"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:953
-#: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Otvori"
 
@@ -59,99 +59,109 @@ msgstr "Konatkti: "
 msgid "evolution minicard"
 msgstr "evolution vizitkarta"
 
-#: ../a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:263
 msgid "It has alarms."
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:238
+#: ../a11y/calendar/ea-cal-view-event.c:266
 #, fuzzy
 msgid "It has recurrences."
 msgstr "Ponavljanje"
 
-#: ../a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It is a meeting."
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:247
+#: ../a11y/calendar/ea-cal-view-event.c:275
 #, fuzzy, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalendarski događaji"
 
-#: ../a11y/calendar/ea-cal-view-event.c:249
+#: ../a11y/calendar/ea-cal-view-event.c:277
 #, fuzzy
 msgid "Calendar Event: It has no summary."
 msgstr "Kalendarski događaji"
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:297
 #, fuzzy
 msgid "calendar view event"
 msgstr "Kalendarski događaji"
 
-#: ../a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:525
 #, fuzzy
 msgid "Grab Focus"
 msgstr "Ima fokus"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:299
 #, fuzzy
 msgid "New Appointment"
 msgstr "Novi sastanak"
 
-#: ../a11y/calendar/ea-cal-view.c:307
+#: ../a11y/calendar/ea-cal-view.c:300
 #, fuzzy
 msgid "New All Day Event"
 msgstr "Novi cjelodnevni _događaj"
 
-#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1505
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "Novi sastanak"
 
-#: ../a11y/calendar/ea-cal-view.c:309
+#: ../a11y/calendar/ea-cal-view.c:302
 #, fuzzy
 msgid "Go to Today"
 msgstr "Idi na _danas"
 
-#: ../a11y/calendar/ea-cal-view.c:310
+#: ../a11y/calendar/ea-cal-view.c:303
 #, fuzzy
 msgid "Go to Date"
 msgstr "Idi _na datum..."
 
-#: ../a11y/calendar/ea-day-view-main-item.c:299
-#: ../a11y/calendar/ea-week-view-main-item.c:301
+#: ../a11y/calendar/ea-day-view-main-item.c:300
+#: ../a11y/calendar/ea-week-view-main-item.c:297
 msgid "a table to view and select the current time range"
 msgstr ""
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
 msgid "It has no events."
 msgstr ""
 
-#: ../a11y/calendar/ea-day-view.c:152
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../a11y/calendar/ea-day-view.c:159
 #, fuzzy, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Pregled radne sedmice"
 
-#: ../a11y/calendar/ea-day-view.c:155
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../a11y/calendar/ea-day-view.c:165
 #, fuzzy, c-format
 msgid "Day View: %s. %s"
 msgstr "Dnevni pregled"
 
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr ""
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr ""
 
-#: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:660
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:771
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -161,30 +171,30 @@ msgstr "%A %d %b %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:190
-#: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1510
-#: ../calendar/gui/e-week-view-main-item.c:321
+#: ../a11y/calendar/ea-gnome-calendar.c:189
+#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-week-view-main-item.c:368
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:192
-#: ../a11y/calendar/ea-gnome-calendar.c:197
-#: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:665
-#: ../calendar/gui/calendar-component.c:670
-#: ../calendar/gui/calendar-component.c:672
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../a11y/calendar/ea-gnome-calendar.c:196
+#: ../a11y/calendar/ea-gnome-calendar.c:198
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:783
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:216
-#: ../a11y/calendar/ea-gnome-calendar.c:222
-#: ../a11y/calendar/ea-gnome-calendar.c:228
-#: ../a11y/calendar/ea-gnome-calendar.c:230
-#: ../calendar/gui/calendar-component.c:684
-#: ../calendar/gui/calendar-component.c:691
-#: ../calendar/gui/calendar-component.c:697
-#: ../calendar/gui/calendar-component.c:699
+#: ../a11y/calendar/ea-gnome-calendar.c:215
+#: ../a11y/calendar/ea-gnome-calendar.c:221
+#: ../a11y/calendar/ea-gnome-calendar.c:227
+#: ../a11y/calendar/ea-gnome-calendar.c:229
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:802
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:810
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -193,152 +203,159 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:220
-#: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1526
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../a11y/calendar/ea-gnome-calendar.c:219
+#: ../calendar/gui/calendar-component.c:800
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1609
+#: ../calendar/gui/e-week-view-main-item.c:382
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:738
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
+#: ../calendar/importers/icalendar-importer.c:782
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 #, fuzzy
 msgid "search bar"
 msgstr "Osnova za _pretragu:"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 #, fuzzy
 msgid "evolution calendar search bar"
 msgstr "Evolution kalendar i zadaci"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:146
 #, fuzzy
 msgid "Jump button"
 msgstr "Nacrtaj dugme"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:155
 #, fuzzy
 msgid "Click here, you can find more events."
 msgstr "Kliknite ovdje za dodavanje učesnika"
 
-#: ../a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:154
 #, fuzzy, c-format
 msgid "Month View: %s. %s"
 msgstr "Mjesečni pregled"
 
-#: ../a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:158
 #, fuzzy, c-format
 msgid "Week View: %s. %s"
 msgstr "Sedmični pregled"
 
-#: ../a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:189
 #, fuzzy
 msgid "calendar view for a month"
 msgstr "Informacije o kalendaru"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr ""
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
 msgid "popup a child"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:612
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
 #, fuzzy
 msgid "edit"
 msgstr "_Izmijeni"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:613
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
 msgid "begin editing this cell"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
 msgid "toggle"
 msgstr ""
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
 msgid "toggle the cell"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:171
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
 #, fuzzy
 msgid "expand"
 msgstr "Island"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
 msgid "expands the row in the ETree containing this cell"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:177
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
 msgid "collapse"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:178
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
 msgid "collapses the row in the ETree containing this cell"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:120
 #, fuzzy
 msgid "Table Cell"
 msgstr "Tabela"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:575
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/e-table-click-to-add.c:578
 #, fuzzy
 msgid "click to add"
 msgstr "Dodaj klikanjem"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
 msgid "click"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
 #, fuzzy
 msgid "sort"
 msgstr "Poništi sortiranje"
 
-#: ../a11y/widgets/ea-calendar-item.c:296
-#: ../a11y/widgets/ea-calendar-item.c:302
+#: ../a11y/widgets/ea-calendar-item.c:295
+#: ../a11y/widgets/ea-calendar-item.c:301
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:303
 #, fuzzy, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Informacije o kalendaru"
 
-#: ../a11y/widgets/ea-calendar-item.c:339
+#: ../a11y/widgets/ea-calendar-item.c:338
 #, fuzzy
 msgid "evolution calendar item"
 msgstr "Evolution iCalendar uvoznik"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:56
 #, fuzzy
 msgid "Combo Button"
 msgstr "Takmičenje"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr ""
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:1
+#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:2
+msgid ""
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:3
 #, fuzzy
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -347,19 +364,24 @@ msgstr ""
 "Promijenjena email adresa ili ime ovog kontakta već\n"
 "postoji u ovom direktoriju. Želite li je svejedno dodati?"
 
-#: ../addressbook/addressbook.error.xml.h:2
+#: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:3
+#: ../addressbook/addressbook.error.xml.h:5
+#, fuzzy
+msgid "Cannot add new contact"
+msgstr "Unesi novi kontakt"
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
 msgstr "Ne mogu premjestiti kontakt."
 
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Category editor not available."
 msgstr "Editor kategorija nije dostupan."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:8
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -369,56 +391,78 @@ msgstr ""
 "prijave. Ne zaboravite da je veličina slova bitna u šiframa; moguće da je "
 "uključen 'Caps Lock'."
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
 msgstr "Nisam mogao dobaviti informacije šeme za LDAP server."
 
-#: ../addressbook/addressbook.error.xml.h:7
-msgid "Could not remove addressbook."
+#: ../addressbook/addressbook.error.xml.h:10
+#, fuzzy
+msgid "Could not remove address book."
 msgstr "Ne mogu ukloniti adresar."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:11
+msgid ""
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:12
 #, fuzzy
 msgid "Delete address book '{0}'?"
 msgstr "Izaberite odredišni adresar."
 
-#: ../addressbook/addressbook.error.xml.h:9
-msgid "Error loading addressbook."
+#: ../addressbook/addressbook.error.xml.h:13
+#, fuzzy
+msgid "Error loading address book."
 msgstr "Greška kod učitavanja adresara."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:14
 #, fuzzy
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Greška prilikom snimanja kontakta u {0}: {1}"
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "Neuspješna prijava na LDAP server."
 
-#: ../addressbook/addressbook.error.xml.h:12
+#. Unknown error
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
+#, fuzzy
+msgid "Failed to delete contact"
+msgstr "Neuspjela prijava.\n"
+
+#: ../addressbook/addressbook.error.xml.h:17
+#, fuzzy
+msgid "GroupWise Address book creation:"
+msgstr "Dio Evolution adresara"
+
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP server nije odgovorio sa ispravnim informacijama šeme."
 
-#: ../addressbook/addressbook.error.xml.h:13
+#: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:54
 #, fuzzy
 msgid "Server Version"
 msgstr "Poruka servera:"
 
-#: ../addressbook/addressbook.error.xml.h:14
-#: ../calendar/calendar.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:15
-msgid "The Evolution addressbook has quit unexpectedly."
+#: ../addressbook/addressbook.error.xml.h:21
+#, fuzzy
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolution adresar je neočekivano okončan."
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:23
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -428,314 +472,424 @@ msgstr ""
 "mogućnost ili je loše podešen. Pitajte administratora za podržane osnove za "
 "pretragu."
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:24
 #, fuzzy
-msgid "This address book will be removed permanently."
+msgid "This address book could not be opened."
 msgstr "Adresar nije mogao biti otvoren."
 
-#: ../addressbook/addressbook.error.xml.h:19
-msgid "This addressbook could not be opened."
-msgstr "Adresar nije mogao biti otvoren."
-
-#: ../addressbook/addressbook.error.xml.h:20
-msgid "This addressbook server does not have any suggested search bases."
+#: ../addressbook/addressbook.error.xml.h:25
+#, fuzzy
+msgid "This address book server does not have any suggested search bases."
 msgstr "Ovaj server adresara ne sadrži predložene osnove za pretragu."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:26
 #, fuzzy
 msgid ""
-"This addressbook server might be unreachable or the server name may be "
+"This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
 "Ovaj server adresara može biti nedostupan ili je pogrešno unijet naziv "
 "servera ili je vaša mreža nedostupna."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:27
+#, fuzzy
+msgid "This address book will be removed permanently."
+msgstr "Adresar nije mogao biti otvoren."
+
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Ovaj server ne podržava LDAPv3 informacije šeme."
 
-#: ../addressbook/addressbook.error.xml.h:23
-msgid "Unable to open addressbook"
+#: ../addressbook/addressbook.error.xml.h:29
+#, fuzzy
+msgid "Unable to open address book"
 msgstr "Ne mogu otvoriti adresar"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "Greška tokom pretrage."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:31
 #, fuzzy
 msgid "Unable to save {0}."
 msgstr "Ne mogu snimiti kontakt(e)."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "Želite li snimiti promjene?"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:33
+#, fuzzy
 msgid ""
-"You are attempting to move a contact from one addressbook to another but it "
+"You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 "Pokušavate premjestiti kontakt iz jednog u drugi adresar ali se kontakt ne "
 "može ukoloniti iz izvorišta. Želite li napraviti kopiju?"
 
-#: ../addressbook/addressbook.error.xml.h:28
-#: ../calendar/calendar.error.xml.h:59
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
 "a supported version"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Izmijenili ste ovaj kontakt. Želite li snimiti promjene?"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Vaši kontakti za {0} neće biti dostupni dok se Evolution ponovo ne pokrene."
 
-#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:494
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../widgets/table/e-table-config.glade.h:18
 msgid "_Add"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "_Odbaci"
 
-#: ../addressbook/addressbook.error.xml.h:33
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../addressbook/addressbook.error.xml.h:40
+msgid "_Do not save"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:41
+#, fuzzy
+msgid "_Resize"
+msgstr "Belize"
+
+#: ../addressbook/addressbook.error.xml.h:42
+msgid "_Use as it is"
+msgstr ""
+
+#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:590
 msgid "Default Sync Address:"
 msgstr "Uobičajena adresa za sinhronizovanje:"
 
-#: ../addressbook/conduit/address-conduit.c:1183
-#: ../addressbook/conduit/address-conduit.c:1184
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1613
+#: ../addressbook/conduit/address-conduit.c:1614
+#, fuzzy
+msgid "Could not load address book"
 msgstr "Ne mogu učitati adresar"
 
-#: ../addressbook/conduit/address-conduit.c:1252
-#: ../addressbook/conduit/address-conduit.c:1255
+#: ../addressbook/conduit/address-conduit.c:1691
+#: ../addressbook/conduit/address-conduit.c:1694
 msgid "Could not read pilot's Address application block"
 msgstr "Nisam mogao pročitati programski blok adresa pilota"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Samodopunjavanje"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "K_ontakti"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Certificates"
 msgstr "Certifikati"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure contacts and autocompletion here"
 msgstr "Podesi samodopunjavanje"
 
 #. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1133
-#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: ../addressbook/gui/component/addressbook-view.c:1213
+#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:395
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Address Book"
 msgstr "Evolution adresar"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Address Book address popup"
 msgstr "Iskačući prozor za adrese Evolution adresara"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Address Book address viewer"
 msgstr "Preglednik adresa Evolution adresara"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Address Book card viewer"
 msgstr "Preglednik Evolution adresara"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Address Book component"
 msgstr "Dio Evolution adresara"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution S/MIME Certificate Management Control"
 msgstr "Upravljanje S/Mime certifikatima iz Evolution"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution folder settings configuration control"
 msgstr "Upravljanje podešavanjima direktorija iz Evolution"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Manage your S/MIME certificates here"
 msgstr "Ovdje upravljajte vašim S/Mime certifikatima"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:137
-#: ../addressbook/gui/component/addressbook-migrate.c:502
-#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
-#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
-#: ../mail/mail-component.c:292 ../mail/mail-vfolder.c:223
+#: ../addressbook/gui/component/addressbook-component.c:97
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:192
+#: ../calendar/gui/memos-component.c:151 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
+#: ../calendar/gui/tasks-component.c:148 ../mail/em-folder-tree-model.c:191
+#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
+#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
+#: ../mail/message-list.c:1515
 msgid "On This Computer"
 msgstr "Na ovom računalu"
 
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:98
+#: ../addressbook/gui/component/addressbook-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "Na LDAP serverima"
+
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person task list
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:145
-#: ../addressbook/gui/component/addressbook-migrate.c:510
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
-#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
-#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
+#: ../addressbook/gui/component/addressbook-component.c:135
+#: ../addressbook/gui/component/addressbook-component.c:138
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../calendar/gui/calendar-component.c:232
+#: ../calendar/gui/calendar-component.c:238
+#: ../calendar/gui/memos-component.c:189 ../calendar/gui/memos-component.c:193
+#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
+#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:186
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-migrate.c:960
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Personal"
 msgstr "Osobni podaci"
 
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:155
-#: ../addressbook/gui/component/addressbook-migrate.c:520
-msgid "On LDAP Servers"
-msgstr "Na LDAP serverima"
-
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:209
+#, fuzzy
+msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:227
+#: ../addressbook/gui/component/addressbook-component.c:210
 msgid "Create a new contact"
 msgstr "Unesi novi kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgctxt "New"
 msgid "Contact _List"
 msgstr "Lista kontakata"
 
-#: ../addressbook/gui/component/addressbook-component.c:235
+#: ../addressbook/gui/component/addressbook-component.c:218
 msgid "Create a new contact list"
 msgstr "Napravi novu listu kontakata"
 
-#: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1118
-#: ../addressbook/gui/component/addressbook-view.c:763
+#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-config.c:1245
 msgid "New Address Book"
 msgstr "Novi adresar"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgctxt "New"
 msgid "Address _Book"
 msgstr "_Adresar"
 
-#: ../addressbook/gui/component/addressbook-component.c:243
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new address book"
 msgstr "Napravi novi adresar"
 
-#: ../addressbook/gui/component/addressbook-component.c:385
-msgid "Failed upgrading Addressbook settings or folders."
+#: ../addressbook/gui/component/addressbook-component.c:389
+#, fuzzy
+msgid "Failed upgrading Address Book settings or folders."
 msgstr "Neuspjelo dograđivanje postavki ili direktorija adresara."
 
-#: ../addressbook/gui/component/addressbook-config.c:313
+#: ../addressbook/gui/component/addressbook-config.c:217
+#, fuzzy
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"Odabir ove opcije znači da će se Evolution povezati na vaš LDAP server samo "
+"ako podržava SSL ili TLS."
+
+#: ../addressbook/gui/component/addressbook-config.c:219
+#, fuzzy
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"Odabir ove opcije znači da će se Evolution povezati na vaš LDAP server samo "
+"ako podržava SSL ili TLS."
+
+#: ../addressbook/gui/component/addressbook-config.c:221
+#, fuzzy
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"Izbor ove opcije znači da vaš server ne podržava ni SSL ni TLS. To znači da "
+"će vaša baza biti nesigurna i da ćete biti ranjivi na sigurnosne napade. "
+
+#: ../addressbook/gui/component/addressbook-config.c:346
 #, fuzzy
 msgid "Base"
 msgstr "Osnovno"
 
-#: ../addressbook/gui/component/addressbook-config.c:508
-#: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../addressbook/gui/component/addressbook-config.c:547
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Vrsta:"
 
-#: ../addressbook/gui/component/addressbook-config.c:607
+#: ../addressbook/gui/component/addressbook-config.c:648
 #, fuzzy
-msgid "Copy book content locally for offline operation"
+msgid "Copy _book content locally for offline operation"
 msgstr "Kopiraj sadržaj direktorija lokalno za offline rad"
 
-#: ../addressbook/gui/component/addressbook-config.c:902
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/dialogs/calendar-setup.c:377
-#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
+#: ../addressbook/gui/component/addressbook-config.c:759
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"Ovo je port LDAP servera na koji će se Evolution pokušati povezati. Ponuđen "
+"je spisak standardnih portova. Pitajte svog administratora sistema koji port "
+"treba odabrati."
+
+#: ../addressbook/gui/component/addressbook-config.c:837
+#, fuzzy
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"Ovo je metoda koju će Evolution koristiti za vašu prijavu. Primjetite da "
+"korištenje opcije \"Email adresa\" zahtijeva anonimni pristup na vaš LDAP "
+"server."
+
+#: ../addressbook/gui/component/addressbook-config.c:916
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"Opseg pretrage određuje dubinu pretrage po stablu direktorija. Opseg "
+"pretrage \"sub\" će uključiti sve unose ispod vaše baze za pretragu.Opseg "
+"pretrage \"one\" će uključiti samo unose jedan nivo ispod vaše baze."
+
+#: ../addressbook/gui/component/addressbook-config.c:1020
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
+#: ../plugins/itip-formatter/itip-formatter.c:2558
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Općenito"
 
-#: ../addressbook/gui/component/addressbook-config.c:903
-#: ../mail/importers/pine-importer.c:393
-msgid "Addressbook"
-msgstr ""
+#: ../addressbook/gui/component/addressbook-config.c:1021
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
+#: ../mail/importers/pine-importer.c:383
+msgid "Address Book"
+msgstr "Adresar"
 
-#: ../addressbook/gui/component/addressbook-config.c:907
+#: ../addressbook/gui/component/addressbook-config.c:1025
 #, fuzzy
 msgid "Server Information"
 msgstr "<b>Informacije o serveru</b>"
 
-#: ../addressbook/gui/component/addressbook-config.c:909
+#: ../addressbook/gui/component/addressbook-config.c:1027
 #, fuzzy
 msgid "Authentication"
 msgstr "<b>Identifikacija</b>"
 
-#: ../addressbook/gui/component/addressbook-config.c:912
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:1030
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalji"
 
-#: ../addressbook/gui/component/addressbook-config.c:913
+#: ../addressbook/gui/component/addressbook-config.c:1031
+#: ../mail/em-folder-browser.c:1021
 #, fuzzy
 msgid "Searching"
 msgstr "Razmak"
 
-#: ../addressbook/gui/component/addressbook-config.c:915
+#: ../addressbook/gui/component/addressbook-config.c:1033
 #, fuzzy
 msgid "Downloading"
 msgstr "<b>Preuzimanje</b>"
 
-#: ../addressbook/gui/component/addressbook-config.c:1116
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/addressbook-config.c:1243
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "Postavke adresara"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:72
-#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
+#: ../addressbook/gui/component/addressbook-migrate.c:74
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
 msgid "Migrating..."
 msgstr "Migriranje..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:124
-#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
-#, c-format
-msgid "Migrating `%s':"
+#: ../addressbook/gui/component/addressbook-migrate.c:126
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
+#, fuzzy, c-format
+msgid "Migrating '%s':"
 msgstr "Migriram `%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:648
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "LDAP serveri"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:763
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "Podešavanje samodopunjavanja"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -747,7 +901,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolution migrira vaše direktorije..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -757,7 +911,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolution prenese vaše direktorije..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -767,7 +921,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolution prenese vaše direktorije..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -777,68 +931,119 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolution prenese vaše Pilot Sync podatke..."
 
-#: ../addressbook/gui/component/addressbook-view.c:764
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Obriši"
+#: ../addressbook/gui/component/addressbook-view.c:422
+#: ../mail/em-folder-utils.c:453
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr ""
 
-#: ../addressbook/gui/component/addressbook-view.c:766
-#: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
-msgid "Properties..."
-msgstr "Postavke..."
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:455
+msgid "Rename Folder"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-view.c:430
+#: ../mail/em-folder-utils.c:461
+msgid "Folder names cannot contain '/'"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-view.c:949
+#, fuzzy
+msgid "_New Address Book"
+msgstr "Novi adresar"
 
-#: ../addressbook/gui/component/addressbook-view.c:1144
+#: ../addressbook/gui/component/addressbook-view.c:950
+#, fuzzy
+msgid "Save As vCard..."
+msgstr "Snimi kao VCard..."
+
+#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/memos-component.c:479 ../calendar/gui/tasks-component.c:472
+#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/calendar-component.c:631
+#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-view.c:1828 ../calendar/gui/e-memo-table.c:949
+#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
+#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1340
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-tasks.xml.h:24
+msgid "_Delete"
+msgstr "_Izbriši"
+
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/memos-component.c:487 ../calendar/gui/tasks-component.c:480
+#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonimno pristupam LDAP serveru"
 
-#: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:485
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
 msgid "Failed to authenticate.\n"
 msgstr "Neuspjela prijava.\n"
 
-#: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:464
+#: ../addressbook/gui/component/addressbook.c:214
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%sUnesite šifru za %s (korisnik %s)"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#: ../addressbook/gui/component/addressbook.c:222
+#: ../calendar/common/authentication.c:51
+#: ../plugins/google-account-setup/google-source.c:500
+#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "Upišite šifru"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 #, fuzzy
 msgid "Autocomplete length"
 msgstr "Samodopunjavanje"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
 #, fuzzy
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "EFolderList xml za listu adresa za dopunjavanje"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
 #, fuzzy
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList xml za listu adresa za dopunjavanje"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
 #, fuzzy
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
 msgstr "Pozicija okomite ploče u mjesečnom pogledu"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 #, fuzzy
 msgid "Show preview pane"
 msgstr "Po_kaži podsjetnik"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 #, fuzzy
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
@@ -847,211 +1052,160 @@ msgstr ""
 "Broj znakova koji moraju biti utipkani prije nego evolution pokuša da "
 "samodopuni"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI direktorija koji je zadnji korišten u dijalogu za izbor imena"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 #, fuzzy
 msgid "URI for the folder last used in the select names dialog."
 msgstr "URI direktorija koji je zadnji korišten u dijalogu za izbor imena"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Vertical pane position"
 msgstr ""
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:1
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/message-tags.glade.h:1
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-#: ../plugins/groupwise-features/properties.glade.h:1
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "*"
-msgstr "*"
+#: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Autocompletion"
+msgstr "Samodopunjavanje"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:2
+#: ../addressbook/gui/component/autocompletion-config.c:177
+msgid "Always _show address of the autocompleted contact"
+msgstr ""
+
+#: ../addressbook/gui/component/autocompletion-config.c:182
+#, fuzzy
+msgid "Date/Time Format"
+msgstr "Datum/vrijeme"
+
+#: ../addressbook/gui/component/autocompletion-config.c:185
+#: ../mail/em-mailer-prefs.c:1456
+#, fuzzy
+msgid "Table column:"
+msgstr "Model teksta"
+
+#: ../addressbook/gui/component/autocompletion-config.c:187
+#, fuzzy
+msgid "Look up in address books"
+msgstr "evolution adresar"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:1
 msgid "1"
 msgstr "1"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:3
-msgid "3268"
-msgstr "3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:4
-msgid "389"
-msgstr "389"
+#: ../addressbook/gui/component/ldap-config.glade.h:2
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-msgid "636"
-msgstr "636"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Identifikacija</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:8
-msgid "<b>Display</b>"
-msgstr "<b>Prikaz</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Downloading</b>"
 msgstr "<b>Preuzimanje</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>Pretraživanje</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:11
-msgid "<b>Server Information</b>"
-msgstr "<b>Informacije o serveru</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-msgid "<b>Type:</b>"
-msgstr "<b>Vrsta:</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:13
-msgid "Add Address Book"
-msgstr "Dodaj adresar"
+#: ../addressbook/gui/component/ldap-config.glade.h:10
+#, fuzzy
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr "Koristim posebno ime (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
-msgid "Always"
-msgstr "Uvijek"
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../addressbook/gui/component/ldap-config.glade.h:14
+msgid "B_rowse this book until limit reached"
+msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Anonymously"
-msgstr "Anonimno"
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr "Evolution će koristiti ovu email adresu za prijavljivanje na server."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-msgid "Basic"
-msgstr "Osnovno"
+#: ../addressbook/gui/component/ldap-config.glade.h:18
+msgid "Lo_gin:"
+msgstr "Prija_va:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid "Distinguished name"
-msgstr "Posebno ime"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid "Email address"
-msgstr "Email adresa"
+#, fuzzy
+msgid ""
+"One\n"
+"Sub"
+msgstr "Jedan"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution će koristiti ovu email adresu za prijavljivanje na server."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-msgid "Find Possible Search Bases"
-msgstr "Nađi dostupne osnove za pretragu"
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-msgid "Lo_gin:"
-msgstr "Prija_va:"
+#, fuzzy
+msgid "Search Filter"
+msgstr "_Pretrage"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
-msgid "Never"
-msgstr "Nikada"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "One"
-msgstr "Jedan"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "Osnova za _pretragu:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL or TLS."
-msgstr ""
-"Odabir ove opcije znači da će se Evolution povezati na vaš LDAP server samo "
-"ako podržava SSL ili TLS."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a insecure environment. For example, if you and your LDAP server "
-"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
-"because your connection is already secure."
-msgstr ""
-"Izbor ove opcije znači da će Evolution pokušati da koristi samo SSL/TLS ako "
-"okruženje nije sigurno. Naprimjer, ako je vaš LDAP server iza firewalla na "
-"poslu,\n"
-"onda nema potrebe da Evolution koristi SSL/TLS jer je vaša veza već\n"
-"sigurna."
+#: ../addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Search _filter:"
+msgstr "_Pretrage"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS.  This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits. "
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
 msgstr ""
-"Izbor ove opcije znači da vaš server ne podržava ni SSL ni TLS. To znači da "
-"će vaša baza biti nesigurna i da ćete biti ranjivi na sigurnosne napade. "
-
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Sub"
-msgstr "Pod"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Supported Search Bases"
 msgstr "Podržane baze za pretragu"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
 msgid ""
-"The search base is the distinguished name (DN)  of the entry where your "
+"The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
 msgstr ""
 "Baza za pretragu je posebno ime (DN) unosa odakle će vaša pretraga početi. "
 "Ako ovo ostavite prazno, pretraga će početi iz korjena stabla direktorija."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"Opseg pretrage određuje dubinu pretrage po stablu direktorija. Opseg "
-"pretrage \"sub\" će uključiti sve unose ispod vaše baze za pretragu.Opseg "
-"pretrage \"one\" će uključiti samo unose jedan nivo ispod vaše baze."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
 msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Ovo je puno ime vašeg LDAP servera. Naprimjer, \"ldap.mojafirma.com \"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1059,18 +1213,7 @@ msgstr ""
 "Ovo je najveći broj unosa za preuzimanje. Ako unesete preveliki broj, "
 "adresar će se usporiti."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-#, fuzzy
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
-msgstr ""
-"Ovo je metoda koju će Evolution koristiti za vašu prijavu. Primjetite da "
-"korištenje opcije \"Email adresa\" zahtijeva anonimni pristup na vaš LDAP "
-"server."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1078,109 +1221,90 @@ msgstr ""
 "Ovo je naziv servera koji će se pojaviti u listi direktorija Evolutiona. To "
 "je samo za potrebe prikaza."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"Ovo je port LDAP servera na koji će se Evolution pokušati povezati. Ponuđen "
-"je spisak standardnih portova. Pitajte svog administratora sistema koji port "
-"treba odabrati."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid "Using distinguished name (DN)"
-msgstr "Koristim posebno ime (DN)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid "Using email address"
-msgstr "Koristim email adresu"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-#: ../mail/em-account-editor.c:301
-msgid "Whenever Possible"
-msgstr "Kada je moguće"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-msgid "_Add Address Book"
-msgstr "_Dodaj adresar"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid "_Download limit:"
 msgstr "_Limit za download:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "_Find Possible Search Bases"
 msgstr "_Nađi podržane baze za pretragu"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 #, fuzzy
 msgid "_Login method:"
 msgstr "Način _prijave:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-#: ../calendar/gui/dialogs/calendar-setup.c:244
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../mail/mail-config.glade.h:164
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
+#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid "_Search scope:"
 msgstr "Ops_eg pretrage:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
-#: ../mail/mail-config.glade.h:171
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../mail/mail-config.glade.h:184
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "_Timeout:"
 msgstr "_Rok:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "_Use secure connection:"
 msgstr "_Koristi osiguranu vezu:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid "cards"
 msgstr "karte"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
-#: ../plugins/calendar-http/calendar-http.c:263
-#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-file/calendar-file.c:286
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:523
+#: ../plugins/google-account-setup/google-source.c:720
+#: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "minute"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "<b>Email</b>"
 msgstr "<b>Email</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Home</b>"
 msgstr "<b>Početak</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>Instant Messaging</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Job</b>"
 msgstr "<b>Posao</b> "
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Razno</b>"
 
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#, fuzzy
+msgid "<b>Notes</b>"
+msgstr "<b>Početak</b>"
+
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Ostalo</b> "
@@ -1198,23 +1322,22 @@ msgid "<b>Work</b>"
 msgstr "<b>Rad</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:348
-msgid "AIM"
-msgstr "AIM"
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "_Kategorije..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:525
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
 msgid "Contact Editor"
 msgstr "Editor kontakata"
 
@@ -1228,1272 +1351,279 @@ msgid "Image"
 msgstr "Stranica"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Poštanska adresa"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "Ni_ckname:"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#, fuzzy
+msgid "Nic_kname:"
 msgstr "_Nadimak:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
-msgid "Novell Groupwise"
-msgstr "Novell Groupwise"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../calendar/gui/migration.c:1225
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+#, fuzzy
+msgid "Notes"
+msgstr "Bilješka"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "Osobne informacije"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #, fuzzy
 msgid "Telephone"
 msgstr "<b>Telefon</b>"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
-#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
-msgid "Work"
-msgstr "Posao"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "_Anniversary:"
 msgstr "Godišnjica:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "_Assistant:"
 msgstr "Pomoćnik:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 #, fuzzy
 msgid "_Birthday:"
 msgstr "Rođendan:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1662
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../calendar/gui/dialogs/event-page.c:820
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../plugins/itip-formatter/itip-view.c:1910
 #, fuzzy
 msgid "_Calendar:"
 msgstr "Kalendar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Categories"
-msgstr "_Kategorije"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "_City:"
 msgstr "Grad:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "_Company:"
 msgstr "Firma:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "_Country:"
 msgstr "Država:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "_Department:"
 msgstr "Odjeljenje:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
 msgstr "Smjesti _pod:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "_Free/Busy:"
 msgstr "Slobodan/zauzet:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "_Home Page:"
 msgstr "Osobna stranica:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "_Manager:"
 msgstr "Menadžer:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
-#, fuzzy
-msgid "_Notes:"
-msgstr "Bilješke:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 #, fuzzy
 msgid "_Office:"
 msgstr "Ured:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_PO Box:"
 msgstr "_Poštanski broj:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "_Profession:"
 msgstr "Zanimanje:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 #, fuzzy
 msgid "_Spouse:"
 msgstr "Supružnik:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_State/Province:"
 msgstr "_Država/pokrajina:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fullname.glade.h:19
 msgid "_Title:"
 msgstr "_Titula:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #, fuzzy
 msgid "_Video Chat:"
 msgstr "Video chat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "_Wants to receive HTML mail"
 msgstr "Želi primati HTML poruke"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
 msgid "_Web Log:"
 msgstr "Web dnevnik:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Gdje:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #, fuzzy
 msgid "_Zip/Postal Code:"
 msgstr "Poštanski broj:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: ../addressbook/gui/widgets/eab-contact-display.c:367
-#: ../addressbook/gui/widgets/eab-contact-display.c:382
-msgid "Address"
-msgstr "Adresa"
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:473
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../widgets/menus/gal-view-new-dialog.c:61
+msgid "Name"
+msgstr "Ime"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
-#: ../addressbook/gui/widgets/e-addressbook-model.c:310
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
+#: ../addressbook/gui/widgets/e-addressbook-model.c:324
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:520
-#: ../addressbook/gui/widgets/e-minicard.c:175
-#: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1768 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
-#: ../widgets/text/e-text.c:3585
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../widgets/menus/gal-define-views-model.c:178
+#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "Može se uređivati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
-msgid "United States"
-msgstr "Sjedinjene Američke Države"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
-msgid "Afghanistan"
-msgstr "Afganistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
-msgid "Albania"
-msgstr "Albanija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
-msgid "Algeria"
-msgstr "Alžir"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
-msgid "American Samoa"
-msgstr "Američki Samoa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
-msgid "Andorra"
-msgstr "Andora"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
-msgid "Angola"
-msgstr "Angola"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
-msgid "Anguilla"
-msgstr "Anguilla"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
-msgid "Antarctica"
-msgstr "Antartika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
-msgid "Antigua And Barbuda"
-msgstr "Antigua i Barbuda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
-msgid "Argentina"
-msgstr "Argentina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
-msgid "Armenia"
-msgstr "Armenija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
-msgid "Aruba"
-msgstr "Aruba"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
-msgid "Australia"
-msgstr "Australija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
-msgid "Austria"
-msgstr "Austrija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
-msgid "Azerbaijan"
-msgstr "Azerbedžan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
-msgid "Bahamas"
-msgstr "Bahami"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
-msgid "Bahrain"
-msgstr "Bahrain"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
-msgid "Bangladesh"
-msgstr "Bangladeš"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
-msgid "Barbados"
-msgstr "Barbados"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
-msgid "Belarus"
-msgstr "Bjelorusija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
-msgid "Belgium"
-msgstr "Belgija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
-msgid "Belize"
-msgstr "Belize"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
-msgid "Benin"
-msgstr "Benin"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
-msgid "Bermuda"
-msgstr "Bermuda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
-msgid "Bhutan"
-msgstr "Butan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
-msgid "Bolivia"
-msgstr "Bolivija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
-msgid "Bosnia And Herzegowina"
-msgstr "Bosna i Hercegovina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
-msgid "Botswana"
-msgstr "Bocvana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
-msgid "Bouvet Island"
-msgstr "Bouvet Otok"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
-msgid "Brazil"
-msgstr "Brazil"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
-msgid "British Indian Ocean Territory"
-msgstr "Teritorij Britanskog Indijskog Okeana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
-msgid "Brunei Darussalam"
-msgstr "Brunei Darussalam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
-msgid "Bulgaria"
-msgstr "Bugarska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
-msgid "Burkina Faso"
-msgstr "Burkina Faso"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
-msgid "Burundi"
-msgstr "Burundi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
-msgid "Cambodia"
-msgstr "Kambodža"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
-msgid "Cameroon"
-msgstr "Kamerun"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
-msgid "Canada"
-msgstr "Kanada"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
-msgid "Cape Verde"
-msgstr "Cape Verde"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
-msgid "Cayman Islands"
-msgstr "Kajmanska ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
-msgid "Central African Republic"
-msgstr "Centralna Afrička Republika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
-msgid "Chad"
-msgstr "Čad"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
-msgid "Chile"
-msgstr "Čile"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
-msgid "China"
-msgstr "Kina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
-msgid "Christmas Island"
-msgstr "Božićno ostvro"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
-msgid "Cocos (Keeling) Islands"
-msgstr "Cocos (Keeling) ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
-msgid "Colombia"
-msgstr "Kolumbija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
-msgid "Comoros"
-msgstr "Komori"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
-msgid "Congo"
-msgstr "Kongo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-msgid "Congo, The Democratic Republic Of The"
-msgstr "Congo, Demokratska Republika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
-msgid "Cook Islands"
-msgstr "Cook Ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
-msgid "Costa Rica"
-msgstr "Kostarika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
-msgid "Cote d'Ivoire"
-msgstr "Obala Slonovače"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "Croatia"
-msgstr "Hrvatska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
-msgid "Cuba"
-msgstr "Kuba"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
-msgid "Cyprus"
-msgstr "Kipar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
-msgid "Czech Republic"
-msgstr "Češka Republika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
-msgid "Denmark"
-msgstr "Danska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
-msgid "Djibouti"
-msgstr "Đibuti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
-msgid "Dominica"
-msgstr "Dominica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "Dominican Republic"
-msgstr "Dominikanska Republika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "Ecuador"
-msgstr "Evkador"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
-msgid "Egypt"
-msgstr "Egipat"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
-msgid "El Salvador"
-msgstr "El Salvador"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
-msgid "Equatorial Guinea"
-msgstr "Ekvatorijalna Gvineja"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
-msgid "Eritrea"
-msgstr "Eritreja"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
-msgid "Estonia"
-msgstr "Estonija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
-msgid "Ethiopia"
-msgstr "Etiopija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
-msgid "Falkland Islands"
-msgstr "Foklandski otoci"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
-msgid "Faroe Islands"
-msgstr "Faroe ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
-msgid "Fiji"
-msgstr "Fiđi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
-msgid "Finland"
-msgstr "Finska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
-msgid "France"
-msgstr "Francuska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
-msgid "French Guiana"
-msgstr "Francuska Gvineja"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-msgid "French Polynesia"
-msgstr "Francuska Polinezija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-msgid "French Southern Territories"
-msgstr "Francuski južni teritoriji"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
-msgid "Gabon"
-msgstr "Gabon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
-msgid "Gambia"
-msgstr "Gambija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
-msgid "Georgia"
-msgstr "Gruzija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
-msgid "Germany"
-msgstr "Njemačka"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
-msgid "Ghana"
-msgstr "Gana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
-msgid "Gibraltar"
-msgstr "Gibraltar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
-msgid "Greece"
-msgstr "Grčka"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
-msgid "Greenland"
-msgstr "Grenland"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
-msgid "Grenada"
-msgstr "Grenada"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-msgid "Guadeloupe"
-msgstr "Guadalupe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-msgid "Guam"
-msgstr "Guam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
-msgid "Guatemala"
-msgstr "Gvatemala"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
-msgid "Guernsey"
-msgstr "Guernsey"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
-msgid "Guinea"
-msgstr "Gvineja"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
-msgid "Guinea-bissau"
-msgstr "Guinea-bissau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guyana"
-msgstr "Gvajana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
-msgid "Haiti"
-msgstr "Haiti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
-msgid "Heard And McDonald Islands"
-msgstr "Heard And McDonald Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
-msgid "Holy See"
-msgstr "Holy See"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
-msgid "Honduras"
-msgstr "Honduras"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
-msgid "Hong Kong"
-msgstr "Hong Kong"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
-msgid "Hungary"
-msgstr "Mađarska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
-msgid "Iceland"
-msgstr "Island"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
-msgid "India"
-msgstr "Indija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
-msgid "Indonesia"
-msgstr "Indonezija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-msgid "Iran"
-msgstr "Iran"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
-msgid "Iraq"
-msgstr "Irak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
-msgid "Ireland"
-msgstr "Irska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
-msgid "Isle of Man"
-msgstr "Isle of Man"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
-msgid "Israel"
-msgstr "Izrael"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
-msgid "Italy"
-msgstr "Italija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
-msgid "Jamaica"
-msgstr "Jamajka"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
-msgid "Japan"
-msgstr "Japan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
-msgid "Jersey"
-msgstr "Jersey"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
-msgid "Jordan"
-msgstr "Jordan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
-msgid "Kazakhstan"
-msgstr "Kazakhstan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
-msgid "Kenya"
-msgstr "Kenija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
-msgid "Kiribati"
-msgstr "Kiribati"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
-msgid "Korea, Democratic People's Republic Of"
-msgstr "Korea, Demokratska Narodna Republika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
-msgid "Korea, Republic Of"
-msgstr "Korea, Republika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
-msgid "Kuwait"
-msgstr "Kuvajt"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
-msgid "Kyrgyzstan"
-msgstr "Kyrgyzstan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
-msgid "Laos"
-msgstr "Laos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
-msgid "Latvia"
-msgstr "Latvija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Lebanon"
-msgstr "Libanon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Lesotho"
-msgstr "Lesoto"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
-msgid "Liberia"
-msgstr "Liberija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
-msgid "Libya"
-msgstr "Libija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
-msgid "Liechtenstein"
-msgstr "Linhenštajn"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
-msgid "Lithuania"
-msgstr "Litva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
-msgid "Luxembourg"
-msgstr "Luksemburg"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-msgid "Macao"
-msgstr "Ožujak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Macedonia"
-msgstr "Makedonija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
-msgid "Madagascar"
-msgstr "Madagaskar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
-msgid "Malawi"
-msgstr "Malawi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
-msgid "Malaysia"
-msgstr "Malezija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
-msgid "Maldives"
-msgstr "Maldivi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
-msgid "Mali"
-msgstr "Mali"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
-msgid "Malta"
-msgstr "Malta"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
-msgid "Marshall Islands"
-msgstr "Marshall Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
-msgid "Martinique"
-msgstr "Martinique"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
-msgid "Mauritania"
-msgstr "Mauritania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
-msgid "Mauritius"
-msgstr "Mauricijus"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
-msgid "Mayotte"
-msgstr "Mayotte"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
-msgid "Mexico"
-msgstr "Meksiko"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
-msgid "Micronesia"
-msgstr "Micronesia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
-msgid "Moldova, Republic Of"
-msgstr "Republika Moldavija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
-msgid "Monaco"
-msgstr "Monako"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
-msgid "Mongolia"
-msgstr "Mongolija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
-msgid "Montserrat"
-msgstr "Montserrat"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
-msgid "Morocco"
-msgstr "Maroko"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
-msgid "Mozambique"
-msgstr "Mozambique"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
-msgid "Myanmar"
-msgstr "Mianmar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
-msgid "Namibia"
-msgstr "Namibija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
-msgid "Nauru"
-msgstr "Nauru"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
-msgid "Nepal"
-msgstr "Nepal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
-msgid "Netherlands"
-msgstr "Nizozemska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
-msgid "Netherlands Antilles"
-msgstr "Netherlands Antilles"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
-msgid "New Caledonia"
-msgstr "Nova Kaledonia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-msgid "New Zealand"
-msgstr "Novi Zeland"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-msgid "Nicaragua"
-msgstr "Nikaragva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
-msgid "Niger"
-msgstr "Niger"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
-msgid "Nigeria"
-msgstr "Nigerija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
-msgid "Niue"
-msgstr "Niue"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
-msgid "Norfolk Island"
-msgstr "Norfolk Island"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
-msgid "Northern Mariana Islands"
-msgstr "Northern Mariana Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
-msgid "Norway"
-msgstr "Norveška"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
-msgid "Oman"
-msgstr "Oman"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
-msgid "Pakistan"
-msgstr "Pakistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
-msgid "Palau"
-msgstr "Palau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
-msgid "Palestinian Territory"
-msgstr "Palestinski teritorij"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
-msgid "Panama"
-msgstr "Panama"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
-msgid "Papua New Guinea"
-msgstr "Papua Nova Gvineja"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-msgid "Paraguay"
-msgstr "Paragvaj"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
-msgid "Peru"
-msgstr "Peru"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
-msgid "Philippines"
-msgstr "Filipini"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
-msgid "Pitcairn"
-msgstr "Pitcairn"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
-msgid "Poland"
-msgstr "Poljska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
-msgid "Portugal"
-msgstr "Portugal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
-msgid "Puerto Rico"
-msgstr "Puerto Rico"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
-msgid "Qatar"
-msgstr "Kvatar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
-msgid "Reunion"
-msgstr "Reunion"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
-msgid "Romania"
-msgstr "Rumunjska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
-msgid "Russian Federation"
-msgstr "Ruska Federacija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-msgid "Rwanda"
-msgstr "Ruanda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
-msgid "Saint Kitts And Nevis"
-msgstr "Sveti Kitts i Nevis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
-msgid "Saint Lucia"
-msgstr "Sveta Lucija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-#, fuzzy
-msgid "Saint Vincent And The Grenadines"
-msgstr "Saint Vincent i Grena-dines"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
-msgid "Samoa"
-msgstr "Samoa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
-msgid "San Marino"
-msgstr "San Marino"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
-msgid "Sao Tome And Principe"
-msgstr "Sao Tome and Principe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
-msgid "Saudi Arabia"
-msgstr "Saudijska Arabija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
-msgid "Senegal"
-msgstr "Senegal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
-msgid "Serbia And Montenegro"
-msgstr "Srbija i Crna Gora"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
-msgid "Seychelles"
-msgstr "Sejšeli"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
-msgid "Sierra Leone"
-msgstr "Sierra Leone"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
-msgid "Singapore"
-msgstr "Singapur"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
-msgid "Slovakia"
-msgstr "Slovačka"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
-msgid "Slovenia"
-msgstr "Slovenija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
-msgid "Solomon Islands"
-msgstr "Solomonska ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
-msgid "Somalia"
-msgstr "Somalija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
-msgid "South Africa"
-msgstr "Južna Afrika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "Južna Georgia i Južni Sandwich Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
-msgid "Spain"
-msgstr "Španjolska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
-msgid "Sri Lanka"
-msgstr "Šri Lanka"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
-msgid "St. Helena"
-msgstr "Sv. Helena"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
-msgid "St. Pierre And Miquelon"
-msgstr "St. Pierre And Miquelon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
-msgid "Sudan"
-msgstr "Sudan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
-msgid "Suriname"
-msgstr "Surinam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "Svalbard And Jan Mayen Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
-msgid "Swaziland"
-msgstr "Svazilend"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
-msgid "Sweden"
-msgstr "Švedska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
-msgid "Switzerland"
-msgstr "Švicarska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
-msgid "Syria"
-msgstr "Sirija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
-msgid "Taiwan"
-msgstr "Tajvan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
-msgid "Tajikistan"
-msgstr "Tajikistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
-msgid "Tanzania, United Republic Of"
-msgstr "Tanzania, Ujedinjena Republika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
-msgid "Thailand"
-msgstr "Tajland"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
-msgid "Timor-Leste"
-msgstr "Timor-Leste"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
-msgid "Togo"
-msgstr "Togo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
-msgid "Tokelau"
-msgstr "Tokelau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
-msgid "Tonga"
-msgstr "Tonga"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
-msgid "Trinidad And Tobago"
-msgstr "Trinidad i Tobago"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
-msgid "Tunisia"
-msgstr "Tunis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
-msgid "Turkey"
-msgstr "Turska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
-msgid "Turkmenistan"
-msgstr "Turkmenistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
-msgid "Turks And Caicos Islands"
-msgstr "Turks i Caicos otočje"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
-msgid "Tuvalu"
-msgstr "Tuvalu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
-msgid "Uganda"
-msgstr "Uganda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
-msgid "Ukraine"
-msgstr "Ukrajina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
-msgid "United Arab Emirates"
-msgstr "Ujedinjeni Arapski Emirati"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
-msgid "United Kingdom"
-msgstr "Ujedinjeno Kraljevstvo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-msgid "United States Minor Outlying Islands"
-msgstr "United States Minor Outlying Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "Uruguay"
-msgstr "Urugvaj"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Uzbekistan"
-msgstr "Uzbekistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
-msgid "Vanuatu"
-msgstr "Vanuatu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
-msgid "Venezuela"
-msgstr "Venecuela"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
-msgid "Viet Nam"
-msgstr "Viet Nam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
-msgid "Virgin Islands, British"
-msgstr "Britanska Djevičanska ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
-msgid "Virgin Islands, U.S."
-msgstr "Američka Djevičanska ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
-msgid "Wallis And Futuna Islands"
-msgstr "Ostrva Wallis And Futuna"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
-msgid "Western Sahara"
-msgstr "Zapadna Sahara"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
-msgid "Yemen"
-msgstr "Jemen"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
-msgid "Zambia"
-msgstr "Zambija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
-msgid "Zimbabwe"
-msgstr "Zimbabve"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-#: ../plugins/exchange-operations/exchange-delegates.c:936
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
-#: ../plugins/plugin-manager/plugin-manager.c:44
-#: ../plugins/save-attachments/save-attachments.c:362
-#: ../widgets/menus/gal-view-new-dialog.c:73
-msgid "Name"
-msgstr "Ime"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:603
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
+msgid "Gadu-Gadu"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
+msgid "MSN"
+msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Servis"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
+msgid "GroupWise"
+msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:400
-msgid "Location"
-msgstr "Lokacija"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#, fuzzy
+msgid "Skype"
+msgstr "Vrsta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Korisničko ime"
+#. red
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../mail/em-migrate.c:959
+msgid "Work"
+msgstr "Posao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Početak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../calendar/gui/e-calendar-view.c:2289
 msgid "Other"
 msgstr "Ostalo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:352
-msgid "MSN"
-msgstr "MSN"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:349
-msgid "GroupWise"
-msgstr "GroupWise"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Source Book"
 msgstr "Izvorišna knjiga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
 msgid "Target Book"
 msgstr "Odredišna knjiga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
 msgid "Is New Contact"
 msgstr "je novi kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 msgid "Writable Fields"
 msgstr "Polja za upis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 #, fuzzy
 msgid "Required Fields"
 msgstr "_Obavezne osobe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Changed"
 msgstr "Promijenjen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:535
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
 #, fuzzy, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor kontakata"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
 msgid "Please select an image for this contact"
 msgstr "Odaberite sliku za ovaj kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
-msgid "No image"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
+#, fuzzy
+msgid "_No image"
 msgstr "Bez slike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2501,32 +1631,54 @@ msgstr ""
 "Podaci za kontakt nisu ispravni:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#, c-format
+msgid "%s'%s' is empty"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
 msgid "Invalid contact."
 msgstr "Neispravni kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
 msgid "Contact Quick-Add"
 msgstr "Brzo dodavanje kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
 msgid "_Edit Full"
 msgstr "_Uredi potpuno"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
 #, fuzzy
-msgid "_Full name:"
+msgid "_Full name"
 msgstr "_Puno ime:"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
-msgid "E-_mail:"
-msgstr "E-_mail:"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#, fuzzy
+msgid "E_mail"
+msgstr "Email"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#, fuzzy
+msgid "_Select Address Book"
+msgstr "Novi adresar"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s) ?"
+"to delete contact list (%s)?"
 msgstr ""
 "Sigurni ste da želite\n"
 "obrisati ove kontakte?"
@@ -2544,7 +1696,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s) ?"
+"to delete contact (%s)?"
 msgstr ""
 "Sigurni ste da želite\n"
 "obrisati ove kontakte?"
@@ -2557,175 +1709,101 @@ msgstr ""
 "Sigurni ste da želite\n"
 "obrisati ove kontakte?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Address _2:"
-msgstr "_Adresa 2:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Ci_ty:"
-msgstr "_Grad:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "_Država:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
-msgid "Full Address"
-msgstr "Puna adresa"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
-msgid "_ZIP Code:"
-msgstr "_Poštanski broj:"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Dr."
-msgstr "Dr."
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
-msgid "Esq."
-msgstr "Esq."
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Puno ime"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
-msgid "I"
-msgstr "I"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
-msgid "II"
-msgstr "II"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid "III"
-msgstr "III"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
-msgid "Jr."
-msgstr "Mlađi"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
-msgid "Miss"
-msgstr "Gđica"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
-msgid "Mr."
-msgstr "Gdin."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
-msgid "Mrs."
-msgstr "Gđa."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
-msgid "Ms."
-msgstr "Gđica."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
-msgid "Sr."
-msgstr "St."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_First:"
 msgstr "_Ime:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Last:"
 msgstr "_Prezime:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Middle:"
 msgstr "_Srednje ime:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Suffix:"
 msgstr "_Sufiks:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:2
-msgid "Add IM Account"
-msgstr "Dodaj IM račun"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:3
-msgid "_Account name:"
-msgstr "_Ime računa:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-msgid "_IM Service:"
-msgstr "Servis _IM:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:215
-#: ../plugins/exchange-operations/exchange-contacts.c:193
-msgid "_Location:"
-msgstr "_Lokacija:"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-msgid "Add an email to the List"
-msgstr "Dodaj email listi"
+#, fuzzy
+msgid "<b>Members</b>"
+msgstr "<b>Upozorenja</b>"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:834
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
 msgid "Contact List Editor"
 msgstr "Editor liste kontakata"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
+#: ../calendar/gui/e-day-view-time-item.c:812
+#: ../calendar/gui/e-timezone-entry.c:118
 #, fuzzy
-msgid "Insert email addresses from Address Book"
-msgstr "Ubacite email adrese iz adresara"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "Members"
-msgstr "Članovi"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
-msgid "Remove an email address from the List"
-msgstr "Ukloni email adresu iz liste"
+msgid "Select..."
+msgstr "Izaberi"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Sakrij adrese prilikom slanja pošte na ovu listu"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_List name:"
 msgstr "Naziv _liste:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
-#, fuzzy
-msgid "_Select"
-msgstr "Izaberi"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Unesite email adresu ili prevucite kontakt u donji popis:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
-#: ../addressbook/gui/widgets/e-addressbook-model.c:296
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:223
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:506
-msgid "Book"
-msgstr "Knjiga"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
-msgid "Is New List"
-msgstr "je nova lista"
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
+#, fuzzy
+msgid "Contact List Members"
+msgstr "Lista članova"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
 #, fuzzy
 msgid "_Members"
 msgstr "Članovi"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
-#, fuzzy
-msgid "Contact List Members"
-msgstr "Lista članova"
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
+#: ../addressbook/gui/widgets/e-addressbook-view.c:211
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
+msgid "Book"
+msgstr "Knjiga"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
+msgid "Is New List"
+msgstr "je nova lista"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
@@ -2741,12 +1819,13 @@ msgid "Duplicate Contact Detected"
 msgstr "Otkriven dvostruki kontakt"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+#, fuzzy
 msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
+"The name or email of this contact already exists in this folder.  Would you "
+"like to add it anyway?"
 msgstr ""
-"Promijenjena email adresa ili ime ovog kontakta već\n"
-"postoji u ovom direktoriju. Želite li je svejedno dodati?"
+"Naziv ili email adresa ovog kontakta već postoji\n"
+"u ovom direktoriju. Želite li svejedno dodati?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2764,17 +1843,49 @@ msgstr ""
 "Naziv ili email adresa ovog kontakta već postoji\n"
 "u ovom direktoriju. Želite li svejedno dodati?"
 
-#. FIXME: get the toplevel window...
-#: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
-#: ../widgets/misc/e-filter-bar.c:156
-msgid "Advanced Search"
-msgstr "Napredna pretraga"
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:213
+#, fuzzy
+msgid "_Merge"
+msgstr "Poruka"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/merging/eab-contact-merging.c:198
+#, fuzzy
+msgid "Merge Contact"
+msgstr "Novi kontakt"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:266
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
+msgid "Email"
+msgstr "Email"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
+msgid "Any field contains"
+msgstr "Polje koje sadrži"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Email begins with"
+msgstr "Email počinje sa"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#, fuzzy
+msgid "Name contains"
+msgstr "Komentar sadrži"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "Nema kontakata"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -2782,161 +1893,150 @@ msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakta"
 msgstr[2] "%d kontakata"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:303
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:237
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:513
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Upit"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:446
+#: ../addressbook/gui/widgets/e-addressbook-model.c:460
 msgid "Error getting book view"
 msgstr "Greška kod učitavanja pregleda adresara"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table-click-to-add.c:503
-#: ../widgets/table/e-table-selection-model.c:311
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
+#: ../widgets/table/e-table-click-to-add.c:507
+#: ../widgets/table/e-table-selection-model.c:302
 #: ../widgets/table/e-table.c:3344
-#: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3542
 msgid "Model"
 msgstr "Model"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Greška prilikom promijene karte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:169
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Name begins with"
 msgstr "Ime počinje sa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Email begins with"
-msgstr "Email počinje sa"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:53
-msgid "Category is"
-msgstr "Kategorija je"
-
-#. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:48
-msgid "Any field contains"
-msgstr "Polje koje sadrži"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
-msgid "Advanced..."
-msgstr "Napredno..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "Izvor"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:244
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:370
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:564
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
 msgid "Type"
 msgstr "Vrsta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:544
-msgid "Address Book"
-msgstr "Adresar"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:807
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2011
-#: ../ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
+#, fuzzy
+msgid "Save as vCard..."
 msgstr "Snimi kao VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/e-calendar-table.c:1154
-#: ../calendar/gui/e-calendar-view.c:1528 ../ui/evolution-addressbook.xml.h:37
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1806 ../calendar/gui/e-memo-table.c:932
+#: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Otvori"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
-msgid "New Contact..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#, fuzzy
+msgid "_New Contact..."
 msgstr "Novi kontakt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-msgid "New Contact List..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#, fuzzy
+msgid "New Contact _List..."
 msgstr "Nova lista kontakata..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Prosljedi kontakt"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.c:938
 #, fuzzy
-msgid "Forward Contacts"
-msgstr "Prosljedi kontakt"
+msgid "_Save as vCard..."
+msgstr "Snimi kao VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "Send Message to Contact"
-msgstr "Pošalji poruku kontaktu"
+#, fuzzy
+msgid "_Forward Contact"
+msgstr "Prosljedi kontakt"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:940
 #, fuzzy
-msgid "Send Message to List"
-msgstr "Pošalji poruku kontaktu"
+msgid "_Forward Contacts"
+msgstr "Prosljedi kontakt"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:941
 #, fuzzy
-msgid "Send Message to Contacts"
+msgid "Send _Message to Contact"
 msgstr "Pošalji poruku kontaktu"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
-#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
-msgid "Print"
+#, fuzzy
+msgid "Send _Message to List"
+msgstr "Pošalji poruku kontaktu"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#, fuzzy
+msgid "Send _Message to Contacts"
+msgstr "Pošalji poruku kontaktu"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#, fuzzy
+msgid "_Print"
 msgstr "Štampa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
-msgid "Copy to Address Book..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#, fuzzy
+msgid "Cop_y to Address Book..."
 msgstr "Kopiraj u adresar..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
-msgid "Move to Address Book..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#, fuzzy
+msgid "Mo_ve to Address Book..."
 msgstr "Premjesti u adresar..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Izreži"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+msgid "Cu_t"
+msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kopiraj"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../calendar/gui/e-calendar-table.c:1599
+#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:940
+#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
+#: ../mail/message-list.c:2109 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+msgid "_Copy"
+msgstr "_Kopiraj"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#, fuzzy
+msgid "P_aste"
 msgstr "Umetni"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1562
-#: ../calendar/gui/cal-search-bar.c:346
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
+#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
+#: ../calendar/gui/cal-search-bar.c:686
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1761
-#, fuzzy
-msgid "Print cards"
-msgstr "Štampaj zadatke"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
+msgid "Unmatched"
+msgstr "Neupariv"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Assistant"
 msgstr "Pomoćnik"
 
@@ -2965,91 +2065,88 @@ msgid "Car Phone"
 msgstr "Telefon u autu"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:1
 msgid "Categories"
 msgstr "Kategorije"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "Telefon kompanije"
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#, fuzzy
+msgid "Company"
+msgstr "Firma:"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
-#: ../smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Email"
+msgid "Company Phone"
+msgstr "Telefon kompanije"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-popup-control.c:441
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 2"
 msgstr "Email 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: ../addressbook/gui/widgets/eab-popup-control.c:451
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 3"
 msgstr "Email 3"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Family Name"
 msgstr "Porodično ime"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Smjesti kao"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Given Name"
 msgstr "Dato ime"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "Faks kod kuće"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone"
 msgstr "Kućni telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Home Phone 2"
 msgstr "Telefon 2 (kućni)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "ISDN telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Journal"
 msgstr "Dnevnik"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Manager"
 msgstr "Menadžer"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:392
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Note"
 msgstr "Bilješka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Ured"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Organization"
-msgstr "Organizacija"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Drugi faks"
@@ -3071,14 +2168,14 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:378
+#: ../calendar/gui/e-meeting-list-view.c:576
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "Uloga"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Spouse"
 msgstr "Supružnik"
 
@@ -3109,38 +2206,36 @@ msgid "Web Site"
 msgstr "Web stranica"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:138
-#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
+#: ../widgets/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
+#: ../widgets/table/e-table-click-to-add.c:521
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:667
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3012 ../widgets/table/e-table-item.c:3013
-#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-group-leaf.c:642
+#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "Širina"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:145
-#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
-#: ../widgets/table/e-table-click-to-add.c:524
-#: ../widgets/table/e-table-field-chooser-item.c:674
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
-#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-group-leaf.c:635
+#: ../widgets/table/e-table-group-leaf.c:636
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "Visina"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:153
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Ima fokus"
 
@@ -3160,11 +2255,19 @@ msgstr "Model teksta"
 msgid "Max field name length"
 msgstr "Najveća dužina imena polja"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Širina kolone"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:172
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr "Tražim kontakte..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 #, fuzzy
 msgid ""
 "\n"
@@ -3179,7 +2282,7 @@ msgstr ""
 "\n"
 "Kliknite dva puta da biste napravili novi kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:175
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3193,7 +2296,7 @@ msgstr ""
 "\n"
 "Kliknite dva puta da biste napravili novi kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 #, fuzzy
 msgid ""
 "\n"
@@ -3201,7 +2304,7 @@ msgid ""
 "Search for the Contact."
 msgstr "Tražim kontakte..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3211,287 +2314,377 @@ msgstr ""
 "\n"
 "Nema se šta pokazati u ovom pogledu."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:499
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adapter"
 
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard.c:99
+#, fuzzy
+msgid "Work Email"
+msgstr "Email"
+
+#: ../addressbook/gui/widgets/e-minicard.c:100
+#, fuzzy
+msgid "Home Email"
+msgstr "Email"
+
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:825
+#, fuzzy
+msgid "Other Email"
+msgstr "Drugi faks"
+
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Izabrano"
 
-#: ../addressbook/gui/widgets/e-minicard.c:168
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Ima pokazivač"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:135
-#: ../addressbook/gui/widgets/eab-contact-display.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
+msgid "_Open Link in Browser"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:170
+#: ../mail/em-folder-view.c:2694
+msgid "_Copy Link Location"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
+#, fuzzy
+msgid "_Send New Message To..."
+msgstr "Pošalji poruku kontaktu"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#, fuzzy
+msgid "Copy _Email Address"
+msgstr "Email adresa"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:286
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "(map)"
 msgstr "(mapa)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:145
-#: ../addressbook/gui/widgets/eab-contact-display.c:211
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:391
 msgid "map"
 msgstr "mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:276
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:475
+#: ../addressbook/gui/widgets/eab-contact-display.c:835
 msgid "List Members"
 msgstr "Lista članova"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:339
-#: ../addressbook/gui/widgets/eab-contact-display.c:341
-msgid "E-mail"
-msgstr "E-mail"
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#, fuzzy
+msgid "Department"
+msgstr "Odjeljenje:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#, fuzzy
+msgid "Profession"
+msgstr "Zanimanje:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Position"
 msgstr "Položaj"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
-msgid "Video Conferencing"
-msgstr "Video konferencije"
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#, fuzzy
+msgid "Video Chat"
+msgstr "Video chat:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../calendar/gui/calendar-commands.c:89
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/gnome-cal.c:2548
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:572
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../plugins/hula-account-setup/camel-hula-listener.c:372
+#: ../plugins/hula-account-setup/camel-hula-listener.c:400
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "Kalendar"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:365
-#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/event-editor.c:116
+#, fuzzy
+msgid "Free/Busy"
+msgstr "Slobodan/zauzet:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-msgid "work"
-msgstr "posao"
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
+msgid "Address"
+msgstr "Adresa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
-msgid "WWW"
-msgstr "WWW"
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#, fuzzy
+msgid "Home Page"
+msgstr "Osobna stranica:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:378
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
-msgid "Blog"
-msgstr "Blog"
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#, fuzzy
+msgid "Web Log"
+msgstr "Web dnevnik:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:385
-msgid "personal"
-msgstr "osobno"
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../calendar/gui/e-calendar-view.c:2580
+#, fuzzy
+msgid "Birthday"
+msgstr "Rođendan:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../calendar/gui/e-calendar-view.c:2581
+#, fuzzy
+msgid "Anniversary"
+msgstr "Godišnjica:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:853
 msgid "Job Title"
 msgstr "Poslovna titula"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Home page"
 msgstr "Početna stranica"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:897
+msgid "Blog"
+msgstr "Blog"
+
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "Uspjeh"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "Backend zaposlen"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "Arhiva nije na mreži"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "Adresar ne postoji"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
 msgstr "Osobni kontakt nije definisan"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "Pristup odbijen"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "Kontakt nije nađen"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "ID kontakta već postoji"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "Protokol nije podržan"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:232
-#: ../calendar/gui/e-cal-model-tasks.c:348
-#: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2364
-msgid "Cancelled"
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-model-tasks.c:363
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2548
+#, fuzzy
+msgid "Canceled"
 msgstr "Otkazano"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "Ne mogu otkazati"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../calendar/gui/comp-editor-factory.c:438
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:432
 msgid "Authentication Failed"
 msgstr "Prijava nije uspjela"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:426
 msgid "Authentication Required"
 msgstr "Prijava obavezna"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS nije dostupan"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "Nema takvog izvora"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr ""
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Other error"
 msgstr "Druga greška"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 #, fuzzy
 msgid "Invalid server version"
 msgstr "Poruka servera:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:93
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#, fuzzy
+msgid "Unsupported authentication method"
+msgstr "Nepodržana operacija: pretraga po uid-u: za %s"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
-"We were unable to open this addressbook. This either means this book is not "
+"This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
-"load the addressbook once in online mode to download its contents"
+"load the address book once in online mode to download its contents."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:102
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, fuzzy, c-format
 msgid ""
-"We were unable to open this addressbook.  Please check that the path %s "
-"exists and that you have permission to access it."
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
 msgstr ""
 "Ne mogu otvoriti adresar. Provjerite postoji li putanja i da li imate "
 "dozvolu da joj pristupite."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni "
-"URI ili je LDAP server nedostupan."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:115
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#, fuzzy
 msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr ""
 "Ova verzija Evolutiona nema ugrađenu podršku za LDAP. Ako želite koristiti "
 "LDAP u Evolutionu, morate instalirati paket Evolutiona koji ima podršku za "
 "LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#, fuzzy
 msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
 msgstr ""
 "Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni "
 "URI ili je server nedostupan."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#, fuzzy
+msgid "Detailed error message:"
+msgstr "Poruka servera:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#, fuzzy
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
 "Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
+"the directory server preferences for this address book."
 msgstr ""
 "Više karti odgovara upitu koji je ili server tako  \n"
 "podešen vratio ili je Evolution tako podešen da pokaže.\n"
 "Molim da preciznije formulišete upit ili povećate limit\n"
 "broja rezultata u podešavanjima adresara za server direktorija."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:151
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#, fuzzy
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
+"configured for this address book.  Please make your search\n"
 "more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
+"preferences for this address book."
 msgstr ""
 "Vrijeme za izvršavanje ovog upita je preko ograničenja servera ili\n"
 "ograničenja koji ste postavili za ovaj adresar. Preciznije postavite \n"
 "upit ili povećajte vremensko ograničenje u postavkama direktorija\n"
 "na serveru za ovaj adresar."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:157
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#, fuzzy
+msgid "The backend for this address book was unable to parse this query."
 msgstr "Osnovni proces ovog adresara nije mogao da obradi upit."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#, fuzzy
+msgid "The backend for this address book refused to perform this query."
 msgstr "Osnovni proces ovog adresara je odbio da obradi ovaj upit."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "Ovaj upit nije uspješno završen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "Greška kod dodavanja liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
-#: ../addressbook/gui/widgets/eab-gui-util.c:693
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:685
 msgid "Error adding contact"
 msgstr "Greška prilikom dodavanja kontakta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
 msgstr "Greška kod izmjene popisa"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
 msgstr "Greška prilikom mijenjanja kontakta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
 msgstr "Greška kod uklanjanja popisa"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:648
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Error removing contact"
 msgstr "Greška pri uklanjanju kontakta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:290
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, fuzzy, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3509,7 +2702,17 @@ msgstr[2] ""
 "Otvaranje %d kontakata će otvoriti %d novih prozora.\n"
 "Da li zaista želite prikazati sve ove kontakte?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
+#, fuzzy
+msgid "_Don't Display"
+msgstr "Prikaži"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
+msgid "Display _All Contacts"
+msgstr ""
+
+#. For Translators only: "it" refers to the filename %s.
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3518,15 +2721,15 @@ msgstr ""
 "%s već postoji\n"
 "Želite li prepisati preko njega?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:354
 msgid "Overwrite"
 msgstr "Prepiši"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:368
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 #, fuzzy
 msgid "contact"
 msgid_plural "contacts"
@@ -3535,599 +2738,381 @@ msgstr[1] "Kontakt"
 msgstr[2] "Kontakt"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:418
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "card.vcf"
 msgstr "card.vcf"
 
+#: ../addressbook/gui/widgets/eab-gui-util.c:480
+#, fuzzy
+msgid "Select Address Book"
+msgstr "Novi adresar"
+
 #: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:754
+#: ../addressbook/gui/widgets/eab-gui-util.c:746
 msgid "Move contact to"
 msgstr "Premjesti kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:756
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Copy contact to"
 msgstr "Kopiraj kontakt u "
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:759
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Move contacts to"
 msgstr "Premjesti kontakte u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:761
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Copy contacts to"
 msgstr "Kopiraj kontakte u "
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:764
-msgid "Select target addressbook."
-msgstr "Izaberite odredišni adresar."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:987
-msgid "Multiple VCards"
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
+#, fuzzy
+msgid "Multiple vCards"
 msgstr "Višestruke VCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:990
-#, c-format
-msgid "VCard for %s"
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
+#, fuzzy, c-format
+msgid "vCard for %s"
 msgstr "VCard za %s"
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: ../addressbook/gui/widgets/eab-popup-control.c:198
-msgid "(none)"
-msgstr "(nijedan) "
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:431
-msgid "Primary Email"
-msgstr "Osnovni email"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:567
-msgid "Select an Action"
-msgstr "Izaberi akciju"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:575
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Napravi novi kontakt \"%s\""
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
+#, fuzzy, c-format
+msgid "Contact information"
+msgstr "Informacije o dnevniku"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:591
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Dodaj adresu postojećim kontaktima \"%s\""
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
+#, fuzzy, c-format
+msgid "Contact information for %s"
+msgstr "Editor kontakata"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:291
 msgid "Querying Address Book..."
 msgstr "Pretražujem adresar..."
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:968
-msgid "Merge E-Mail Address"
-msgstr "Spoji email adrese"
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
+msgid "Card View"
+msgstr "Pogled karte"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "i još jedan kontakt."
-msgstr[1] "i još %d kontakta."
-msgstr[2] "i još             ."
+#: ../addressbook/importers/evolution-csv-importer.c:660
+#: ../addressbook/importers/evolution-ldif-importer.c:512
+#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
+msgid "Importing..."
+msgstr ""
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:223
-#: ../addressbook/gui/widgets/eab-vcard-control.c:272
-msgid "Show Full VCard"
-msgstr "Prikaži potpun VCard"
+#: ../addressbook/importers/evolution-csv-importer.c:861
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr ""
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Prikaži sažetu VCard"
+#: ../addressbook/importers/evolution-csv-importer.c:862
+#, fuzzy
+msgid "Outlook CSV and Tab Importer"
+msgstr "Evolution VCard uvoznik"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Save in addressbook"
-msgstr "Snimi u adresar"
+#: ../addressbook/importers/evolution-csv-importer.c:870
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr ""
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
-msgid "Card View"
-msgstr "Pogled karte"
+#: ../addressbook/importers/evolution-csv-importer.c:871
+msgid "Mozilla CSV and Tab Importer"
+msgstr ""
 
-#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
-msgid "GTK Tree View"
-msgstr "Pogled GTK stabla"
+#: ../addressbook/importers/evolution-csv-importer.c:879
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr ""
 
-#: ../addressbook/importers/evolution-ldif-importer.c:486
-#: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:311
-#: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:880
 #, fuzzy
-msgid "Importing ..."
-msgstr "Migriranje..."
+msgid "Evolution CSV and Tab Importer"
+msgstr "Evolution VCard uvoznik"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:652
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP format razmjene podataka (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:653
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF uvoznik"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:529
-msgid "VCard (.vcf, .gcrd)"
+#: ../addressbook/importers/evolution-vcard-importer.c:548
+#, fuzzy
+msgid "vCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:530
-msgid "Evolution VCard Importer"
+#: ../addressbook/importers/evolution-vcard-importer.c:549
+#, fuzzy
+msgid "Evolution vCard Importer"
 msgstr "Evolution VCard uvoznik"
 
-#: ../addressbook/printing/e-contact-print-envelope.c:213
-#: ../addressbook/printing/e-contact-print-envelope.c:234
-msgid "Print envelope"
-msgstr "Štampa koverte "
-
-#: ../addressbook/printing/e-contact-print.c:1001
-msgid "Print contacts"
-msgstr "Štampaj kontakte"
-
-#: ../addressbook/printing/e-contact-print.c:1066
-#: ../addressbook/printing/e-contact-print.c:1093
-msgid "Print contact"
-msgstr "Štampaj kontakt"
-
-#: ../addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Prazni obrasci na kraju:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Tijelo"
-
-#: ../addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Dno:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Dimenzije:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:7
-msgid "F_ont..."
-msgstr "_Font..."
-
-#: ../addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Fontovi"
-
-#: ../addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Podnožje:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Format"
-
-#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:496
-#: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:660
-#: ../widgets/table/e-table-field-chooser.c:93
-#: ../widgets/table/e-table-header-item.c:1831
-#: ../widgets/table/e-table-selection-model.c:318
-msgid "Header"
-msgstr "Zaglavlje"
-
-#: ../addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Zaglavlje/podnožje"
-
-#: ../addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Naslovi"
-
-#: ../addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Naslov za svako slovo"
-
-#: ../addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Visina:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Odmah slijede jedna drugu"
-
-#: ../addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Uključi:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Položeno"
-
-#: ../addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Lijevo:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Kartice za slovima sa strane"
-
-#: ../addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Margine"
-
-#: ../addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "Broj kolona:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Opcije"
-
-#: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:118
-msgid "Orientation"
-msgstr "Orijentacija"
-
-#: ../addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Stranica"
-
-#: ../addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Podešavanje strane:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Papir"
-
-#: ../addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Izvor papira:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Portret"
-
-#: ../addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Pregled:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Štampaj korištenjem sivog sjenčanja"
-
-#: ../addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Obrnuto na parnim stranicama"
-
-#: ../addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Desno:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Odjeljci:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Sjenčanje"
-
-#. FIXME: Take care of i18n
-#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:917
-#: ../plugins/exchange-operations/exchange-calendar.c:205
-#: ../plugins/exchange-operations/exchange-contacts.c:176
-msgid "Size:"
-msgstr "Veličina:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Započinju na novoj stranici"
-
-#: ../addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Naziv stila:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Vrh:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:176
-msgid "Type:"
-msgstr "Vrsta:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Širina:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:42
-msgid "_Font..."
-msgstr "_Font..."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:53
-msgid "Contact Print Style Editor Test"
-msgstr "Testiranje editora za štampu stila kontakta"
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:53
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Autorska prava (C) 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:56
-msgid "This should test the contact print style editor widget"
-msgstr "Ovo testira element editora stila za štampanje kontakta"
-
-#: ../addressbook/printing/test-print.c:52
-msgid "Contact Print Test"
-msgstr "Testiranje štampe kontakata"
-
-#: ../addressbook/printing/test-print.c:55
-msgid "This should test the contact print code"
-msgstr "Ovo isprobava kod za štampu kontakata"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:664
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:700
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "Ne mogu otvoriti datoteku"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
+#, fuzzy
+msgid "Couldn't get list of address books"
 msgstr "Ne mogu dobaviti listu adresara"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "ne mogu otvoriti adresar"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:45
 msgid "Specify the output file instead of standard output"
 msgstr "Navedite izlaznu datoteku umjesto standardnog izlaza"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:46
 msgid "OUTPUTFILE"
 msgstr "IZLAZNADATOTEKA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
-msgid "List local addressbook folders"
+#: ../addressbook/tools/evolution-addressbook-export.c:49
+#, fuzzy
+msgid "List local address book folders"
 msgstr "Izlistaj lokalne direktorije adresara"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
 msgstr "Prikaži karte kao vcard ili csv datoteku"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 #, fuzzy
 msgid "Export in asynchronous mode"
 msgstr "Izvoz u asinhronom načinu rada"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 #, fuzzy
 msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
 msgstr ""
 "Broj kartica u jednoj izlaznoj datoteci u asinhronom načinu rada, uobičajena "
 "veličina je 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "BROJ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:91
+#: ../addressbook/tools/evolution-addressbook-export.c:99
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Greška kod argumenata u komandnoj liniji, koristite --help da biste vidjeli "
 "način korištenja."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:113
 msgid "Only support csv or vcard format."
 msgstr "Podržava samo csv i vcard formate."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In async mode, output must be file."
 msgstr "U asinhronom načinu rada, izlaz mora biti datoteka."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:130
 #, fuzzy
 msgid "In normal mode, there is no need for the size option."
 msgstr "U normalnom načinu rada, ne treba postojati opcija za veličinu."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 #, fuzzy
 msgid "Unhandled error"
 msgstr "Druga greška"
 
-#: ../addressbook/tools/evolution-addressbook-import.c:46
-msgid "Error loading default addressbook."
-msgstr "Greška kod učitavanja uobičajenog adresara."
-
-#: ../addressbook/tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "Ulazna datoteka"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:82
-msgid "No filename provided."
-msgstr "Naziv datoteke nije dat."
-
-#: ../calendar/calendar.error.xml.h:1
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:2
 msgid ""
-" There are few attachments getting downloaded. Saving the appointment will "
-"cause the appointment to be saved without those pending attachments "
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:2
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:4
 msgid ""
-" There are few attachments getting downloaded. Saving the task will cause "
-"the task to be saved without those pending attachments "
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:3
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
-"Adding a meaningful Summary to your appointment will give your recipients an "
+"Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:6
 msgid ""
-"Adding a meaningful Summary to your task will give your recipients an idea "
+"Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:5
-msgid ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
+#: ../calendar/calendar.error.xml.h:7
+#, fuzzy
+msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
-"Sve ifnormacije u ovim unosima u dnevniku će biti uklonjene i neće se moći "
-"vratiti."
+"Sve informacije o ovim zadacima će biti izbrisane i neće se moći vratiti."
 
-#: ../calendar/calendar.error.xml.h:6
-msgid ""
-"All information in this journal will be deleted and can not be restored."
+#: ../calendar/calendar.error.xml.h:8
+#, fuzzy
+msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
 "Sve informacije u ovom dnevniku će biti izbrisane i neće se moći vratiti."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr ""
 "Sve informacije o ovim sastancima će biti izbrisane i neće se moći vratiti."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 "Sve informacije o ovim zadacima će biti izbrisane i neće se moći vratiti."
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:11
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "Sve informacije o ovom zakazanom sastanku će biti uklonjene i neće se moći "
 "vratiti."
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:12
 msgid ""
-"All information on this journal entry will be deleted and can not be "
-"restored."
+"All information on this meeting will be deleted and can not be restored."
 msgstr ""
-"Sve informacije o ovom unosu u dnevniku će biti uklonjene i neće se moći "
-"vratiti."
+"Sve informacije o ovom sastanku će biti izbrisane i neće se moći vratiti."
 
-#: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+#: ../calendar/calendar.error.xml.h:13
+#, fuzzy
+msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 "Sve informacije o ovom sastanku će biti izbrisane i neće se moći vratiti."
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 "Sve informacije o ovom zadatku će biti izbrisane i neće se moći vratiti."
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Sigurni ste da želite obrisati zadatak '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Sigurno želite izbrisati ovaj zakazani sastanak sa naslovom „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:15
-msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr "Sigurno želite izbrisati ovaj unos u dnevniku '{0}'?"
+#: ../calendar/calendar.error.xml.h:17
+#, fuzzy
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr "Sigurni ste da želite obrisati zadatak '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Sigurno želite izbrisati ovih {0} zakazanih sastanka?"
 
-#: ../calendar/calendar.error.xml.h:17
-msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "Sigurno želite izbrisati ovih {0} unosa u dnevniku?"
+#: ../calendar/calendar.error.xml.h:19
+#, fuzzy
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "Sigurni ste da želite obrisati ovih {0} zadatka?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Sigurni ste da želite obrisati ovih {0} zadatka?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Sigurno želite izbrisati ovaj zakazani sastanak?"
 
-#: ../calendar/calendar.error.xml.h:20
-msgid "Are you sure you want to delete this journal entry?"
-msgstr "Sigurno želite izbrisati ovaj unos u dnevniku?"
-
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:182
+#, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Sigurno želite obrisati ovaj sastanak?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:188
+#, fuzzy, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "Sigurno želite obrisati ovaj sastanak?"
+
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:185
+#, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Sigurni ste da želite obrisati zadatak?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
+#, fuzzy
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Sigurni ste da želite obrisati zadatak?"
+
+#: ../calendar/calendar.error.xml.h:26
 #, fuzzy
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Sigurno želite izbrisati ovaj zakazani sastanak sa naslovom „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:27
 #, fuzzy
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Sigurni ste da želite obrisati zadatak?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:28
+#, fuzzy
+msgid "Calendar repository is offline."
+msgstr "Arhiva nije na mreži"
+
+#: ../calendar/calendar.error.xml.h:29
+#, fuzzy
+msgid "Cannot create a new event"
+msgstr "Unesi novi kontakt"
+
+#: ../calendar/calendar.error.xml.h:30
+#, fuzzy
+msgid "Cannot save event"
+msgstr "Unesi delegata"
+
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:32
 #, fuzzy
-msgid "Delete task list '{0}'?"
+msgid "Delete memo list '{0}'?"
 msgstr "Nova lista zadataka"
 
-#: ../calendar/calendar.error.xml.h:27
-msgid "Discard Changes"
-msgstr "Zanemari promjene"
+#: ../calendar/calendar.error.xml.h:33
+#, fuzzy
+msgid "Delete task list '{0}'?"
+msgstr "Nova lista zadataka"
 
-#: ../calendar/calendar.error.xml.h:28
-msgid "Don't Send"
+#: ../calendar/calendar.error.xml.h:34
+#, fuzzy
+msgid "Do _not Send"
 msgstr "Ne šalji"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:35
 #, fuzzy
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Sigurno želite izbrisati ovaj zakazani sastanak?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:37
 #, fuzzy
 msgid "Editor could not be loaded."
 msgstr "Adresar nije mogao biti otvoren."
 
-#: ../calendar/calendar.error.xml.h:32
-msgid ""
-"Email invitations will be sent to all participants and allow them to RSVP."
-msgstr ""
-"Pozivnice email-om će biti poslane svim učesnicima da im omogući da se "
-"pripreme."
-
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4135,54 +3120,84 @@ msgstr ""
 "Pozivnice email-om će biti poslane svim učesnicima da im omogući da prihvate "
 "ovaj zadatak."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:39
+#, fuzzy
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+"Pozivnice email-om će biti poslane svim učesnicima da im omogući da se "
+"pripreme."
+
+#: ../calendar/calendar.error.xml.h:40
 #, fuzzy
 msgid "Error loading calendar"
 msgstr "Greška kod otvaranja kalendara"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:41
+#, fuzzy
+msgid "Error loading memo list"
+msgstr "Greška kod dodavanja liste"
+
+#: ../calendar/calendar.error.xml.h:42
 #, fuzzy
 msgid "Error loading task list"
 msgstr "Greška kod dodavanja liste"
 
-#: ../calendar/calendar.error.xml.h:36
-msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the journal has been deleted."
+#. For Translators: {0} is specify the backend server
+#: ../calendar/calendar.error.xml.h:44
+#, fuzzy
+msgid "Error on '{0}'"
 msgstr ""
-"Ukoliko ne pošaljete obavještenje o otkazivanju, ostali učesnici možda neće "
-"znati da je ovaj dnevnik izbrisan."
+"Greška na %s:\n"
+" %s"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:45
+#, fuzzy
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr ""
 "Ukoliko ne pošaljete obavještenje o otkazivanju, ostali učesnici možda neće "
 "znati da je sastanak otkazan."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:46
+#, fuzzy
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
+msgstr ""
+"Ukoliko ne pošaljete obavještenje o otkazivanju, ostali učesnici možda neće "
+"znati da je zadatak izbrisan."
+
+#: ../calendar/calendar.error.xml.h:47
+#, fuzzy
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr ""
 "Ukoliko ne pošaljete obavještenje o otkazivanju, ostali učesnici možda neće "
 "znati da je zadatak izbrisan."
 
-#: ../calendar/calendar.error.xml.h:39
-msgid "Save Changes"
-msgstr "Snimi promjene"
+#: ../calendar/calendar.error.xml.h:48
+msgid "No response from the server."
+msgstr ""
 
-#: ../calendar/calendar.error.xml.h:40
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Send"
-msgstr "Pošalji"
+#: ../calendar/calendar.error.xml.h:49
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Novi sastanak"
 
-#: ../calendar/calendar.error.xml.h:41
-msgid "Send Notice"
-msgstr "Pošalji obavještenje"
+#: ../calendar/calendar.error.xml.h:50
+#, fuzzy
+msgid "Save Memo"
+msgstr "Poruka servera:"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:51
+#, fuzzy
+msgid "Save Task"
+msgstr "Snimi kao..."
+
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4190,7 +3205,7 @@ msgstr ""
 "Slanje osvježenih podataka omogućava ostalim učesnicima da njihov rokovnik "
 "bude u toku."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4198,129 +3213,228 @@ msgstr ""
 "Slanje osvježenih informacija omogućava ostalim učesnicima da njihov spisak "
 "zadataka bude u toku."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:55
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:56
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:57
+msgid "Some features may not work properly with your current server."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Kalendar Evolutiona je neočekivan okončan."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:59
+#, fuzzy
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "Kalendar Evolutiona je neočekivan okončan."
+
+#: ../calendar/calendar.error.xml.h:60
+#, fuzzy
+msgid "The Evolution memo has quit unexpectedly."
+msgstr "Kalendar Evolutiona je neočekivan okončan."
+
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Zadaci Evolutiona su neočekivano okončani."
 
-#: ../calendar/calendar.error.xml.h:47
-msgid "The calendar is not marked for offline usage"
+#: ../calendar/calendar.error.xml.h:62
+msgid "The calendar is not marked for offline usage."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:48
-msgid "The task list is not marked for offline usage"
+#: ../calendar/calendar.error.xml.h:63
+msgid "The memo list is not marked for offline usage."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:64
+msgid "The task list is not marked for offline usage."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:66
+#, fuzzy
+msgid "This memo list will be removed permanently."
+msgstr "Adresar nije mogao biti otvoren."
+
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:68
+#, fuzzy
+msgid "Unable to load the calendar"
+msgstr "Nije moguće otvoriti kalendar '%s'."
+
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Želite li snimiti izmjene u ovom sastanku?"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this memo?"
+msgstr "Želite li snimiti promjene u ovom zadatku?"
+
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
 msgstr "Želite li snimiti promjene u ovom zadatku?"
 
-#: ../calendar/calendar.error.xml.h:53
-msgid "Would you like to send a cancellation notice for this journal entry?"
+#: ../calendar/calendar.error.xml.h:72
+#, fuzzy
+msgid "Would you like to send a cancelation notice for this memo?"
 msgstr ""
 "Želite li da pošaljete obavještenje o otkazivanju za ovaj unos u dnevniku?"
 
-#: ../calendar/calendar.error.xml.h:54
-msgid "Would you like to send all the participants a cancellation notice?"
+#: ../calendar/calendar.error.xml.h:73
+#, fuzzy
+msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Želite li da pošaljete svim učesnicima obavještenje o otkazivanju?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Želite li poslati pozive za učešće učesnicima?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr "Želite li poslati ovaj zadatak učesnicima?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Želite li poslati osvježene podatke o sastanku svim učesnicima?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
 msgstr "Želite li poslati osvježene informacije o zadacima svim učesnicima?"
 
-#: ../calendar/calendar.error.xml.h:60
-msgid "You have made changes to this appointment, but not yet saved them."
+#: ../calendar/calendar.error.xml.h:78
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:79
+#, fuzzy
+msgid "You have changed this appointment, but not yet saved it."
 msgstr "Izmijenili ste ovaj sastanak, ali promjene još niste snimili."
 
-#: ../calendar/calendar.error.xml.h:61
-msgid "You have made changes to this task, but not yet saved them."
+#: ../calendar/calendar.error.xml.h:80
+#, fuzzy
+msgid "You have changed this task, but not yet saved it."
 msgstr "Napravili ste izmjene u ovom zadatku, ali ih još niste snimili."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:81
+#, fuzzy
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr "Napravili ste izmjene u ovom zadatku, ali ih još niste snimili."
+
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Vaši kalendari neće biti dostupni dok se Evolution ponovo ne pokrene."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:83
+#, fuzzy
+msgid "Your memos will not be available until Evolution is restarted."
+msgstr "Vaši zadaci neće biti dostupni dok se Evolution ponovo ne pokrene."
+
+#: ../calendar/calendar.error.xml.h:84
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Vaši zadaci neće biti dostupni dok se Evolution ponovo ne pokrene."
 
-#: ../calendar/calendar.error.xml.h:64
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../calendar/calendar.error.xml.h:85
+#: ../composer/mail-composer.error.xml.h:30
+#, fuzzy
+msgid "_Discard Changes"
+msgstr "Zanemari promjene"
+
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
 msgid "_Save"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:65
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
+#: ../calendar/calendar.error.xml.h:87
+#, fuzzy
+msgid "_Save Changes"
+msgstr "Snimi promjene"
+
+#: ../calendar/calendar.error.xml.h:88
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:89
+#, fuzzy
+msgid "_Send Notice"
+msgstr "Pošalji obavještenje"
+
+#: ../calendar/calendar.error.xml.h:90
 msgid "{0}."
 msgstr ""
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
-#: ../smime/gui/component.c:48
-msgid "Enter password"
-msgstr "Upišite šifru"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:246
+#: ../calendar/conduits/calendar/calendar-conduit.c:248
 msgid "Split Multi-Day Events:"
 msgstr "Podijeli višednevne događaje:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1365
-#: ../calendar/conduits/calendar/calendar-conduit.c:1366
-#: ../calendar/conduits/todo/todo-conduit.c:879
-#: ../calendar/conduits/todo/todo-conduit.c:880
+#: ../calendar/conduits/calendar/calendar-conduit.c:1513
+#: ../calendar/conduits/calendar/calendar-conduit.c:1514
+#: ../calendar/conduits/memo/memo-conduit.c:807
+#: ../calendar/conduits/memo/memo-conduit.c:808
+#: ../calendar/conduits/todo/todo-conduit.c:1007
+#: ../calendar/conduits/todo/todo-conduit.c:1008
 msgid "Could not start evolution-data-server"
 msgstr "Ne mogao pokrenuti evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1474
-#: ../calendar/conduits/calendar/calendar-conduit.c:1477
+#: ../calendar/conduits/calendar/calendar-conduit.c:1621
+#: ../calendar/conduits/calendar/calendar-conduit.c:1624
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ne mogu pročitati programski blok Kalendara"
 
-#: ../calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/memo/memo-conduit.c:901
+#: ../calendar/conduits/memo/memo-conduit.c:904
+#, fuzzy
+msgid "Could not read pilot's Memo application block"
+msgstr "Nisam mogao pročitati pilotov ToDo programski blok"
+
+#: ../calendar/conduits/memo/memo-conduit.c:948
+#: ../calendar/conduits/memo/memo-conduit.c:951
+#, fuzzy
+msgid "Could not write pilot's Memo application block"
+msgstr "Nisam mogao pročitati pilotov ToDo programski blok"
+
+#: ../calendar/conduits/todo/todo-conduit.c:227
 msgid "Default Priority:"
 msgstr "Uobičajeni prioritet:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:959
-#: ../calendar/conduits/todo/todo-conduit.c:962
+#: ../calendar/conduits/todo/todo-conduit.c:1091
+#: ../calendar/conduits/todo/todo-conduit.c:1094
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisam mogao pročitati pilotov ToDo programski blok"
 
+#: ../calendar/conduits/todo/todo-conduit.c:1136
+#: ../calendar/conduits/todo/todo-conduit.c:1139
+#, fuzzy
+msgid "Could not write pilot's ToDo application block"
+msgstr "Nisam mogao pročitati pilotov ToDo programski blok"
+
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../plugins/itip-formatter/itip-formatter.c:2549
 msgid "Calendar and Tasks"
 msgstr "Kalendar i zadaci"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1309
+#: ../calendar/gui/calendar-component.c:819
+#: ../calendar/gui/calendar-component.c:1238
 msgid "Calendars"
 msgstr "Kalendari"
 
@@ -4349,27 +3463,50 @@ msgid "Evolution's Calendar component"
 msgstr "Kalendar komponenta Evolutiona"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Tasks component"
+#, fuzzy
+msgid "Evolution's Memos component"
 msgstr "Komponenta zadataka Evolutiona"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1257 ../calendar/gui/print.c:1822
-#: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1006 ../calendar/gui/tasks-control.c:457
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:582
+msgid "Evolution's Tasks component"
+msgstr "Komponenta zadataka Evolutiona"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Memo_s"
+msgstr "Članovi"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1123
+#: ../calendar/gui/gnome-cal.c:1846 ../calendar/gui/memos-component.c:564
+#: ../calendar/gui/memos-component.c:882 ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
+#, fuzzy
+msgid "Memos"
+msgstr "Članovi"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1426
+#: ../calendar/gui/gnome-cal.c:1714 ../calendar/gui/print.c:1973
+#: ../calendar/gui/tasks-component.c:557 ../calendar/gui/tasks-component.c:879
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Zadaci"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
 msgid "_Calendars"
 msgstr "_Kalendari"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../views/tasks/galview.xml.h:3
+#. Tasks
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../plugins/pst-import/pst-importer.c:328 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Zadaci"
 
@@ -4377,7 +3514,7 @@ msgstr "_Zadaci"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servis za alarm obavijesti Evolution kalendara"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
 #, fuzzy
 msgid "minute"
 msgid_plural "minutes"
@@ -4385,107 +3522,107 @@ msgstr[0] "minute"
 msgstr[1] "minute"
 msgstr[2] "minute"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:248
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-file/calendar-file.c:287
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:721
+#: ../plugins/google-account-setup/google-contacts-source.c:331
+#, fuzzy
+msgid "hours"
+msgid_plural "hours"
+msgstr[0] "sati"
+msgstr[1] "sati"
+msgstr[2] "sati"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 #, fuzzy
 msgid "Start time"
 msgstr "_Početno vrijeme:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:347
-#, c-format
-msgid ""
-"<big><b>%s</b></big>\n"
-"%s until %s"
-msgstr ""
-
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
 #, fuzzy
 msgid "Appointments"
 msgstr "Sastanak"
 
-#. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1120
-#: ../plugins/itip-formatter/itip-view.c:884
+#, fuzzy
+msgid "Dismiss _All"
+msgstr "Odbaci _sve"
+
+#. Location
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1592
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
 msgstr "Lokacija:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #, fuzzy
 msgid "Snooze _time:"
 msgstr "Vrijeme _drijemanja (minute)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:8
-#: ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-message-composer.xml.h:44
-#: ../ui/evolution-signature-editor.xml.h:23
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
-#: ../ui/evolution.xml.h:35
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#, fuzzy
+msgid "_Dismiss"
+msgstr "Odbaci"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Izmijeni"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "_Snooze"
 msgstr "_Drijemaj"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#, fuzzy
-msgid "description of appointment"
-msgstr "početak sastanka"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 #, fuzzy
 msgid "location of appointment"
 msgstr "početak sastanka"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:954
-msgid "Dismiss"
-msgstr "Odbaci"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:955
-msgid "Dismiss All"
-msgstr "Odbaci _sve"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1037
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1451
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
 #, fuzzy
 msgid "No summary available."
 msgstr "Opis ne postoji."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1046
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1048
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
 msgid "No description available."
 msgstr "Opis ne postoji."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1056
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 #, fuzzy
 msgid "No location information available."
 msgstr "Opis ne postoji."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1515
 #, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
+msgid "You have %d alarms"
 msgstr ""
-"Alarm za %s\n"
-"%s\n"
-"Počinje u %s\n"
-"Završava u %s"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1175
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1199
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1675
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1179
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4497,7 +3634,7 @@ msgstr ""
 "podsjetnik podešen za slanje emaila. Evolution će\n"
 "umjesto toga pokazati normalan prozor za dijalog."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1205
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1709
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4514,400 +3651,678 @@ msgstr ""
 "\n"
 "Sigurno želite pokrenuti ovaj program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1219
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovno za ovu program."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "Ne mogu pokrenuti Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
-msgid "Could not create the alarm notify service factory"
+#: ../calendar/gui/alarm-notify/notify-main.c:154
+#, fuzzy
+msgid ""
+"Could not create the alarm notify service factory, maybe it's already "
+"running..."
 msgstr "Nisam mogao pokrenuti stvaranje servisa za alarm obavijesti"
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "pogrešno vrijeme"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/misc.c:116
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d sat"
+msgstr[1] "%d sata"
+msgstr[2] "%d sati"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/misc.c:122
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minut"
+msgstr[1] "%d minuta"
+msgstr[2] "%d minuta"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/misc.c:126
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunda"
+msgstr[1] "%d sekunde"
+msgstr[2] "%d sekundi"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 #, fuzzy
 msgid "Alarm programs"
 msgstr "Pokreni program"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 #, fuzzy
 msgid "Ask for confirmation when deleting items"
 msgstr "Tr_aži potvrdu za brisanje podataka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 #, fuzzy
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Boja zadataka koji su danas na redu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 #, fuzzy
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Boja zadataka kojima je prošao rok"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
 msgid "Calendars to run alarms for"
 msgstr "Kalendari za koje se pokreću alarmi"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Check this to use system timezone in Evolution."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 #, fuzzy
 msgid "Compress weekends in month view"
 msgstr "_Skupi sedmice u mjesečni prikaz"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Confirm expunge"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+msgid "Count of default recurrence for a new event. -1 means forever."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 #, fuzzy
 msgid "Default appointment reminder"
 msgstr "Ovaj sastanak se po_navlja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#, fuzzy
+msgid "Default recurrence count"
+msgstr "Uobičajeni prioritet:"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 #, fuzzy
 msgid "Default reminder units"
 msgstr "Uobičajeni prioritet:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 #, fuzzy
 msgid "Default reminder value"
 msgstr "Jedinice uobičajenog podsjetnika"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+msgid "Directory for saving alarm audio files"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 #, fuzzy
-msgid "Free/busy server urls"
+msgid "Event Gradient"
+msgstr "Informacije o događaju"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+msgid "Event Transparency"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#, fuzzy
+msgid "Free/busy server URLs"
 msgstr "Slobodan/zauzet zahtjev"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 #, fuzzy
-msgid "Free/busy template url"
+msgid "Free/busy template URL"
 msgstr "Slobodan/zauzet odgovor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+msgid "Gradient of the events in calendar views."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 #, fuzzy
 msgid "Hide completed tasks"
 msgstr "_Sakrij ispunjene zadatke nakon "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 #, fuzzy
 msgid "Hide task units"
 msgstr "Nova lista zadataka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hide task value"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 #, fuzzy
 msgid "Horizontal pane position"
 msgstr "Vodoravna mreža za crtanje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 #, fuzzy
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Intervali prikazani u pogledu dana i radne sedmice"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Last alarm time"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid "Level beyond which the message should be logged."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 #, fuzzy
-msgid "List of server urls for free/busy publishing."
+msgid "List of server URLs for free/busy publishing."
 msgstr "Lista adresa za objavljivanje podatka o dostupnosti/zauzetosti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line Color - Day View"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Time bar"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+msgid "Maximum number of recently used timezones to remember."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 #, fuzzy
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuta kojom završava radni dan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 #, fuzzy
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuta kojom započinje radni dan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 #, fuzzy
 msgid "Month view horizontal pane position"
 msgstr "Pozicija vodoravne ploče"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 #, fuzzy
 msgid "Month view vertical pane position"
 msgstr "Pozicija okomite ploče u glavnom pogledu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 #, fuzzy
-msgid "Number of units for determining for a default reminder."
+msgid "Number of units for determining a default reminder."
 msgstr "Broj jedinica za uobičajeni podsjetnik"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 #, fuzzy
 msgid "Number of units for determining when to hide tasks."
 msgstr "Broj jedinica za određivanje kada treba sakriti zadatke"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 #, fuzzy
 msgid "Overdue tasks color"
 msgstr "_Neispunjeni zadaci:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#, fuzzy
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr "Pozicija okomite ploče u mjesečnom pogledu"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 #, fuzzy
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr "Pozicija okomite ploče u popisu zadataka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#, fuzzy
+msgid "Primary calendar"
+msgstr "Osnovni email"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#, fuzzy
+msgid "Primary memo list"
+msgstr "Osnovni email"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#, fuzzy
+msgid "Primary task list"
+msgstr "Osnovni email"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 #, fuzzy
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programi koji se mogu pokretati kao dio alarma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+msgid "Recently used second time zones in a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+msgid "Save directory for alarm audio"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+msgid "Scroll Month View by a week"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+msgid "Show Role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 #, fuzzy
 msgid "Show appointment end times in week and month views"
 msgstr ""
 "_Pokaži završetke zakazanih sastanaka u sedmičnim i mjesečnim prikazima"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+msgid "Show categories field in the event/meeting/task editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show display alarms in notification tray"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+msgid "Show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid "Show the \"Preview\" pane"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:141
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+msgid "Show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+msgid "Show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#, fuzzy
+msgid "Show week number in Day and Work Week View"
+msgstr "Pokaži _brojeve sedmica u navigatoru datuma"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 #, fuzzy
 msgid "Show week numbers in date navigator"
 msgstr "Pokaži _brojeve sedmica u navigatoru datuma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 #, fuzzy
 msgid "Tasks due today color"
 msgstr "Z_adaci za danas:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Tasks vertical pane position"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
-#, no-c-format
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+msgid "The second timezone for a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
-"The url template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 #, fuzzy
 msgid "Time divisions"
 msgstr "Podjela _vremena:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 #, fuzzy
 msgid "Time the last alarm ran, in time_t."
 msgstr "Vrijeme kada je istekao zadnji alarm"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 #, fuzzy
 msgid "Timezone"
 msgstr "Vremenska _zona:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+msgid ""
+"Transparency of the events in calendar views, a value between 0 "
+"(transparent) and 1 (opaque)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Twenty four hour time format"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 #, fuzzy
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "Jedinice koje određuju kada treba sakriti zadatke"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+msgid "Use system timezone"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 #, fuzzy
 msgid "Week start"
 msgstr "Početak _sedmice:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 #, fuzzy
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Radni dan kojim sedmica počinje "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 #, fuzzy
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Da li se koristi ili ne dio za obavještenja koji se nalazi u 'tray'-u"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 #, fuzzy
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Treba li tražiti potvrdu prilikom brisanja sastanka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 #, fuzzy
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Treba li tražiti potvrdu prilikom brisanja sastanka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 #, fuzzy
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "_Pokaži završetke zakazanih sastanaka u sedmičnim i mjesečnim prikazima"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 #, fuzzy
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Treba li sakriti završene zadatke"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 #, fuzzy
 msgid "Whether to set a default reminder for appointments."
 msgstr "Treba li postaviti uobičajeni podsjetnik za sve događaje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#, fuzzy
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "Treba li prikazivati brojeve sedmice u navigatoru datumima"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#, fuzzy
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "Treba li prikazivati brojeve sedmice u navigatoru datumima"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#, fuzzy
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr "Treba li prikazivati brojeve sedmice u navigatoru datumima"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#, fuzzy
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr "Treba li prikazivati brojeve sedmice u navigatoru datumima"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 #, fuzzy
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Treba li prikazivati vrijeme u 24 satnom obliku umjesto am/pm formata"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#, fuzzy
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "Treba li prikazivati brojeve sedmice u navigatoru datumima"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#, fuzzy
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr "Treba li prikazivati brojeve sedmice u navigatoru datumima"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#, fuzzy
+msgid "Whether to show week number in the Day and Work Week View."
+msgstr "Treba li prikazivati brojeve sedmice u navigatoru datumima"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 #, fuzzy
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Treba li prikazivati brojeve sedmice u navigatoru datumima"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 #, fuzzy
 msgid "Work days"
 msgstr "Radni dani:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Workday end hour"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Workday end minute"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 #, fuzzy
 msgid "Workday start hour"
 msgstr "Sat kojim počinje radni dan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 #, fuzzy
 msgid "Workday start minute"
 msgstr "Sat kojim počinje radni dan"
 
-#: ../calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/cal-editor-utils.c:100
+#, fuzzy
+msgid "Invalid object"
+msgstr "Neispravni kontakt."
+
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Summary contains"
 msgstr "Sažetak sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Description contains"
 msgstr "Opis sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:76
+msgid "Category is"
+msgstr "Kategorija je"
+
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Comment contains"
 msgstr "Komentar sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Location contains"
 msgstr "Mjesto sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:350
-msgid "Unmatched"
-msgstr "Neupariv"
+#: ../calendar/gui/cal-search-bar.c:636
+msgid "Next 7 Days' Tasks"
+msgstr ""
 
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2094
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
-msgid "Calendar"
-msgstr "Kalendar"
+#: ../calendar/gui/cal-search-bar.c:640
+#, fuzzy
+msgid "Active Tasks"
+msgstr "Dodijeli _zadatak"
 
-#: ../calendar/gui/calendar-commands.c:354
+#: ../calendar/gui/cal-search-bar.c:644
+#, fuzzy
+msgid "Overdue Tasks"
+msgstr "_Neispunjeni zadaci:"
+
+#: ../calendar/gui/cal-search-bar.c:648
+#, fuzzy
+msgid "Completed Tasks"
+msgstr "Završeno "
+
+#: ../calendar/gui/cal-search-bar.c:652
+#, fuzzy
+msgid "Tasks with Attachments"
+msgstr "Snimi sastanak"
+
+#: ../calendar/gui/cal-search-bar.c:698
+#, fuzzy
+msgid "Active Appointments"
+msgstr "Sastanak"
+
+#: ../calendar/gui/cal-search-bar.c:702
+#, fuzzy
+msgid "Next 7 Days' Appointments"
+msgstr "Cjelo_dnevni sastanak"
+
+#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Štampa"
+
+#: ../calendar/gui/calendar-commands.c:331
 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 "
@@ -4916,141 +4331,317 @@ msgstr ""
 "Ova operacija će trajno obrisati sve događaje starije od odabranog "
 "vremenskog trajanja. Ako nastavite, navedene događaje nećete moći vratiti."
 
-#: ../calendar/gui/calendar-commands.c:360
+#: ../calendar/gui/calendar-commands.c:337
 msgid "Purge events older than"
 msgstr "Izbriši događaje starije od"
 
-#: ../calendar/gui/calendar-commands.c:365
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
-#: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../calendar/gui/calendar-commands.c:342
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-file/calendar-file.c:288
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:722
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "dana"
 
-#. Create the On the web source group
 #. Create the Webcal source group
-#. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/calendar-component.c:194
+#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:504
+#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
+#: ../calendar/gui/tasks-component.c:149
 msgid "On The Web"
 msgstr "Na webu"
 
-#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
-msgid "Birthdays & Anniversaries"
-msgstr "Rođendani i godišnjice"
-
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:258
-#: ../plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:195
+#: ../plugins/calendar-weather/calendar-weather.c:126
 #, fuzzy
 msgid "Weather"
 msgstr "Ostalo"
 
-#: ../calendar/gui/calendar-component.c:535
-#: ../calendar/gui/dialogs/calendar-setup.c:449
-msgid "New Calendar"
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:289
+#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:398
+msgid "Birthdays & Anniversaries"
+msgstr "Rođendani i godišnjice"
+
+#: ../calendar/gui/calendar-component.c:626
+#, fuzzy
+msgid "_New Calendar"
 msgstr "Novi kalendar"
 
-#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
+#: ../mail/em-folder-tree.c:2114
+msgid "_Copy..."
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
+msgid "_Make available for offline use"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:477
+msgid "_Do not make available for offline use"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:961
 msgid "Failed upgrading calendars."
 msgstr "Neuspešno dograđivanje kalendara."
 
-#: ../calendar/gui/calendar-component.c:1154
+#: ../calendar/gui/calendar-component.c:1089
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Nije moguće otvoriti kalendar %s' za kreiranje događaja i sastanaka"
 
-#: ../calendar/gui/calendar-component.c:1170
+#: ../calendar/gui/calendar-component.c:1105
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nema dostupnog kalendara za pravljenje događaja i sastanaka"
 
-#: ../calendar/gui/calendar-component.c:1284
+#: ../calendar/gui/calendar-component.c:1218
 #, fuzzy
 msgid "Calendar Source Selector"
 msgstr "Lokacija kalendara"
 
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1433
 msgid "New appointment"
 msgstr "Novi sastanak"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1434
+#, fuzzy
+msgctxt "New"
 msgid "_Appointment"
 msgstr "_Sastanak"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1435
 msgid "Create a new appointment"
 msgstr "Napravi novi sastanak"
 
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1441
 msgid "New meeting"
 msgstr "Novi sastanak"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1442
+#, fuzzy
+msgctxt "New"
 msgid "M_eeting"
 msgstr "_Sastanak"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1443
 msgid "Create a new meeting request"
 msgstr "Unesite novi zahtjev za sastanak"
 
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1449
 msgid "New all day appointment"
 msgstr "Novi cijelodnevni sastanak"
 
-#: ../calendar/gui/calendar-component.c:1492
+#: ../calendar/gui/calendar-component.c:1450
+#, fuzzy
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Cjelo_dnevni sastanak"
 
-#: ../calendar/gui/calendar-component.c:1493
+#: ../calendar/gui/calendar-component.c:1451
 msgid "Create a new all-day appointment"
 msgstr "Napravi novi cjelodnevni sastanak"
 
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New calendar"
 msgstr "Novi kalendar"
 
-#: ../calendar/gui/calendar-component.c:1500
+#: ../calendar/gui/calendar-component.c:1458
+#, fuzzy
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_ndar"
 
-#: ../calendar/gui/calendar-component.c:1501
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new calendar"
 msgstr "Napravi novi kalendar"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Dnevni pregled"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "Pregled radne sedmice"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "Sedmični pregled"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "Mjesečni pregled"
 
-#: ../calendar/gui/comp-editor-factory.c:420
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
+#, fuzzy
+msgid "Any Field"
+msgstr "Polje"
+
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:6
+msgid "Attendee"
+msgstr "Učesnik"
+
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
+#, fuzzy
+msgid "Category"
+msgstr "Kategorija je"
+
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
+#, fuzzy
+msgid "Classification"
+msgstr "Kla_sifikacija:"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:370 ../calendar/gui/e-calendar-table.c:565
+#: ../calendar/gui/memotypes.xml.h:6
+#: ../plugins/email-custom-header/email-custom-header.c:340
+msgid "Confidential"
+msgstr "Povjerljivo"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:10
+#: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Opis"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:11
+#, fuzzy
+msgid "Description Contains"
+msgstr "Opis sadrži"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:722
+#: ../plugins/save-calendar/csv-format.c:371
+msgid "Location"
+msgstr "Lokacija"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
+#, fuzzy
+msgid "Organizer"
+msgstr "Organizator:"
+
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:368 ../calendar/gui/e-calendar-table.c:564
+#: ../calendar/gui/memotypes.xml.h:12
+msgid "Private"
+msgstr "Privatno"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:359 ../calendar/gui/e-cal-model.c:366
+#: ../calendar/gui/e-calendar-table.c:563 ../calendar/gui/memotypes.xml.h:13
+msgid "Public"
+msgstr "Javno"
+
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/dialogs/event-editor.c:304
+msgid "Recurrence"
+msgstr "Ponavljanje"
+
+#: ../calendar/gui/caltypes.xml.h:17
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:22
+#: ../plugins/save-calendar/csv-format.c:357
+msgid "Summary"
+msgstr "Sažetak"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
+#, fuzzy
+msgid "Summary Contains"
+msgstr "Sažetak sadrži"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
+msgid "is"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
+msgid "is not"
+msgstr ""
+
+#: ../calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Greška kod otvaranja kalendara"
 
-#: ../calendar/gui/comp-editor-factory.c:426
+#: ../calendar/gui/comp-editor-factory.c:414
 msgid "Method not supported when opening the calendar"
 msgstr "Metoda nije podržana kod otvaranja kalendara"
 
-#: ../calendar/gui/comp-editor-factory.c:432
+#: ../calendar/gui/comp-editor-factory.c:420
 msgid "Permission denied to open the calendar"
 msgstr "Zabranjen pristup kalendaru"
 
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1267
+#: ../calendar/gui/comp-editor-factory.c:438 ../shell/e-shell.c:1261
 msgid "Unknown error"
 msgstr ""
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:611
+#, fuzzy
+msgid "Edit Alarm"
+msgstr "Dodaj alarm"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "Prikaži upozorenje"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "Odsviraj zvuk"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "Pokreni program"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Pošalji email"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 #, fuzzy
 msgid "<b>Alarm</b>"
@@ -5081,86 +4672,63 @@ msgid "Mes_sage:"
 msgstr "_Poruka:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr "Odsviraj zvuk"
+#, fuzzy
+msgid "Select A File"
+msgstr "Izaberi sve"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr "Prikaži upozorenje"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "Pokreni program"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Send To:"
 msgstr "Za:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: ../calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr "Pošalji email"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 msgid "_Arguments:"
 msgstr "_Argumenti:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "_Repeat the alarm"
 msgstr "_Ponovi alarm"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Sound:"
 msgstr "_Zvuk"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
-msgid "after"
-msgstr "nakon"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
-msgid "before"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid ""
+"before\n"
+"after"
 msgstr "prije"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "day(s)"
-msgstr "dan(a)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
-msgid "end of appointment"
-msgstr "kraj sastanka"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "extra times every"
 msgstr "pokaži još na svakih"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
-msgid "hour(s)"
-msgstr "sat(i)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:564
-msgid "hours"
-msgstr "sati"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+msgid ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
+msgstr ""
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-msgid "minute(s)"
-msgstr "minuta(e)"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+msgid ""
+"minutes\n"
+"hours\n"
+"days"
+msgstr ""
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-msgid "start of appointment"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#, fuzzy
+msgid ""
+"start of appointment\n"
+"end of appointment"
 msgstr "početak sastanka"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:199
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Akcija/okidač"
 
@@ -5169,725 +4737,771 @@ msgid "A_dd"
 msgstr "_Dodaj"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Alarmi"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:110
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:106
-#, c-format
-msgid "%.0fK"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:113
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:109
-#, c-format
-msgid "%.0fM"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:116
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.0fG"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:311
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2440
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
-#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
-msgid "attachment"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1083
-#: ../calendar/gui/dialogs/meeting-page.c:887
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3400
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:18
-msgid "_Remove"
-msgstr "_Ukloni"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1084
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2047
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "_Properties"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1086
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3403
-#, fuzzy
-msgid "_Add attachment..."
-msgstr "Dodaj kolonu..."
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:736
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:963
-msgid "Attachment Bar"
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
+msgid "_Suggest automatic display of attachment"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:6
-#: ../composer/e-msg-composer-select-file.c:97
-#: ../composer/e-msg-composer-select-file.c:117
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:241
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
 msgid "Attach file(s)"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-attachment.c:210
-#: ../calendar/gui/dialogs/cal-attachment.c:226
-#: ../calendar/gui/dialogs/cal-attachment.c:319
-#: ../calendar/gui/dialogs/cal-attachment.c:335
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:221 ../widgets/misc/e-attachment.c:237
-#: ../widgets/misc/e-attachment.c:425 ../widgets/misc/e-attachment.c:441
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-attachment.c:218
-#: ../calendar/gui/dialogs/cal-attachment.c:327
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:229 ../widgets/misc/e-attachment.c:433
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr ""
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/event-page.c:2993
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-day-view-time-item.c:785
+#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:942
+#: ../mail/em-account-editor.c:717 ../mail/em-account-editor.c:1451
+#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
+#: ../plugins/calendar-weather/calendar-weather.c:333
+#: ../plugins/calendar-weather/calendar-weather.c:387
+#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
+#: ../widgets/misc/e-dateedit.c:1674
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "Nijedan"
 
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr ""
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
+#, fuzzy
+msgid "Selected Calendars for Alarms"
+msgstr "Kalendari za koje se pokreću alarmi"
 
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1166
-#: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
-msgid "Description:"
-msgstr "Opis:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+#, fuzzy
+msgid "Time and date:"
+msgstr "Vremenska _zona:"
 
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "File name:"
-msgstr ""
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
+#, fuzzy
+msgid "Date only:"
+msgstr "Datum:"
 
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:5
-#: ../composer/e-msg-composer-attachment.glade.h:5
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "MIME type:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "(Shown in a Day View)"
 msgstr ""
 
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:891
-#: ../plugins/plugin-manager/plugin-manager.c:213
-msgid "Enabled"
-msgstr "Uključeno"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
-msgid "Are you sure you want to remove this URL?"
-msgstr "Jeste li sigurni da želite obrisati ovu adresu?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
-msgid "Remove"
-msgstr "Ukloni"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
-msgid "Don't Remove"
-msgstr "Nemoj ukloniti"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:406
-msgid "Disable"
-msgstr "Isključi"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:408
-msgid "Enable"
-msgstr "Uključi"
-
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "05 minutes"
-msgstr "05 minuta"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "10 minutes"
-msgstr "10 minuta"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minuta"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "30 minutes"
-msgstr "30 minuta"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "60 minutes"
-msgstr "60 minuta"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "<b>Alerts</b>"
-msgstr "<b>Upozorenja</b>"
+msgid ""
+"60 minutes\n"
+"30 minutes\n"
+"15 minutes\n"
+"10 minutes\n"
+"05 minutes"
+msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, fuzzy
-msgid "<b>Default Free/Busy Server</b>"
-msgstr "<b>Kalendari za slobodno/zauzeto</b>"
+#, no-c-format
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<b>General</b>"
-msgstr "<b>Općenito</b> "
+#, fuzzy
+msgid "<span weight=\"bold\">Alarms</span>"
+msgstr "<span weight=\"bold\">Status</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Publishing</b>"
-msgstr "<b>Učestalost objavljivanja</b>"
+#: ../mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "<b>Task List</b>"
-msgstr "<b>Lista zadataka</b>"
+#: ../mail/mail-config.glade.h:13
+#, fuzzy
+msgid "<span weight=\"bold\">Date/Time Format</span>"
+msgstr "<span weight=\"bold\">Status</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<b>Time</b>"
-msgstr "<b>Vrijeme</b> "
+#, fuzzy
+msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgstr "<span weight=\"bold\">Status</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "<b>Work Week</b>"
-msgstr "<b>Radna sedmica</b> "
+#: ../mail/mail-config.glade.h:17
+#: ../plugins/publish-calendar/publish-calendar.glade.h:1
+msgid "<span weight=\"bold\">General</span>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#, fuzzy
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "<span weight=\"bold\">Status</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr ""
+#, fuzzy
+msgid "<span weight=\"bold\">Time</span>"
+msgstr "<span weight=\"bold\">Status</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar and Tasks Settings"
-msgstr "Postave kalendara i zadataka"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Color for overdue tasks"
-msgstr "Boja zakašnjelih zadataka"
+#, fuzzy
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr "<span weight=\"bold\">Status</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Color for tasks due today"
-msgstr "Boja zadataka kojima danas ističe rok"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Day _ends:"
 msgstr "Kraj _dana:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Days"
-msgstr "dani"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Display"
 msgstr "Prikaži"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: ../mail/mail-config.glade.h:74
-msgid "E_nable"
-msgstr "_Uključi"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#, fuzzy
-msgid "Free/Busy"
-msgstr "Slobodan/zauzet:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "Display alarms in _notification area only"
+msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "Petak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Hours"
-msgstr "Sati"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Minuta"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "Ponedjeljak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#, fuzzy
-msgid "Publishing Table"
-msgstr "ljubičasto plava"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../mail/mail-config.glade.h:118
+msgid "Pick a color"
+msgstr "Izaberi boju"
+
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "S_un"
 msgstr "_Ned"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "Subota"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Sc_roll Month View by a week"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "Se_cond zone:"
+msgstr "Za:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#, fuzzy
+msgid "Select the calendars for alarm notification"
+msgstr "Servis za alarm obavijesti Evolution kalendara"
+
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Sh_ow a reminder"
 msgstr "Po_kaži podsjetnik"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#, fuzzy
+msgid "Show a _reminder"
+msgstr "Po_kaži podsjetnik"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Show week _numbers in date navigator"
 msgstr "Pokaži _brojeve sedmica u navigatoru datuma"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "Pokaži _brojeve sedmica u navigatoru datuma"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "Nedjelja"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "T_asks due today:"
 msgstr "Z_adaci za danas:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "T_hu"
 msgstr "_Čet"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Template:"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "Četvrtak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "Time _zone:"
 msgstr "Vremenska _zona:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Time format:"
 msgstr "Format vremena:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "W_eek starts:"
-msgstr "Početak _sedmice:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+msgid "Use s_ystem time zone"
+msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "Srijeda"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#, fuzzy
+msgid "Wee_k starts on:"
+msgstr "Početak _sedmice:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "Work days:"
 msgstr "Radni dani:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_12 hour (AM/PM)"
 msgstr "_12 satni (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_24 hour"
 msgstr "_24-satno"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "_Add URL"
-msgstr "_Dodaj adresu"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Ask for confirmation when deleting items"
 msgstr "Tr_aži potvrdu za brisanje podataka"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Compress weekends in month view"
 msgstr "_Skupi sedmice u mjesečni prikaz"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Day begins:"
 msgstr "Početak _dana:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Fri"
 msgstr "_Pet"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Hide completed tasks after"
 msgstr "_Sakrij ispunjene zadatke nakon "
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Mon"
 msgstr "_Pon"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Overdue tasks:"
 msgstr "_Neispunjeni zadaci:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Sat"
 msgstr "_Sub"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "_Show appointment end times in week and month views"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#, fuzzy
+msgid "_Show appointment end times in week and month view"
 msgstr ""
 "_Pokaži završetke zakazanih sastanaka u sedmičnim i mjesečnim prikazima"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "_Time divisions:"
 msgstr "Podjela _vremena:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
 msgid "_Tue"
 msgstr "_Uto"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
 msgid "_Wed"
 msgstr "_Sri"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
+msgid "before every anniversary/birthday"
+msgstr ""
+
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
 msgid "before every appointment"
 msgstr "prije svakog sastanka"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "option menu to choose reminder units"
-msgstr ""
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr "Vrsta:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "option menu to choose time units"
-msgstr ""
+#: ../calendar/gui/dialogs/calendar-setup.c:270
+#, fuzzy
+msgid "Cop_y calendar contents locally for offline operation"
+msgstr "Kopiraj sadržaj direktorija lokalno za offline rad"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:287
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 #, fuzzy
-msgid "Copy calendar contents locally for offline operation"
+msgid "Cop_y task list contents locally for offline operation"
 msgstr "Kopiraj sadržaj direktorija lokalno za offline rad"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 #, fuzzy
-msgid "Copy task list contents locally for offline operation"
+msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Kopiraj sadržaj direktorija lokalno za offline rad"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:341
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+#, fuzzy
+msgid "Colo_r:"
 msgstr "_Boja:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 #, fuzzy
-msgid "Tasks List"
+msgid "Task List"
 msgstr "Lista zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:447
+#: ../calendar/gui/dialogs/calendar-setup.c:390
+#, fuzzy
+msgid "Memo List"
+msgstr "Poruka"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 #, fuzzy
 msgid "Calendar Properties"
 msgstr "Grupa kalendara"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:515
+#: ../calendar/gui/dialogs/calendar-setup.c:475
+msgid "New Calendar"
+msgstr "Novi kalendar"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 #, fuzzy
 msgid "Task List Properties"
 msgstr "Grupa listi zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Dodaj kalendar"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Task List"
-msgstr "Dodaj listu zadataka"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
-msgid "Pick a color"
-msgstr "Izaberi boju"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "Dodaj _kalendar"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Task List"
-msgstr "Dodaj listu zadataka"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
-#: ../plugins/calendar-http/calendar-http.c:248
-#: ../plugins/calendar-weather/calendar-weather.c:548
-msgid "_Refresh:"
-msgstr "_Osvježi:"
+#: ../calendar/gui/dialogs/calendar-setup.c:531
+msgid "New Task List"
+msgstr "Nova lista zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../plugins/calendar-http/calendar-http.c:120
-msgid "_URL:"
-msgstr "_URL:"
+#: ../calendar/gui/dialogs/calendar-setup.c:587
+#, fuzzy
+msgid "Memo List Properties"
+msgstr "Grupa listi zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
-#: ../plugins/calendar-weather/calendar-weather.c:566
-msgid "weeks"
-msgstr "sedmice"
+#: ../calendar/gui/dialogs/calendar-setup.c:587
+#, fuzzy
+msgid "New Memo List"
+msgstr "Nova lista zadataka"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Ovaj događaj je obrisan."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Ovaj zadatak je obrisan."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
-msgid "This journal entry has been deleted."
-msgstr "Ovaj unos u dnevnik je obrisan."
+#: ../calendar/gui/dialogs/changed-comp.c:67
+#, fuzzy
+msgid "This memo has been deleted."
+msgstr "Ovaj događaj je obrisan."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Napravili ste izmjene. Da odbacim izmjene i zatvorim editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Niste napravili nikakve izmjene. Da zatvorim editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Ovaj događaj je mijenjan."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Ovaj zadatak je mijenjan."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This journal entry has been changed."
-msgstr "Ovaj unos u dnevnik je mijenjan."
+#: ../calendar/gui/dialogs/changed-comp.c:91
+#, fuzzy
+msgid "This memo has been changed."
+msgstr "Ovaj događaj je mijenjan."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Napravili ste izmjene. Da odbacim izmjene i ažuriram editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Niste napravili nikakve izmjene. Da ažuriram editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:464
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Greška pri provjeri: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
+#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2349
 msgid " to "
 msgstr " do "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2353
 msgid " (Completed "
 msgstr " (Završeno "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2355
 msgid "Completed "
 msgstr "Završeno "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2360
 msgid " (Due "
 msgstr " (Do "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2362
 msgid "Due "
 msgstr "Do "
 
-#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
-#, c-format
-msgid "Attached message - %s"
-msgstr ""
-
-#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:195
-#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
-#: ../composer/e-msg-composer.c:2846
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:428
-#: ../calendar/gui/e-calendar-table.c:1162
-#: ../calendar/gui/e-calendar-view.c:1535 ../composer/e-msg-composer.c:2911
-#: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
-msgid "_Copy"
-msgstr "_Kopiraj"
-
-#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
-#: ../mail/em-folder-tree.c:975 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
-msgid "_Move"
-msgstr ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
-#: ../mail/em-folder-tree.c:977 ../mail/message-list.c:1711
-msgid "Cancel _Drag"
-msgstr ""
+#: ../calendar/gui/dialogs/comp-editor.c:224
+#, fuzzy
+msgid "Could not save attachments"
+msgstr "Snimi sastanak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:774
+#: ../calendar/gui/dialogs/comp-editor.c:487
 msgid "Could not update object"
 msgstr "Nisam mogao ažurirati objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-msgid "_Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:1850
-#: ../calendar/gui/dialogs/comp-editor.c:1893
+#: ../calendar/gui/dialogs/comp-editor.c:582
 msgid "Edit Appointment"
 msgstr "Promijeni sastanak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1856
-#: ../calendar/gui/dialogs/comp-editor.c:1899
+#: ../calendar/gui/dialogs/comp-editor.c:589
 #, fuzzy, c-format
 msgid "Meeting - %s"
 msgstr "_Sastanak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1858
-#: ../calendar/gui/dialogs/comp-editor.c:1901
+#: ../calendar/gui/dialogs/comp-editor.c:591
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sastanak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1862
-#: ../calendar/gui/dialogs/comp-editor.c:1905
+#: ../calendar/gui/dialogs/comp-editor.c:597
 #, fuzzy, c-format
 msgid "Assigned Task - %s"
 msgstr "Dodijeli _zadatak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1864
-#: ../calendar/gui/dialogs/comp-editor.c:1907
+#: ../calendar/gui/dialogs/comp-editor.c:599
 #, c-format
 msgid "Task - %s"
 msgstr "Zadatak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1867
-#: ../calendar/gui/dialogs/comp-editor.c:1910
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Stavka dnevnika - %s"
+#: ../calendar/gui/dialogs/comp-editor.c:604
+#, fuzzy, c-format
+msgid "Memo - %s"
+msgstr "_Sastanak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1878
-#: ../calendar/gui/dialogs/comp-editor.c:1920
-msgid "No summary"
+#: ../calendar/gui/dialogs/comp-editor.c:620
+#, fuzzy
+msgid "No Summary"
 msgstr "Nema sažetka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2528
-#: ../calendar/gui/dialogs/comp-editor.c:2561
-#: ../calendar/gui/dialogs/comp-editor.c:2585
+#: ../calendar/gui/dialogs/comp-editor.c:762
+msgid "Keep original item?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+#, fuzzy
+msgid "Click here to close the current window"
+msgstr "* Kliknite ovdje da dodate kategoriju *"
+
+#: ../calendar/gui/dialogs/comp-editor.c:975
+msgid "Copy selected text to the clipboard"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:982
+msgid "Cut selected text to the clipboard"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:989
+msgid "Click here to view help available"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:996
+msgid "Paste text from the clipboard"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1017
+#, fuzzy
+msgid "Click here to save the current window"
+msgstr "Kliknite ovdje za dodavanje učesnika"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1024
+msgid "Select all text"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1031
+#, fuzzy
+msgid "_Classification"
+msgstr "Kla_sifikacija:"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1045
+#: ../mail/mail-signature-editor.c:209
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1052
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1059
+msgid "_Insert"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1066
+#, fuzzy
+msgid "_Options"
+msgstr "Opcije"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1073 ../mail/em-folder-tree.c:2106
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
+msgid "_View"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../composer/e-composer-actions.c:315
+msgid "_Attachment..."
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1085
+#, fuzzy
+msgid "Click here to attach a file"
+msgstr "Kliknite ovdje za dodavanje učesnika"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1093
+msgid "_Categories"
+msgstr "_Kategorije"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1095
+msgid "Toggles whether to display categories"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1101
+#, fuzzy
+msgid "Time _Zone"
+msgstr "Vremenska _zona:"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1103
+msgid "Toggles whether the time zone is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1112
+#, fuzzy
+msgid "Pu_blic"
+msgstr "Javno"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1114
+msgid "Classify as public"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1119
+#, fuzzy
+msgid "_Private"
+msgstr "Privatno"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1121
+msgid "Classify as private"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1126
+#, fuzzy
+msgid "_Confidential"
+msgstr "Povjerljivo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1128
+#, fuzzy
+msgid "Classify as confidential"
+msgstr "Povjerljivo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1136
+#, fuzzy
+msgid "R_ole Field"
+msgstr "Polje"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1138
+msgid "Toggles whether the Role field is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1144
+#, fuzzy
+msgid "_RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1146
+msgid "Toggles whether the RSVP field is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1152
+#, fuzzy
+msgid "_Status Field"
+msgstr "_Stanje:"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1154
+msgid "Toggles whether the Status field is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1160
+#, fuzzy
+msgid "_Type Field"
+msgstr "Polje"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1162
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1186
+#: ../composer/e-composer-private.c:67
+msgid "Recent _Documents"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1615
+#: ../composer/e-composer-actions.c:518
+msgid "Attach"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1670
+msgid "Save"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1924
+#: ../calendar/gui/dialogs/comp-editor.c:1973
+#: ../calendar/gui/dialogs/comp-editor.c:2833
 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"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2609
+#: ../calendar/gui/dialogs/comp-editor.c:2801 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:2862
 msgid "Unable to use current version!"
 msgstr "Ne mogu koristiti trenutnu verziju!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "Ne mogu otvoriti izvor"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "Ne mogu otvoriti odredište"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "Odredište je samo za čitanje"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-comp.c:205
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "Događaj nije mogao biti obrisan zbog 'corba' greške"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
 msgstr "Zadatak se ne može obrisati zbog 'corba' greške"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
-msgid "The journal entry could not be deleted due to a corba error"
-msgstr "Unos u dnevniku nije mogao biti obrisan zbog 'corba' greške"
+#: ../calendar/gui/dialogs/delete-error.c:61
+#, fuzzy
+msgid "The memo could not be deleted due to a corba error"
+msgstr "Unos nije mogao biti obrisan zbog 'corba' greške"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:64
 msgid "The item could not be deleted due to a corba error"
 msgstr "Unos nije mogao biti obrisan zbog 'corba' greške"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
 msgstr "Događaj nije mogao biti obrisan zbog nemogućnosti pristupa"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
 msgstr "Zadatak se ne može obrisati jer nemate potrebne ovlasti"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The journal entry could not be deleted because permission was denied"
-msgstr "Unos u dnevniku nije mogao biti obrisan zbog nemogućnosti pristupa"
+#: ../calendar/gui/dialogs/delete-error.c:77
+#, fuzzy
+msgid "The memo could not be deleted because permission was denied"
+msgstr "Unos nije mogao biti obrisan zbog nemogućnosti pristupa"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
 msgstr "Unos nije mogao biti obrisan zbog nemogućnosti pristupa"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
 msgstr "Događaj se ne može obrisati zbog greške"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The task could not be deleted due to an error"
 msgstr "Zbog greške je zadatak nemoguće izbrisati"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
-msgid "The journal entry could not be deleted due to an error"
-msgstr "Zbog greške je nemoguće obrisati stavku dnevnika"
+#: ../calendar/gui/dialogs/delete-error.c:93
+#, fuzzy
+msgid "The memo could not be deleted due to an error"
+msgstr "Zbog greške je stavku nemoguće obrisati"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
 msgstr "Zbog greške je stavku nemoguće obrisati"
 
@@ -5896,7 +5510,7 @@ msgid "Contacts..."
 msgstr "Kontakti..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To:"
 msgstr "Delegiraj za:"
 
@@ -5904,66 +5518,177 @@ msgstr "Delegiraj za:"
 msgid "Enter Delegate"
 msgstr "Unesi delegata"
 
-#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
-msgid "Appointment"
-msgstr "Sastanak"
+#: ../calendar/gui/dialogs/event-editor.c:202
+#, fuzzy
+msgid "_Alarms"
+msgstr "Alarmi"
 
-#: ../calendar/gui/dialogs/event-editor.c:150
-msgid "Recurrence"
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Click here to set or unset alarms for this event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#, fuzzy
+msgid "_Recurrence"
 msgstr "Ponavljanje"
 
-#: ../calendar/gui/dialogs/event-editor.c:164
-#: ../calendar/gui/dialogs/event-editor.c:248
-#: ../calendar/gui/dialogs/event-editor.c:422
-msgid "Scheduling"
-msgstr "Raspored"
+#: ../calendar/gui/dialogs/event-editor.c:211
+#, fuzzy
+msgid "Make this a recurring event"
+msgstr "Neka ova pojava bude _pokretna"
 
-#: ../calendar/gui/dialogs/event-editor.c:174
+#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:212
+#: ../widgets/misc/e-send-options.glade.h:18
 #, fuzzy
-msgid "Delegatees"
+msgid "Send Options"
+msgstr "Opcije"
+
+#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/task-editor.c:125
+msgid "Insert advanced send options"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:226
+#, fuzzy
+msgid "All _Day Event"
+msgstr "Novi cjelodnevni _događaj"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Toggles whether to have All Day Event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:234
+#, fuzzy
+msgid "Show Time as _Busy"
+msgstr "Pokaži vrijeme kao _zauzeto"
+
+#: ../calendar/gui/dialogs/event-editor.c:236
+msgid "Toggles whether to show time as busy"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:245
+#, fuzzy
+msgid "_Free/Busy"
+msgstr "Slobodan/zauzet:"
+
+#: ../calendar/gui/dialogs/event-editor.c:247
+#, fuzzy
+msgid "Query free / busy information for the attendees"
+msgstr "Slobodan/zauzet informacija (%s do %s)"
+
+#: ../calendar/gui/dialogs/event-editor.c:301
+#, fuzzy
+msgid "Appoint_ment"
+msgstr "Sastanak"
+
+#: ../calendar/gui/dialogs/event-page.c:748
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:752
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:764
+#: ../calendar/gui/dialogs/event-page.c:2769
+#, fuzzy
+msgid "This event has alarms"
+msgstr "Ovaj događaj je obrisan."
+
+#: ../calendar/gui/dialogs/event-page.c:827
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
+msgid "Or_ganizer:"
+msgstr "Or_ganizator:"
+
+#: ../calendar/gui/dialogs/event-page.c:874
+#, fuzzy
+msgid "_Delegatees"
 msgstr "Delegirano"
 
-#: ../calendar/gui/dialogs/event-editor.c:178
+#: ../calendar/gui/dialogs/event-page.c:876
 #, fuzzy
-msgid "Attendees"
+msgid "Atte_ndees"
 msgstr "Učesnik"
 
-#: ../calendar/gui/dialogs/event-editor.c:251
-#: ../calendar/gui/dialogs/event-editor.c:425
-msgid "Invitations"
-msgstr "Pozivnice"
-
-#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:1062
 msgid "Event with no start date"
 msgstr "Događaj bez datuma početka"
 
-#: ../calendar/gui/dialogs/event-page.c:734
+#: ../calendar/gui/dialogs/event-page.c:1065
 msgid "Event with no end date"
 msgstr "Događaj bez datuma završetka"
 
-#: ../calendar/gui/dialogs/event-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:556
+#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/memo-page.c:654
+#: ../calendar/gui/dialogs/task-page.c:830
 msgid "Start date is wrong"
 msgstr "Početni datum je pogrešan"
 
-#: ../calendar/gui/dialogs/event-page.c:910
+#: ../calendar/gui/dialogs/event-page.c:1246
 msgid "End date is wrong"
 msgstr "Završni datum je pogrešan"
 
-#: ../calendar/gui/dialogs/event-page.c:933
+#: ../calendar/gui/dialogs/event-page.c:1269
 msgid "Start time is wrong"
 msgstr "Početno vrijeme je pogrešno"
 
-#: ../calendar/gui/dialogs/event-page.c:940
+#: ../calendar/gui/dialogs/event-page.c:1276
 msgid "End time is wrong"
 msgstr "Završno vrijeme je pogrešno"
 
-#: ../calendar/gui/dialogs/event-page.c:1686
+#: ../calendar/gui/dialogs/event-page.c:1438
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:890
+msgid "The organizer selected no longer has an account."
+msgstr "Odabrani organizator više nema račun."
+
+#: ../calendar/gui/dialogs/event-page.c:1444
+#: ../calendar/gui/dialogs/memo-page.c:701
+#: ../calendar/gui/dialogs/task-page.c:896
+msgid "An organizer is required."
+msgstr "Potreban je organizator."
+
+#: ../calendar/gui/dialogs/event-page.c:1469
+#: ../calendar/gui/dialogs/task-page.c:920
+msgid "At least one attendee is required."
+msgstr "Nužna je najmanje jedna prisutna osoba."
+
+#: ../calendar/gui/dialogs/event-page.c:1912
+#: ../calendar/gui/dialogs/task-page.c:1219
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "_Ukloni"
+
+#: ../calendar/gui/dialogs/event-page.c:1913
+#: ../calendar/gui/dialogs/task-page.c:1220
+#, fuzzy
+msgid "_Add "
+msgstr "_Dodaj adresu"
+
+#: ../calendar/gui/dialogs/event-page.c:2639
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nije moguće otvoriti kalendar '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:1892
+#. Translators: This string is used when we are creating an Event
+#. (meeting or appointment)  on behalf of some other user
+#. Translators: This string is used when we are creating a Memo
+#. on behalf of some other user
+#. Translators: This string is used when we are creating a Task
+#. on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2683
+#: ../calendar/gui/dialogs/memo-page.c:910
+#: ../calendar/gui/dialogs/task-page.c:1825
+#, c-format
+msgid "You are acting on behalf of %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:2967
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -5971,7 +5696,7 @@ msgstr[0] "%d dan prije sastanka"
 msgstr[1] "%d dana prije sastanka"
 msgstr[2] "%d dana prije sastanka"
 
-#: ../calendar/gui/dialogs/event-page.c:1900
+#: ../calendar/gui/dialogs/event-page.c:2973
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -5979,376 +5704,306 @@ msgstr[0] "%d sat prije sastanka"
 msgstr[1] "%d sata prije sastanka"
 msgstr[2] "%d sata prije sastanka"
 
-#: ../calendar/gui/dialogs/event-page.c:1908
-#, c-format
-msgid "%d minute before appointement"
+#: ../calendar/gui/dialogs/event-page.c:2979
+#, fuzzy, c-format
+msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut prije sastanka"
 msgstr[1] "%d minuta prije sastanka"
 msgstr[2] "%d minuta prije sastanka"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "1 day before appointment"
-msgstr "1 dan prije sastanka"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "1 hour before appointment"
-msgstr "1 sat prije sastanka"
+#: ../calendar/gui/dialogs/event-page.c:2992
+#, fuzzy
+msgid "Customize"
+msgstr "_Prilagodi..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:4
-msgid "15 minutes before appointment"
-msgstr "15 minuta prije sastanka"
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+msgid ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
+msgstr ""
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "<b>Basics</b>"
-msgstr "<b>Osnove</b>"
+#, fuzzy
+msgid "Attendee_s..."
+msgstr "Učesnik"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:2
-msgid "<b>Date and Time</b>"
-msgstr "<b>Datum i vrijeme</b>"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/e-meeting-list-view.c:151
 #, fuzzy
-msgid "<b>Send Options</b>"
-msgstr "<b>Opcije</b>"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "A_ll day event"
-msgstr "Cje_lodnevni događaj"
+msgid "Attendees"
+msgstr "Učesnik"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Ad_vanced send options"
-msgstr ""
+#, fuzzy
+msgid "Custom Alarm:"
+msgstr "Proizvoljni zvuk alarma"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
-msgid "C_ustomize..."
-msgstr "_Prilagodi..."
-
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Ca_tegories..."
-msgstr "_Kategorije..."
-
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-msgid "Cale_ndar:"
-msgstr "Kale_ndar:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:13
-#: ../calendar/gui/dialogs/task-page.glade.h:7
-msgid "Classi_fication:"
-msgstr "Kla_sifikacija:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:360
-msgid "Confidential"
-msgstr "Povjerljivo"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:15
 #, fuzzy
 msgid "Event Description"
 msgstr "Opis"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-msgid "Locat_ion:"
-msgstr "Lo_kacija:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:359
-msgid "Private"
-msgstr "Privatno"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/task-page.glade.h:11
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:358
-msgid "Public"
-msgstr "Javno"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-msgid "Show time as _busy"
-msgstr "Pokaži vrijeme kao _zauzeto"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:20
-#: ../calendar/gui/dialogs/task-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Sažetak:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-msgid "This appointment has customized alarms"
-msgstr "Ovaj sastanak ima proizvoljne alarme"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:22
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Alarm"
 msgstr "_Alarm"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Opis:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../calendar/gui/e-meeting-time-sel.c:642
-msgid "_End time:"
-msgstr "_Krajnje vrijeme:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:25
-#: ../calendar/gui/e-meeting-time-sel.c:615
-msgid "_Start time:"
-msgstr "_Početno vrijeme:"
-
-#: ../calendar/gui/dialogs/meeting-page.c:303
-#, fuzzy
-msgid "<b>Dele_gatees</b>"
-msgstr "<b>Ponovi</b>"
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
+msgid "_Location:"
+msgstr "_Lokacija:"
 
-#: ../calendar/gui/dialogs/meeting-page.c:307
+#: ../calendar/gui/dialogs/event-page.glade.h:18
 #, fuzzy
-msgid "<b>From:</b>"
-msgstr "<b>Početak</b>"
-
-#. an empty string is the same as 'None'
-#. 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:313
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
-#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
-#: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-#: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
-#: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
-msgid "None"
-msgstr "Nijedan"
-
-#: ../calendar/gui/dialogs/meeting-page.c:461
-msgid "The organizer selected no longer has an account."
-msgstr "Odabrani organizator više nema račun."
-
-#: ../calendar/gui/dialogs/meeting-page.c:467
-msgid "An organizer is required."
-msgstr "Potreban je organizator."
-
-#: ../calendar/gui/dialogs/meeting-page.c:482
-msgid "At least one attendee is required."
-msgstr "Nužna je najmanje jedna prisutna osoba."
-
-#: ../calendar/gui/dialogs/meeting-page.c:884
-msgid "_Delegate To..."
-msgstr "_Delegiraj za..."
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-list-view.c:358
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Učesnik"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Kliknite ovdje za dodavanje učesnika"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Uobičajeno ime"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Delegirano od"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegirano za"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Jezik"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Član"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:386
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/dialogs/task-editor.c:147
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:394
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Status"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "<b>Att_endees</b>"
-msgstr "<b>Prisu_tni</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "C_hange Organizer"
-msgstr "Pro_mijeni organizatora"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-#: ../calendar/gui/e-meeting-time-sel.c:428
-msgid "Con_tacts..."
-msgstr "Ko_ntakti..."
+msgid "_Time:"
+msgstr "_Rok:"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "Or_ganizer:"
-msgstr "Or_ganizator:"
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../mail/mail-config.glade.h:192 ../mail/mail-dialogs.glade.h:21
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:49
+msgid ""
+"a\n"
+"b"
+msgstr ""
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:21
 #, fuzzy
-msgid "Organizer"
-msgstr "Organizator:"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizator:"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
-msgid "<b>Calendar options</b>"
-msgstr "<b>Opcije kalendara</b>"
+msgid ""
+"for\n"
+"until"
+msgstr "do"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
-msgid "Add New Calendar"
-msgstr "Dodaj novi kalendar"
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
+#, fuzzy
+msgid "Memo"
+msgstr "Po"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
-msgid "Calendar Group"
-msgstr "Grupa kalendara"
+#: ../calendar/gui/dialogs/memo-page.c:347
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr ""
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
-msgid "Calendar Location"
-msgstr "Lokacija kalendara"
+#: ../calendar/gui/dialogs/memo-page.c:351
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr ""
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:6
-msgid "Calendar Name"
-msgstr "Naziv kalendara"
+#: ../calendar/gui/dialogs/memo-page.c:871
+#, fuzzy, c-format
+msgid "Unable to open memos in '%s'."
+msgstr "Nije moguće otvaranje zadataka u '%s'."
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
-msgid "<b>Task List Options</b>"
-msgstr "<b>Opcije liste zadataka</b>"
+#: ../calendar/gui/dialogs/memo-page.c:1031 ../mail/em-format-html.c:1566
+#: ../mail/em-format-html.c:1624 ../mail/em-format-html.c:1649
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
+#: ../mail/em-mailer-prefs.c:78 ../mail/message-list.etspec.h:20
+msgid "To"
+msgstr ""
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
-msgid "Add New Task List"
-msgstr "Dodaj novu listu zadataka"
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr "_Početni datum:"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
-msgid "Task List Group"
-msgstr "Grupa listi zadataka"
+#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#, fuzzy
+msgid "T_o:"
+msgstr "Vrh:"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:5
-msgid "Task List Name"
-msgstr "Naziv liste zadataka"
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Group:"
+msgstr "_Grupa:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
-msgid "You are modifying a recurring event, what would you like to modify?"
+#: ../calendar/gui/dialogs/recur-comp.c:53
+#, fuzzy, c-format
+msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Mijenjate povratni događaj, šta želite promijeniti?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
-#, fuzzy
-msgid "You are delegating a recurring event, what would like to delegate?"
+#: ../calendar/gui/dialogs/recur-comp.c:55
+#, fuzzy, c-format
+msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Mijenjate povratni događaj, šta želite promijeniti?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring task, what would you like to modify?"
+#: ../calendar/gui/dialogs/recur-comp.c:59
+#, fuzzy, c-format
+msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Mijenjate povratni zadatak, šta želite promijeniti?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "Mijenjate povratni unos u dnevnik, šta želite promijeniti?"
+#: ../calendar/gui/dialogs/recur-comp.c:63
+#, fuzzy, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "Mijenjate povratni događaj, šta želite promijeniti?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "Samo ova pojava"
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "Ova i prethodne pojave"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "Ova i buduće pojave"
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Sve pojave"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:496
+#: ../calendar/gui/dialogs/recurrence-page.c:563
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Ovaj sastanak sadrži povratne podatke koje Evolution ne može mijenjati."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:817
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Datum povratka nije ispravan"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "na"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:988
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "prvoj"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:989
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "drugoj"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "trećoj"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:991
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "četvrtoj"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#, fuzzy
+msgid "fifth"
+msgstr "Širina"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "posljednjoj"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1015
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
+#. * (dropdown menu options are in [square brackets]).
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Drugi datum"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
+msgid "1st to 10th"
+msgstr ""
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
+msgid "11th to 20th"
+msgstr ""
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+msgid "21st to 31st"
+msgstr ""
+
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "dan"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1180
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
+#. * (dropdown menu options are in [square brackets])."
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "na"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1369
+#: ../calendar/gui/dialogs/recurrence-page.c:1410
 msgid "occurrences"
 msgstr "pojave"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2325
+#: ../calendar/gui/dialogs/recurrence-page.c:2105
+msgid "Add exception"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2146
+msgid "Could not get a selection to modify."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
+msgid "Modify exception"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2196
+#, fuzzy
+msgid "Could not get a selection to delete."
+msgstr "Nisam mogao ažurirati objekt"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2320
 msgid "Date/Time"
 msgstr "Datum/vrijeme"
 
@@ -6357,7 +6012,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Izuzeci</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
 msgid "<b>Preview</b>"
 msgstr "<b>Pregled</b>"
 
@@ -6365,44 +6020,49 @@ msgstr "<b>Pregled</b>"
 msgid "<b>Recurrence</b>"
 msgstr "<b>Ponavljanje</b>"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:4
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Every"
 msgstr "Svaki"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "This appointment rec_urs"
 msgstr "Ovaj sastanak se po_navlja"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "for"
-msgstr "za"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "forever"
-msgstr "uvijek"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "month(s)"
-msgstr "mjesec(a/i)"
-
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "until"
-msgstr "do"
+msgid ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
+msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
-msgid "week(s)"
-msgstr "sedmicu(e/a)"
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid ""
+"for\n"
+"until\n"
+"forever"
+msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "year(s)"
-msgstr "godinu(e/a)"
+#: ../calendar/gui/dialogs/send-comp.c:160
+msgid "Send my alarms with this event"
+msgstr ""
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/send-comp.c:162
+msgid "Notify new attendees _only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.c:376
+#: ../calendar/gui/dialogs/task-details-page.c:396
 msgid "Completed date is wrong"
 msgstr "Datum završetka je pogrešan"
 
-#: ../calendar/gui/dialogs/task-details-page.c:522
+#: ../calendar/gui/dialogs/task-details-page.c:481
 #, fuzzy
 msgid "Web Page"
 msgstr "Web stranica:"
@@ -6416,162 +6076,113 @@ msgstr "<span weight=\"bold\">Razno\t</span>"
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">Status</span>"
 
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-cal-model-tasks.c:346
-#: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/e-itip-control.c:898
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
-msgid "Completed"
-msgstr "Završeno"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1008
-msgid "High"
-msgstr "Visok"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:226
-#: ../calendar/gui/e-cal-model-tasks.c:344
-#: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:454 ../calendar/gui/print.c:2358
-msgid "In Progress"
-msgstr "Izvodi se"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
+msgstr ""
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
-msgid "Low"
-msgstr "Nisko"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:381
-#: ../mail/message-list.c:1007
-msgid "Normal"
-msgstr "Obično"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:342
-#: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:453 ../calendar/gui/print.c:2355
-msgid "Not Started"
-msgstr "Nije započelo"
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Canceled"
+msgstr ""
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "P_ercent complete:"
 msgstr "P_rocenat završenog:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
-#: ../calendar/gui/e-calendar-table.c:383
-msgid "Undefined"
-msgstr "Neodređeno"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#, fuzzy
+msgid "Stat_us:"
+msgstr "Stanje:"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "_Datum završetka:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-msgid "_Status:"
-msgstr "_Stanje:"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "_Web stranica:"
 
-#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
-msgid "Task"
-msgstr "Zadatak"
-
-#: ../calendar/gui/dialogs/task-editor.c:162
-#: ../calendar/gui/dialogs/task-editor.c:224
-#: ../calendar/gui/dialogs/task-editor.c:378
-msgid "Assignment"
-msgstr "Zadatak"
-
-#: ../calendar/gui/dialogs/task-page.c:529
-msgid "Due date is wrong"
-msgstr "Datum za završetak je pogrešan"
-
-#: ../calendar/gui/dialogs/task-page.c:873
-#, c-format
-msgid "Unable to open tasks in '%s'."
-msgstr "Nije moguće otvaranje zadataka u '%s'."
-
-#: ../calendar/gui/dialogs/task-page.glade.h:9
-msgid "D_escription:"
-msgstr "_Opis:"
+#: ../calendar/gui/dialogs/task-editor.c:113
+#, fuzzy
+msgid "_Status Details"
+msgstr "Stanje: %s"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:12
-msgid "Sta_rt date:"
-msgstr "_Početni datum:"
+#: ../calendar/gui/dialogs/task-editor.c:115
+msgid "Click to change or view the status details of the task"
+msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.glade.h:14
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:371
 #, fuzzy
-msgid "Task Description"
-msgstr "Opis"
-
-#: ../calendar/gui/dialogs/task-page.glade.h:15
-msgid "_Due date:"
-msgstr "_Datum krajnjeg roka:"
+msgid "_Send Options"
+msgstr "Opcije"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:16
-msgid "_Group:"
-msgstr "_Grupa:"
+#: ../calendar/gui/dialogs/task-editor.c:317
+msgid "_Task"
+msgstr "_Zadatak"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>Kalendari za slobodno/zauzeto</b>"
+#: ../calendar/gui/dialogs/task-editor.c:320
+#, fuzzy
+msgid "Task Details"
+msgstr "Detalji"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "<b>Publishing Frequency</b>"
-msgstr "<b>Učestalost objavljivanja</b>"
+#: ../calendar/gui/dialogs/task-page.c:336
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr ""
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "<b>Publishing _Location</b>"
-msgstr "<b>_Mjesto objavljivanja</b>"
+#: ../calendar/gui/dialogs/task-page.c:340
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr ""
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
-msgid "Free/Busy Publishing Settings"
-msgstr "Objava stanja slobodan/zauzet"
+msgid "Organi_zer:"
+msgstr "Organizator:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "_Daily"
-msgstr "_Dnevno"
+#: ../calendar/gui/dialogs/task-page.c:803
+msgid "Due date is wrong"
+msgstr "Datum za završetak je pogrešan"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "_Manual"
-msgstr "_Ručno"
+#: ../calendar/gui/dialogs/task-page.c:1782
+#, c-format
+msgid "Unable to open tasks in '%s'."
+msgstr "Nije moguće otvaranje zadataka u '%s'."
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "_Password:"
-msgstr "Ši_fra:"
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+#, fuzzy
+msgid "Atte_ndees..."
+msgstr "Učesnik"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "_Remember password"
-msgstr "_Zapamti šifru"
+#: ../calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "Categor_ies..."
+msgstr "_Kategorije..."
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "_Username:"
-msgstr "_Korisničko ime:"
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "D_ue date:"
+msgstr "_Datum krajnjeg roka:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "_Weekly"
-msgstr "_Sedmično"
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+#, fuzzy
+msgid "Time zone:"
+msgstr "Vremenska _zona:"
 
-#: ../calendar/gui/e-alarm-list.c:395
+#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6579,6 +6190,7 @@ msgstr[0] "%d dan"
 msgstr[1] "%d dana"
 msgstr[2] "%d dana"
 
+#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
@@ -6587,30 +6199,6 @@ msgstr[0] "%d sedmica"
 msgstr[1] "%d sedmice"
 msgstr[2] "%d sedmica"
 
-#: ../calendar/gui/e-alarm-list.c:405
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d sat"
-msgstr[1] "%d sata"
-msgstr[2] "%d sati"
-
-#: ../calendar/gui/e-alarm-list.c:410
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minut"
-msgstr[1] "%d minuta"
-msgstr[2] "%d minuta"
-
-#: ../calendar/gui/e-alarm-list.c:415
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekunda"
-msgstr[1] "%d sekunde"
-msgstr[2] "   sekundi"
-
 #: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Izvršit će se nepoznata akcija"
@@ -6636,98 +6224,202 @@ msgstr "%s %s nakon početka sastanka"
 msgid "%s at the start of the appointment"
 msgstr "%s na početku sastanka"
 
-#: ../calendar/gui/e-alarm-list.c:497
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s prije kraja sastanka"
 
-#: ../calendar/gui/e-alarm-list.c:500
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s nakon završetka sastanka"
 
-#: ../calendar/gui/e-alarm-list.c:505
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s na kraju sastanka"
 
-#: ../calendar/gui/e-alarm-list.c:527
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
+#: ../calendar/gui/e-alarm-list.c:535
 #, c-format
 msgid "%s at %s"
 msgstr "%s kod %s"
 
-#: ../calendar/gui/e-alarm-list.c:533
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound". "Trigger types" are absolute or relative dates
+#: ../calendar/gui/e-alarm-list.c:543
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretača"
 
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2703
+#: ../calendar/gui/e-attachment-handler-calendar.c:258
+#, fuzzy
+msgid "I_mport"
+msgstr "Uvezi..."
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:340
+#, fuzzy
+msgid "Select a Calendar"
+msgstr "Novi kalendar"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:367
+#, fuzzy
+msgid "Select a Task List"
+msgstr "Nova lista zadataka"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:377
+#, fuzzy
+msgid "I_mport to Calendar"
+msgstr "Ko_piraj u kalendar..."
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:384
+msgid "I_mport to Tasks"
+msgstr ""
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:68
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3210
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknite za otvaranje %s"
 
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
+#: ../calendar/gui/e-cal-component-memo-preview.c:127
+#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:859
 msgid "Untitled"
 msgstr "Bez naslova"
 
-#: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1110
-#: ../calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Sažetak:"
-
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-cal-component-memo-preview.c:178
+#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:220
 msgid "Start Date:"
 msgstr "Početni datum"
 
-#: ../calendar/gui/e-cal-component-preview.c:215
+#: ../calendar/gui/e-cal-component-memo-preview.c:191
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
+msgid "Description:"
+msgstr "Opis:"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:309
+msgid "Web Page:"
+msgstr "Web stranica:"
+
+#: ../calendar/gui/e-cal-component-preview.c:202
+#: ../calendar/gui/e-itip-control.c:1154
+#: ../calendar/gui/e-itip-control.glade.h:9
+msgid "Summary:"
+msgstr "Sažetak:"
+
+#: ../calendar/gui/e-cal-component-preview.c:231
 msgid "Due Date:"
 msgstr "Datum krajnjeg roka:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1134
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
-#: ../plugins/itip-formatter/itip-view.c:909
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-itip-control.c:1178
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
 msgstr "Stanje:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:242
+#: ../calendar/gui/e-cal-model-tasks.c:359
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-cal-model-tasks.c:752
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2542
+msgid "In Progress"
+msgstr "Izvodi se"
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-model-tasks.c:361
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/print.c:2545 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Completed"
+msgstr "Završeno"
+
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model-tasks.c:357
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-calendar-table.c:232
+#: ../calendar/gui/e-calendar-table.c:658 ../calendar/gui/print.c:2539
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "Nije započelo"
+
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: ../calendar/gui/e-cal-component-preview.c:299
-msgid "Web Page:"
-msgstr "Web stranica:"
+#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-calendar-table.c:585 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
+msgid "High"
+msgstr "Visok"
+
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-model.c:1076 ../calendar/gui/e-calendar-table.c:586
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
+msgid "Normal"
+msgstr "Obično"
+
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-calendar-table.c:587 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
+msgid "Low"
+msgstr "Nisko"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:362
+#, fuzzy
+msgid "Created"
+msgstr "Završeno"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "End Date"
 msgstr "Završni datum"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+#, fuzzy
+msgid "Last modified"
+msgstr "Model"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Datum početka"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
-msgid "Summary"
-msgstr "Sažetak"
-
-#: ../calendar/gui/e-cal-model-calendar.c:180
-#: ../calendar/gui/e-calendar-table.c:432
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:637
 msgid "Free"
 msgstr "Slobodno"
 
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:433
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Zauzeto"
 
-#: ../calendar/gui/e-cal-model-tasks.c:607
+#: ../calendar/gui/e-cal-model-tasks.c:625
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6737,171 +6429,207 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
-#: ../calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/e-meeting-store.c:742
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Da"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:163
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ne"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
-#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1652
-#: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:659
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../calendar/gui/e-cal-model.c:372 ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
+#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1339
+#: ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2233
+#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:1078
 msgid "Recurring"
 msgstr "Ponavljajući"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:1080
 msgid "Assigned"
 msgstr "Dodijeljeno"
 
-#: ../calendar/gui/e-calendar-table.c:402
+#: ../calendar/gui/e-calendar-table.c:335
+#, fuzzy
+msgid "* No Summary *"
+msgstr "Nema sažetka"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:371
+#: ../calendar/gui/e-calendar-view.c:2429
+#, fuzzy, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organizator:"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2433
+#, fuzzy, c-format
+msgid "Organizer: %s"
+msgstr "Organizator:"
+
+#: ../calendar/gui/e-calendar-table.c:405
+#, fuzzy
+msgid "Start: "
+msgstr "Počinje"
+
+#: ../calendar/gui/e-calendar-table.c:417
+#, fuzzy
+msgid "Due: "
+msgstr "Do "
+
+#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "Neodređeno"
+
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:403
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:617
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:514
-#, fuzzy
-msgid "Task Table"
-msgstr "Ažuriranje zadatka"
-
-#: ../calendar/gui/e-calendar-table.c:692
-#: ../calendar/gui/e-calendar-view.c:661
+#: ../calendar/gui/e-calendar-table.c:897
+#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:449
 msgid "Deleting selected objects"
 msgstr "Brišem odabrane objekte"
 
-#: ../calendar/gui/e-calendar-table.c:871
-#: ../calendar/gui/e-calendar-view.c:789
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:654
 msgid "Updating objects"
 msgstr "Unosim promjene u objekte"
 
-#: ../calendar/gui/e-calendar-table.c:1012
-#: ../calendar/gui/e-calendar-view.c:1105 ../composer/e-msg-composer.c:1243
+#: ../calendar/gui/e-calendar-table.c:1364
+#: ../calendar/gui/e-calendar-view.c:1333 ../calendar/gui/e-memo-table.c:828
+#: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "Snimi kao..."
 
-#: ../calendar/gui/e-calendar-table.c:1155
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1789
+#, fuzzy
+msgid "New _Task"
+msgstr "Novi zadatak"
+
+#: ../calendar/gui/e-calendar-table.c:1592 ../calendar/gui/e-memo-table.c:933
 msgid "Open _Web Page"
 msgstr "Otvori _web stranicu"
 
-#: ../calendar/gui/e-calendar-table.c:1156
-#: ../calendar/gui/e-calendar-view.c:1529 ../mail/em-folder-view.c:1045
-#: ../mail/em-popup.c:541 ../mail/em-popup.c:552
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-view.c:1807 ../calendar/gui/e-memo-table.c:934
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
 msgid "_Save As..."
 msgstr "_Snimi kao..."
 
-#: ../calendar/gui/e-calendar-table.c:1157
-#: ../calendar/gui/e-calendar-view.c:1509
-#: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
-msgid "_Print..."
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1792 ../calendar/gui/e-memo-table.c:935
+#, fuzzy
+msgid "P_rint..."
 msgstr "_Štampaj..."
 
-#: ../calendar/gui/e-calendar-table.c:1161
-#: ../calendar/gui/e-calendar-view.c:1534 ../ui/evolution-addressbook.xml.h:1
-#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1598
+#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:939
+#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "I_zreži"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:1512
-#: ../calendar/gui/e-calendar-view.c:1536 ../ui/evolution-addressbook.xml.h:38
-#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
-#: ../ui/evolution-tasks.xml.h:26
+#: ../calendar/gui/e-calendar-table.c:1600
+#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:941
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Umetni"
 
-#: ../calendar/gui/e-calendar-table.c:1167 ../ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/e-calendar-table.c:1604 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Dodijeli zadatak"
 
-#: ../calendar/gui/e-calendar-table.c:1168 ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1605 ../calendar/gui/e-memo-table.c:945
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Proslijedi kao iCalendar "
 
-#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark as Complete"
 msgstr "_Obilježi kao izvršeno "
 
-#: ../calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-table.c:1607
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Obilježi odabrane zadatke kao izvršene "
 
-#. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2043
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-tasks.xml.h:22
-msgid "_Delete"
-msgstr "_Izbriši"
+#: ../calendar/gui/e-calendar-table.c:1608
+#, fuzzy
+msgid "_Mark as Incomplete"
+msgstr "_Obilježi kao izvršeno "
+
+#: ../calendar/gui/e-calendar-table.c:1609
+#, fuzzy
+msgid "_Mark Selected Tasks as Incomplete"
+msgstr "_Obilježi odabrane zadatke kao izvršene "
 
-#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-calendar-table.c:1614
 msgid "_Delete Selected Tasks"
 msgstr "_Izbriši odabrane zadatke"
 
-#: ../calendar/gui/e-calendar-table.c:1326
+#: ../calendar/gui/e-calendar-table.c:1849
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Kliknite ovdje za dodavanje zadatka"
@@ -6911,7 +6639,7 @@ msgstr "Kliknite ovdje za dodavanje zadatka"
 msgid "% Complete"
 msgstr "% gotovo"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:617
+#: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "Završeno"
 
@@ -6919,158 +6647,229 @@ msgstr "Završeno"
 msgid "Completion date"
 msgstr "Datum dovršetka"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
 msgstr "Datum krajnjeg roka"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Priority"
 msgstr "Prioritet"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 msgid "Start date"
 msgstr "Datum početka"
 
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-msgid "Task sort"
-msgstr "Razvrstani zadaci"
+#: ../calendar/gui/e-calendar-view.c:2337
+#: ../calendar/gui/e-meeting-list-view.c:601
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Status"
 
-#: ../calendar/gui/e-calendar-view.c:1231
+#: ../calendar/gui/e-calendar-view.c:1478
 msgid "Moving items"
 msgstr "Premještam stavke"
 
-#: ../calendar/gui/e-calendar-view.c:1233
+#: ../calendar/gui/e-calendar-view.c:1480
 msgid "Copying items"
 msgstr "Kopiram stavke"
 
-#: ../calendar/gui/e-calendar-view.c:1503
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Appointment..."
 msgstr "Novi _sastanak..."
 
-#: ../calendar/gui/e-calendar-view.c:1504
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "New All Day _Event"
 msgstr "Novi cjelodnevni _događaj"
 
-#: ../calendar/gui/e-calendar-view.c:1506
-msgid "New Task"
-msgstr "Novi zadatak"
+#: ../calendar/gui/e-calendar-view.c:1788
+#, fuzzy
+msgid "New _Meeting"
+msgstr "Novi sastanak"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1516
-msgid "Current View"
-msgstr "Trenutni pogled"
+#: ../calendar/gui/e-calendar-view.c:1799
+msgid "_Current View"
+msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1518 ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
+#: ../calendar/gui/e-calendar-view.c:1801
+#, fuzzy
+msgid "Select T_oday"
 msgstr "Izaberi _današnji dan"
 
-#: ../calendar/gui/e-calendar-view.c:1519
+#: ../calendar/gui/e-calendar-view.c:1802
 msgid "_Select Date..."
 msgstr "_Izaberi datum..."
 
-#. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1524 ../ui/evolution-calendar.xml.h:45
-msgid "_Publish Free/Busy Information"
-msgstr "_Objavi informaciju za slobodan/zauzet"
+#: ../calendar/gui/e-calendar-view.c:1808
+#, fuzzy
+msgid "Pri_nt..."
+msgstr "_Štampaj..."
 
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1818
 msgid "Cop_y to Calendar..."
 msgstr "Ko_piraj u kalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1541
+#: ../calendar/gui/e-calendar-view.c:1819
 msgid "Mo_ve to Calendar..."
 msgstr "_Premjesti u kalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1542
+#: ../calendar/gui/e-calendar-view.c:1820
 #, fuzzy
 msgid "_Delegate Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: ../calendar/gui/e-calendar-view.c:1543
+#: ../calendar/gui/e-calendar-view.c:1821
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: ../calendar/gui/e-calendar-view.c:1544
+#: ../calendar/gui/e-calendar-view.c:1822
 msgid "_Forward as iCalendar..."
 msgstr "_Proslijedi kao iCalendar... "
 
-#: ../calendar/gui/e-calendar-view.c:1549
+#: ../calendar/gui/e-calendar-view.c:1823
+#, fuzzy
+msgid "_Reply"
+msgstr "Odgovor na zadatak"
+
+#: ../calendar/gui/e-calendar-view.c:1824
+#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
+msgid "Reply to _All"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1829
 msgid "Make this Occurrence _Movable"
 msgstr "Neka ova pojava bude _pokretna"
 
-#: ../calendar/gui/e-calendar-view.c:1550
+#: ../calendar/gui/e-calendar-view.c:1830 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: ../calendar/gui/e-calendar-view.c:1551
+#: ../calendar/gui/e-calendar-view.c:1831
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
+#: ../calendar/gui/e-calendar-view.c:2284
+#: ../calendar/gui/e-itip-control.c:1183
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../plugins/itip-formatter/itip-formatter.c:2221
+msgid "Accepted"
+msgstr "Prihvaćeno"
+
+#: ../calendar/gui/e-calendar-view.c:2285
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../plugins/itip-formatter/itip-formatter.c:2227
+msgid "Declined"
+msgstr "Odbijeno"
+
+#: ../calendar/gui/e-calendar-view.c:2286
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-time-sel.c:390
+msgid "Tentative"
+msgstr "Okvirno"
+
+#: ../calendar/gui/e-calendar-view.c:2287
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../plugins/itip-formatter/itip-formatter.c:2230
+msgid "Delegated"
+msgstr "Delegirano"
+
+#: ../calendar/gui/e-calendar-view.c:2288
+#, fuzzy
+msgid "Needs action"
+msgstr "Zahtjeva akciju"
+
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:2449 ../calendar/gui/print.c:2501
+#, fuzzy, c-format
+msgid "Location: %s"
+msgstr "Lokacija:"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:2480
+#, fuzzy, c-format
+msgid "Time: %s %s"
+msgstr "Dnevni pregled"
+
 #. 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:115 ../e-util/e-time-utils.c:180
-#: ../e-util/e-time-utils.c:393
+#: ../calendar/gui/e-cell-date-edit-text.c:102
 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:118 ../e-util/e-time-utils.c:175
-#: ../e-util/e-time-utils.c:402
+#: ../calendar/gui/e-cell-date-edit-text.c:105
 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:123
-#, c-format
+#: ../calendar/gui/e-cell-date-edit-text.c:113
+#, fuzzy, c-format
 msgid ""
 "The date must be entered in the format: \n"
-"\n"
 "%s"
 msgstr ""
 "Datum morate unijeti u formatu: \n"
 "\n"
 "%s"
 
-#: ../calendar/gui/e-day-view-time-item.c:553
+#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
+#. * to change the length of the time division in the calendar day view, e.g.
+#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
+#.
+#: ../calendar/gui/e-day-view-time-item.c:747
 #, c-format
 msgid "%02i minute divisions"
 msgstr "razmaci od %02i minuta"
 
+#: ../calendar/gui/e-day-view-time-item.c:768
+msgid "Show the second time zone"
+msgstr ""
+
 #. 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:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
+#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1576
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
-#: ../calendar/gui/print.c:841
+#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:825
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
-#: ../calendar/gui/print.c:843
+#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:827
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:763
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2309
+#, fuzzy, c-format
+msgid "Week %d"
+msgstr "Sedmični pregled"
+
+#: ../calendar/gui/e-itip-control.c:758
 msgid "Yes. (Complex Recurrence)"
 msgstr "Da. (Složeni povratak)"
 
-#: ../calendar/gui/e-itip-control.c:774
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7078,7 +6877,7 @@ msgstr[0] "Svaki %d dan"
 msgstr[1] "Svaka %d dana"
 msgstr[2] "Svakih %d dana"
 
-#: ../calendar/gui/e-itip-control.c:779
+#: ../calendar/gui/e-itip-control.c:788
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -7086,29 +6885,30 @@ msgstr[0] "Svake %d sedmice"
 msgstr[1] "Svake %d sedmice"
 msgstr[2] "Svakih %d sedmica"
 
-#: ../calendar/gui/e-itip-control.c:781
-#, c-format
+#: ../calendar/gui/e-itip-control.c:795
+#, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Svake %d sedmice u "
 msgstr[1] "Svake %d sedmice u "
 msgstr[2] "                  u"
 
-#: ../calendar/gui/e-itip-control.c:789
+#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
+#: ../calendar/gui/e-itip-control.c:806
 msgid " and "
 msgstr " i"
 
-#: ../calendar/gui/e-itip-control.c:796
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "The %s day of "
 msgstr "%s dan "
 
-#: ../calendar/gui/e-itip-control.c:809
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:842
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7116,481 +6916,461 @@ msgstr[0] "svaki %d mjesec"
 msgstr[1] "svaka %d mjeseca"
 msgstr[2] "svakih %d mjeseci"
 
-#: ../calendar/gui/e-itip-control.c:820
-#, c-format
+#: ../calendar/gui/e-itip-control.c:854
+#, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Svake %d godine"
 msgstr[1] "Svake %d godine"
 msgstr[2] "S         godina"
 
-#: ../calendar/gui/e-itip-control.c:831
-#, c-format
+#: ../calendar/gui/e-itip-control.c:867
+#, fuzzy, c-format
 msgid "a total of %d time"
-msgid_plural " a total of %d times"
+msgid_plural "a total of %d times"
 msgstr[0] "ukupno %d put"
 msgstr[1] "ukupno %d puta"
 msgstr[2] "ukupno %d puta"
 
-#: ../calendar/gui/e-itip-control.c:840
+#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
+#: ../calendar/gui/e-itip-control.c:878
 msgid ", ending on "
 msgstr ", završavajući sa "
 
-#: ../calendar/gui/e-itip-control.c:864
+#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
+#: ../calendar/gui/e-itip-control.c:900
 msgid "Starts"
 msgstr "Počinje"
 
-#: ../calendar/gui/e-itip-control.c:877
+#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
+#: ../calendar/gui/e-itip-control.c:914
 msgid "Ends"
 msgstr "Završava"
 
-#: ../calendar/gui/e-itip-control.c:911
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../calendar/gui/e-itip-control.c:954
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Due"
 msgstr "Rok"
 
-#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
+#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
 msgid "iCalendar Information"
 msgstr "iCalendar informacije"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:968
+#: ../calendar/gui/e-itip-control.c:1012
 msgid "iCalendar Error"
 msgstr "Greška iCalendara"
 
-#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
-#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
-#: ../plugins/itip-formatter/itip-view.c:338
-#: ../plugins/itip-formatter/itip-view.c:339
-#: ../plugins/itip-formatter/itip-view.c:406
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
+#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
 msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1091
+#: ../calendar/gui/e-itip-control.c:1135
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Provjerite sljedeće podatke, te odaberite akciju iz donjeg menija."
 
-#: ../calendar/gui/e-itip-control.c:1139
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:548
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-msgid "Accepted"
-msgstr "Prihvaćeno"
-
-#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
-#: ../plugins/itip-formatter/itip-formatter.c:1643
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
 
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
-#: ../plugins/itip-formatter/itip-formatter.c:1646
-msgid "Declined"
-msgstr "Odbijeno"
-
-#: ../calendar/gui/e-itip-control.c:1231
+#: ../calendar/gui/e-itip-control.c:1274
+#, fuzzy
 msgid ""
-"The meeting has been cancelled, however it could not be found in your "
+"The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "Sastanak je otkazan, međutim, ne može se naći u vašim rokovnicima"
 
-#: ../calendar/gui/e-itip-control.c:1233
+#: ../calendar/gui/e-itip-control.c:1276
+#, fuzzy
 msgid ""
-"The task has been cancelled, however it could not be found in your task lists"
+"The task has been canceled, however it could not be found in your task lists"
 msgstr "Zadatak je otkazan, međutim, ne može se naći u vašim listama zadataka"
 
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> je objavio podatke o sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1313
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Information"
 msgstr "Informacije o sastanku"
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1360
 #, 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:1321
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> traži da budete prisutni na sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1322
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Proposal"
 msgstr "Prijedlog za sastanak"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1328
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
+#: ../calendar/gui/e-itip-control.c:1369
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> želi dodati postojećem sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1329
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Update"
 msgstr "Ažuriranje sastanka"
 
-#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> želi dobiti posljednje podatke o sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1334
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update Request"
 msgstr "Zahtjev za nove podatke o sastanku"
 
-#: ../calendar/gui/e-itip-control.c:1341
+#: ../calendar/gui/e-itip-control.c:1382
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> je odgovorio na zahtjev o sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-itip-control.c:1383
 msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
-#: ../calendar/gui/e-itip-control.c:1349
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
+#: ../calendar/gui/e-itip-control.c:1390
+#, fuzzy, c-format
+msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> je otkazo sastanak."
 
-#: ../calendar/gui/e-itip-control.c:1350
-msgid "Meeting Cancellation"
+#: ../calendar/gui/e-itip-control.c:1391
+#, fuzzy
+msgid "Meeting Cancelation"
 msgstr "Otkazivanje sastanka"
 
-#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1401 ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> je poslao nerazumljivu poruku."
 
-#: ../calendar/gui/e-itip-control.c:1361
+#: ../calendar/gui/e-itip-control.c:1402
 msgid "Bad Meeting Message"
 msgstr "Neispravna poruka o sastanku"
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> je objavio podatke o zadatku."
 
-#: ../calendar/gui/e-itip-control.c:1389
+#: ../calendar/gui/e-itip-control.c:1430
 msgid "Task Information"
 msgstr "Informacija o zadatku"
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1437
 #, 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:1398
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> traži da izvršite zadatak."
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Proposal"
 msgstr "Prijedlog zadatka"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1405
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
+#: ../calendar/gui/e-itip-control.c:1446
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> želi dodati postojećem zadatku."
 
-#: ../calendar/gui/e-itip-control.c:1406
+#: ../calendar/gui/e-itip-control.c:1447
 msgid "Task Update"
 msgstr "Ažuriranje zadatka"
 
-#: ../calendar/gui/e-itip-control.c:1410
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> želi dobiti posljednje podatke o zadatku."
 
-#: ../calendar/gui/e-itip-control.c:1411
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update Request"
 msgstr "Zahtjev za osvježenje zadatka"
 
-#: ../calendar/gui/e-itip-control.c:1418
+#: ../calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> je odgovorio na dodijeljeni zadatak."
 
-#: ../calendar/gui/e-itip-control.c:1419
+#: ../calendar/gui/e-itip-control.c:1460
 msgid "Task Reply"
 msgstr "Odgovor na zadatak"
 
-#: ../calendar/gui/e-itip-control.c:1426
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
+#: ../calendar/gui/e-itip-control.c:1467
+#, fuzzy, c-format
+msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> je otkazao zadatak."
 
-#: ../calendar/gui/e-itip-control.c:1427
-msgid "Task Cancellation"
+#: ../calendar/gui/e-itip-control.c:1468
+#, fuzzy
+msgid "Task Cancelation"
 msgstr "Otkazivanje zadatka"
 
-#: ../calendar/gui/e-itip-control.c:1438
+#: ../calendar/gui/e-itip-control.c:1479
 msgid "Bad Task Message"
 msgstr "Neispravna poruka o zadatku"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1503
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> je objavio podatke o dostupnosti."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1504
 msgid "Free/Busy Information"
 msgstr "Informacija slobodno/zauzeto"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> traži vaše podatke o dostupnosti."
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Request"
 msgstr "Slobodan/zauzet zahtjev"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> je odgovorio na zahtjev o dostupnosti."
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Reply"
 msgstr "Slobodan/zauzet odgovor"
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Bad Free/Busy Message"
 msgstr "Neispravna poruka o dostupnosti"
 
-#: ../calendar/gui/e-itip-control.c:1553
+#: ../calendar/gui/e-itip-control.c:1595
 msgid "The message does not appear to be properly formed"
 msgstr "Čini se da poruka nije ispravno sačinjena"
 
-#: ../calendar/gui/e-itip-control.c:1612
+#: ../calendar/gui/e-itip-control.c:1654
 msgid "The message contains only unsupported requests."
 msgstr "Poruka sadrži samo nepodržane zahtjeve."
 
-#: ../calendar/gui/e-itip-control.c:1645
+#: ../calendar/gui/e-itip-control.c:1687
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Prilog ne sadrži ispravnu poruku za kalendar"
 
-#: ../calendar/gui/e-itip-control.c:1677
+#: ../calendar/gui/e-itip-control.c:1725
 msgid "The attachment has no viewable calendar items"
 msgstr "Prilog nema dijelove kalendara koji se mogu pregledati"
 
-#: ../calendar/gui/e-itip-control.c:1911
+#: ../calendar/gui/e-itip-control.c:1967
 msgid "Update complete\n"
 msgstr "Ažuriranje završeno\n"
 
-#: ../calendar/gui/e-itip-control.c:1939
+#: ../calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt je neispravan i ne može biti ažuriran\n"
 
-#: ../calendar/gui/e-itip-control.c:1949
+#: ../calendar/gui/e-itip-control.c:2018
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Ovaj odgovor nije poslao trenutni učesnik. Dodati ga u učesnike?"
 
-#: ../calendar/gui/e-itip-control.c:1961
+#: ../calendar/gui/e-itip-control.c:2036
 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"
 
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:2060
 msgid "Attendee status updated\n"
 msgstr "Osvježeno stanje prisutne osobe\n"
 
-#: ../calendar/gui/e-itip-control.c:1981
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../calendar/gui/e-itip-control.c:2067
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Stanje prisutne osobe ne može biti osvježeno jer unos više ne postoji"
 
-#: ../calendar/gui/e-itip-control.c:2011
-msgid "Removal Complete"
-msgstr "Uklanjanje završeno"
-
-#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
 msgid "Item sent!\n"
 msgstr "Stavka poslana!\n"
 
-#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
+#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
 msgstr "Unos nije mogao biti poslan!\n"
 
-#: ../calendar/gui/e-itip-control.c:2166
+#: ../calendar/gui/e-itip-control.c:2281
 msgid "Choose an action:"
 msgstr "Izaberite akciju:"
 
-#: ../calendar/gui/e-itip-control.c:2237
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-itip-control.c:2310
+#: ../calendar/gui/e-meeting-list-view.c:589
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-itip-control.c:2350
 msgid "Update"
 msgstr "Ažuriraj"
 
-#: ../calendar/gui/e-itip-control.c:2265
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2374
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "Prihvati"
 
-#: ../calendar/gui/e-itip-control.c:2266
+#: ../calendar/gui/e-itip-control.c:2375
 msgid "Tentatively accept"
 msgstr "Prihvati sa rezervom"
 
-#: ../calendar/gui/e-itip-control.c:2267
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2376
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "Odbij"
 
-#: ../calendar/gui/e-itip-control.c:2296
+#: ../calendar/gui/e-itip-control.c:2401
 msgid "Send Free/Busy Information"
 msgstr "Pošalji slobodan/zauzet informaciju"
 
-#: ../calendar/gui/e-itip-control.c:2324
+#: ../calendar/gui/e-itip-control.c:2425
 msgid "Update respondent status"
 msgstr "Ažuriraj stanje stranke"
 
-#: ../calendar/gui/e-itip-control.c:2352
+#: ../calendar/gui/e-itip-control.c:2449
 msgid "Send Latest Information"
 msgstr "Pošalji najnoviju informaciju"
 
-#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
-#: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2473 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
-msgstr "%P %%"
-
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:1
 msgid "--to--"
 msgstr "--za--"
 
-#: ../calendar/gui/e-itip-control.glade.h:4
+#: ../calendar/gui/e-itip-control.glade.h:2
 msgid "Calendar Message"
 msgstr "Poruka kalendara"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "Date:"
 msgstr "Datum:"
 
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Loading Calendar"
 msgstr "Učitavam kalendar"
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:6
 msgid "Loading calendar..."
 msgstr "Učitavam kalendar..."
 
-#: ../calendar/gui/e-itip-control.glade.h:10
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr "Organizator:"
+
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "Poruka servera:"
 
-#: ../calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr "krajnji-datum"
-
-#: ../calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr "početni-datum"
-
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "Predsjedništvo"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
-#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "Obavezno prisustvo"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "Slobodno prisustvo"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "Resursi"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:802
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:84 ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
 msgid "Individual"
 msgstr "Pojedinac"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../widgets/table/e-table-config-no-group.glade.h:7
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grupa"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:976
 msgid "Resource"
 msgstr "Resurs"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:977
 msgid "Room"
 msgstr "Soba"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:991
 msgid "Chair"
 msgstr "Mjesto"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:805
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
 msgid "Required Participant"
 msgstr "Obavezan učesnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:993
 msgid "Optional Participant"
 msgstr "Slobodan učesnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:994
 msgid "Non-Participant"
 msgstr "Ne-učesnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-store.c:815
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:749
 msgid "Needs Action"
 msgstr "Zahtjeva akciju"
 
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/e-meeting-time-sel.c:411
-msgid "Tentative"
-msgstr "Okvirno"
-
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/itip-utils.c:557
-#: ../plugins/itip-formatter/itip-formatter.c:1649
-msgid "Delegated"
-msgstr "Delegirano"
+#. The extra space is just a hack to occupy more space for Attendee
+#: ../calendar/gui/e-meeting-list-view.c:544
+msgid "Attendee                          "
+msgstr ""
 
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
 msgid "In Process"
 msgstr "U toku"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:444
-#: ../calendar/gui/e-meeting-time-sel.c:2102
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2083
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7598,83 +7378,117 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2135 ../e-util/e-time-utils.c:203
-#: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2114
 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).
-#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1682
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "Van ureda"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Nema informacija"
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:408
+#, fuzzy
+msgid "A_ttendees..."
+msgstr "Učesnik"
+
+#: ../calendar/gui/e-meeting-time-sel.c:429
 msgid "O_ptions"
 msgstr "O_pcije"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:446
 msgid "Show _only working hours"
 msgstr "Pokaži _samo radne sate"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:456
 msgid "Show _zoomed out"
 msgstr "Pokaži _umanjeno"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "_Update free/busy"
 msgstr "_Ažuriraj slobodan/zauzet"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:504
 msgid "_Autopick"
 msgstr "_Samoodabir"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:536
 msgid "_All people and resources"
 msgstr "_Sve osobe i svi izvori"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "All _people and one resource"
 msgstr "Sve _osobe i jedan izvor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:554
 msgid "_Required people"
 msgstr "_Obavezne osobe"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Required people and _one resource"
 msgstr "_Obavezni učesnici i jedan izvor"
 
-#: ../calendar/gui/e-pub-utils.c:300
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Unesite šifru za %s"
+#: ../calendar/gui/e-meeting-time-sel.c:599
+msgid "_Start time:"
+msgstr "_Početno vrijeme:"
 
-#: ../calendar/gui/e-tasks.c:798 ../calendar/gui/gnome-cal.c:2532
+#: ../calendar/gui/e-meeting-time-sel.c:626
+msgid "_End time:"
+msgstr "_Krajnje vrijeme:"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Kliknite ovdje za dodavanje učesnika"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Uobičajeno ime"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Delegirano od"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Delegirano za"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Jezik"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Član"
+
+#: ../calendar/gui/e-memo-table.c:950
+#, fuzzy
+msgid "_Delete Selected Memos"
+msgstr "_Izbriši odabrane zadatke"
+
+#: ../calendar/gui/e-memo-table.c:1099 ../calendar/gui/e-memo-table.etspec.h:2
+#, fuzzy
+msgid "Click to add a memo"
+msgstr "Kliknite ovdje za dodavanje zadatka"
+
+#: ../calendar/gui/e-memos.c:754 ../calendar/gui/e-tasks.c:902
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7683,188 +7497,328 @@ msgstr ""
 "Greška na %s:\n"
 " %s"
 
-#: ../calendar/gui/e-tasks.c:846
+#: ../calendar/gui/e-memos.c:806
+#, fuzzy
+msgid "Loading memos"
+msgstr "Učitavanje zadataka"
+
+#: ../calendar/gui/e-memos.c:897
+#, fuzzy, c-format
+msgid "Opening memos at %s"
+msgstr "Otvaram zadatke u %s"
+
+#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
+msgid "Deleting selected objects..."
+msgstr "Brišem odabrane objekte..."
+
+#: ../calendar/gui/e-tasks.c:955
 msgid "Loading tasks"
 msgstr "Učitavanje zadataka"
 
-#: ../calendar/gui/e-tasks.c:930
+#: ../calendar/gui/e-tasks.c:1052
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otvaram zadatke u %s"
 
-#: ../calendar/gui/e-tasks.c:1126
+#: ../calendar/gui/e-tasks.c:1295
 msgid "Completing tasks..."
 msgstr "Završavam zadatke..."
 
-#: ../calendar/gui/e-tasks.c:1149
-msgid "Deleting selected objects..."
-msgstr "Brišem odabrane objekte..."
-
-#: ../calendar/gui/e-tasks.c:1176
+#: ../calendar/gui/e-tasks.c:1345
 msgid "Expunging"
 msgstr "Izbacujem"
 
-#: ../calendar/gui/e-timezone-entry.c:133
+#: ../calendar/gui/e-timezone-entry.c:124
 #, fuzzy
-msgid "Timezone Button"
+msgid "Select Timezone"
 msgstr "Vremenska _zona:"
 
 #. 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/e-week-view-main-item.c:329 ../calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1647
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:789
-msgid "Updating query"
-msgstr "Osvježavam upit"
-
-#. bonobo displays this string so it must be in locale
-#: ../calendar/gui/gnome-cal.c:2209 ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:350
-msgid "Custom View"
+#: ../calendar/gui/gnome-cal.c:2673
+#, fuzzy
+msgid "_Custom View"
 msgstr "Vlastiti pogled"
 
-#: ../calendar/gui/gnome-cal.c:2210 ../widgets/menus/gal-view-instance.c:586
-msgid "Save Custom View"
+#: ../calendar/gui/gnome-cal.c:2674
+#, fuzzy
+msgid "_Save Custom View"
 msgstr "Snimi vlastiti pogled"
 
-#: ../calendar/gui/gnome-cal.c:2215 ../widgets/menus/gal-view-instance.c:590
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
+#: ../calendar/gui/gnome-cal.c:2679
+#, fuzzy
+msgid "_Define Views..."
 msgstr "Definiši preglede..."
 
-#: ../calendar/gui/gnome-cal.c:2378
+#: ../calendar/gui/gnome-cal.c:2916
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Učitavam sastanke kod %s"
 
-#: ../calendar/gui/gnome-cal.c:2397
+#: ../calendar/gui/gnome-cal.c:2931
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Učitavam zadatke kod %s"
 
-#: ../calendar/gui/gnome-cal.c:2498
+#: ../calendar/gui/gnome-cal.c:2940
+#, fuzzy, c-format
+msgid "Loading memos at %s"
+msgstr "Učitavam zadatke kod %s"
+
+#: ../calendar/gui/gnome-cal.c:3052
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaram %s"
 
-#: ../calendar/gui/gnome-cal.c:3388
+#: ../calendar/gui/gnome-cal.c:4012
 msgid "Purging"
 msgstr "Brisanje"
 
 #: ../calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "April"
-
-#: ../calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "Avgust"
-
-#: ../calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "Decembar"
-
-#: ../calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "Februar"
-
-#: ../calendar/gui/goto-dialog.glade.h:5
-msgid "January"
-msgstr "Januar"
-
-#: ../calendar/gui/goto-dialog.glade.h:6
-msgid "July"
-msgstr "Juli"
-
-#: ../calendar/gui/goto-dialog.glade.h:7
-msgid "June"
-msgstr "Juni"
-
-#: ../calendar/gui/goto-dialog.glade.h:8
-msgid "March"
-msgstr "Mart"
-
-#: ../calendar/gui/goto-dialog.glade.h:9
-msgid "May"
-msgstr "Maj"
-
-#: ../calendar/gui/goto-dialog.glade.h:10
-msgid "November"
-msgstr "Novembar"
-
-#: ../calendar/gui/goto-dialog.glade.h:11
-msgid "October"
-msgstr "Oktobar"
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "Select Date"
 msgstr "Izaberi datum"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
-msgid "September"
-msgstr "Septembar"
-
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "_Izaberi današnji dan"
 
-#: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
-#: ../calendar/gui/itip-utils.c:442
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:553
 msgid "An organizer must be set."
 msgstr "Organizator mora biti izabran."
 
-#: ../calendar/gui/itip-utils.c:389
+#: ../calendar/gui/itip-utils.c:453
 msgid "At least one attendee is necessary"
 msgstr "Nužna je najmanje jedna prisutna osoba"
 
-#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:781
 msgid "Event information"
 msgstr "Informacije o događaju"
 
-#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:784
 msgid "Task information"
 msgstr "Informacija o zadatku"
 
-#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:636
-msgid "Journal information"
-msgstr "Informacije o dnevniku"
+#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:787
+#, fuzzy
+msgid "Memo information"
+msgstr "Nema informacija"
 
-#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:654
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:805
 msgid "Free/Busy information"
 msgstr "Slobodan/zauzet informacija"
 
-#: ../calendar/gui/itip-utils.c:518
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "Informacije o kalendaru"
 
-#: ../calendar/gui/itip-utils.c:567
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:677
+#, fuzzy
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "Prihvaćeno"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:684
+#, fuzzy
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "Prihvaćeno s rezervom"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
+#, fuzzy
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "Odbijeno"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:698
+#, fuzzy
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "Delegirano"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:711
+#, fuzzy
+msgctxt "Meeting"
 msgid "Updated"
 msgstr "Ažurirano"
 
-#: ../calendar/gui/itip-utils.c:575
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:718
+#, fuzzy
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "Odustani"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:725
+#, fuzzy
+msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Osvježi"
 
-#: ../calendar/gui/itip-utils.c:579
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:732
+#, fuzzy
+msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Kontra-prijedlog"
 
-#: ../calendar/gui/itip-utils.c:650
+#: ../calendar/gui/itip-utils.c:802
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Slobodan/zauzet informacija (%s do %s)"
 
-#: ../calendar/gui/itip-utils.c:660
+#: ../calendar/gui/itip-utils.c:810
 msgid "iCalendar information"
 msgstr "iCalendar informacije"
 
-#: ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:981
 msgid "You must be an attendee of the event."
 msgstr "Morate biti učesnik događaja."
 
-#: ../calendar/gui/migration.c:151
+#: ../calendar/gui/memos-component.c:477
+#, fuzzy
+msgid "_New Memo List"
+msgstr "Nova lista kontakata"
+
+#: ../calendar/gui/memos-component.c:560
+#, fuzzy, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d minut"
+msgstr[1] "%d minuta"
+msgstr[2] "%d minuta"
+
+#: ../calendar/gui/memos-component.c:562 ../calendar/gui/tasks-component.c:555
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", %d izabrani"
+msgstr[1] ", %d izabrana"
+msgstr[2] ", %d izabranih"
+
+#: ../calendar/gui/memos-component.c:609
+#, fuzzy
+msgid "Failed upgrading memos."
+msgstr "Neuspješno dograđivanje zadataka."
+
+#: ../calendar/gui/memos-component.c:739
+#, fuzzy, c-format
+msgid "Unable to open the memo list '%s' for creating events and meetings"
+msgstr ""
+"Nije moguće otvoriti listu zadataka '%s' za kreiranje događaja i sastanaka"
+
+#: ../calendar/gui/memos-component.c:752
+#, fuzzy
+msgid "There is no calendar available for creating memos"
+msgstr "Ne postoji kalendar dostupan za pravljenje zadataka"
+
+#: ../calendar/gui/memos-component.c:862
+#, fuzzy
+msgid "Memo Source Selector"
+msgstr "Lokacija kalendara"
+
+#: ../calendar/gui/memos-component.c:1041
+#, fuzzy
+msgid "New memo"
+msgstr "Novi sastanak"
+
+#: ../calendar/gui/memos-component.c:1042
+msgctxt "New"
+msgid "Mem_o"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1043
+#, fuzzy
+msgid "Create a new memo"
+msgstr "Napravi novi zadatak"
+
+#: ../calendar/gui/memos-component.c:1049
+#, fuzzy
+msgid "New shared memo"
+msgstr "Idi u direktorij..."
+
+#: ../calendar/gui/memos-component.c:1050
+#, fuzzy
+msgctxt "New"
+msgid "_Shared memo"
+msgstr "Nije započelo"
+
+#: ../calendar/gui/memos-component.c:1051
+#, fuzzy
+msgid "Create a shared new memo"
+msgstr "Unesi novi kontakt"
+
+#: ../calendar/gui/memos-component.c:1057
+#, fuzzy
+msgid "New memo list"
+msgstr "Nova lista zadataka"
+
+#: ../calendar/gui/memos-component.c:1058
+msgctxt "New"
+msgid "Memo li_st"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1059
+#, fuzzy
+msgid "Create a new memo list"
+msgstr "Napravi novu listu zadataka"
+
+#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
+#, fuzzy
+msgid "Print Memos"
+msgstr "Štampaj stavku"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -7876,7 +7830,7 @@ msgstr ""
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše direktorije..."
 
-#: ../calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -7889,260 +7843,228 @@ msgstr ""
 "Molim pričekajte dok Evolution ne migrira vaše direktorije..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
+#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
+#, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Ne mogu da prenesem stara podešavanja iz evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:777
+#: ../calendar/gui/migration.c:803
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Ne mogu da prenesem kalendar '%s'"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:944
+#: ../calendar/gui/migration.c:971
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ne mogu da prenesem zadatke '%s'"
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:511
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:511
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:511
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:511
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:511
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:512
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:512
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:512
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:512
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:512
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:513
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:513
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:513
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:513
 msgid "14th"
 msgstr "14. "
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:513
 msgid "15th"
 msgstr "15. "
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:514
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:514
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:514
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:514
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:514
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:515
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:515
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:515
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:515
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:515
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:516
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:516
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:516
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:516
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:516
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:498
+#: ../calendar/gui/print.c:517
 msgid "31st"
 msgstr "31."
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "Ne"
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "Po"
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "Ut"
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "Sr"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "Če"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "Pe"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "Su"
 
-#. Day
-#: ../calendar/gui/print.c:1917
-msgid "Selected day (%a %b %d %Y)"
-msgstr "Odabrani dan (%a %b %d %Y)"
-
-#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
-msgid "%a %b %d"
-msgstr "%a %b %d"
-
-#: ../calendar/gui/print.c:1943
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
-#: ../calendar/gui/print.c:1950
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: ../calendar/gui/print.c:1954
-#, c-format
-msgid "Selected week (%s - %s)"
-msgstr "Odabrana sedmica (%s - %s)"
-
-#. Month
-#: ../calendar/gui/print.c:1962
-msgid "Selected month (%b %Y)"
-msgstr "Odabran mjesec (%b %Y)"
+#: ../calendar/gui/print.c:2465
+msgid "Appointment"
+msgstr "Sastanak"
 
-#. Year
-#: ../calendar/gui/print.c:1969
-msgid "Selected year (%Y)"
-msgstr "Odabrana godina (%Y)"
+#: ../calendar/gui/print.c:2467
+msgid "Task"
+msgstr "Zadatak"
 
-#: ../calendar/gui/print.c:2320
+#: ../calendar/gui/print.c:2492
 #, fuzzy, c-format
 msgid "Summary: %s"
 msgstr "Sažetak:"
 
-#: ../calendar/gui/print.c:2328
-#, fuzzy, c-format
-msgid "Location: %s"
-msgstr "Lokacija:"
+#: ../calendar/gui/print.c:2515
+#, fuzzy
+msgid "Attendees: "
+msgstr "Učesnik"
 
-#: ../calendar/gui/print.c:2371
+#: ../calendar/gui/print.c:2555
 #, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: ../calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s "
 
-#: ../calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2584
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procenat završenog: %i"
 
-#: ../calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2595
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2426
+#: ../calendar/gui/print.c:2608
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2619
 msgid "Contacts: "
 msgstr "Konatkti: "
 
-#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
-#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
-msgid "Print Preview"
-msgstr "Pogled prije štampe"
-
-#: ../calendar/gui/print.c:2612
-msgid "Print Item"
-msgstr "Štampaj stavku"
-
-#: ../calendar/gui/tasks-component.c:439
-msgid "New Task List"
+#: ../calendar/gui/tasks-component.c:470
+#, fuzzy
+msgid "_New Task List"
 msgstr "Nova lista zadataka"
 
-#: ../calendar/gui/tasks-component.c:515
+#: ../calendar/gui/tasks-component.c:553
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8150,69 +8072,67 @@ msgstr[0] "%d zadatak"
 msgstr[1] "%d zadatka"
 msgstr[2] "%d zadataka"
 
-#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", %d izabrani"
-msgstr[1] ", %d izabrana"
-msgstr[2] ", %d izabranih"
-
-#: ../calendar/gui/tasks-component.c:564
+#: ../calendar/gui/tasks-component.c:602
 msgid "Failed upgrading tasks."
 msgstr "Neuspješno dograđivanje zadataka."
 
-#: ../calendar/gui/tasks-component.c:872
+#: ../calendar/gui/tasks-component.c:735
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Nije moguće otvoriti listu zadataka '%s' za kreiranje događaja i sastanaka"
 
-#: ../calendar/gui/tasks-component.c:887
+#: ../calendar/gui/tasks-component.c:748
 msgid "There is no calendar available for creating tasks"
 msgstr "Ne postoji kalendar dostupan za pravljenje zadataka"
 
-#: ../calendar/gui/tasks-component.c:981
+#: ../calendar/gui/tasks-component.c:859
 msgid "Task Source Selector"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1164
+#: ../calendar/gui/tasks-component.c:1113
 msgid "New task"
 msgstr "Novi zadatak"
 
-#: ../calendar/gui/tasks-component.c:1165
+#: ../calendar/gui/tasks-component.c:1114
+#, fuzzy
+msgctxt "New"
 msgid "_Task"
 msgstr "_Zadatak"
 
-#: ../calendar/gui/tasks-component.c:1166
+#: ../calendar/gui/tasks-component.c:1115
 msgid "Create a new task"
 msgstr "Napravi novi zadatak"
 
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1121
 msgid "New assigned task"
 msgstr "Novi dodjeljeni zadatak"
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1122
+#, fuzzy
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Dodijeli _zadatak"
 
-#: ../calendar/gui/tasks-component.c:1174
+#: ../calendar/gui/tasks-component.c:1123
 msgid "Create a new assigned task"
 msgstr "Dodijeli novi zadatak"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1129
 msgid "New task list"
 msgstr "Nova lista zadataka"
 
-#: ../calendar/gui/tasks-component.c:1181
-msgid "Task l_ist"
+#: ../calendar/gui/tasks-component.c:1130
+#, fuzzy
+msgctxt "New"
+msgid "Tas_k list"
 msgstr "Lista _zadataka"
 
-#: ../calendar/gui/tasks-component.c:1182
+#: ../calendar/gui/tasks-component.c:1131
 msgid "Create a new task list"
 msgstr "Napravi novu listu zadataka"
 
-#: ../calendar/gui/tasks-control.c:419
+#: ../calendar/gui/tasks-control.c:484
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8224,1727 +8144,1913 @@ msgstr ""
 "\n"
 "Jeste li sigurni da želite obrisati zadatke?"
 
-#: ../calendar/gui/tasks-control.c:422
+#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Ne pitaj me ponovno."
 
-#: ../calendar/gui/tasks-control.c:457
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 msgid "Print Tasks"
 msgstr "Štampaj zadatke"
 
-#. The first letter of each day of the week starting with Sunday
-#: ../calendar/gui/weekday-picker.c:319
-msgid "SMTWTFS"
-msgstr "SMTWTFS"
+#: ../calendar/gui/tasktypes.xml.h:2
+#, fuzzy, no-c-format
+msgid "% Completed"
+msgstr "% gotovo"
+
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#: ../calendar/gui/tasktypes.xml.h:15
+#, fuzzy
+msgid "In progress"
+msgstr "Izvodi se"
 
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+msgid "is greater than"
+msgstr ""
+
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
+msgid "is less than"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr "Sastanci i dogovori"
 
-#: ../calendar/importers/icalendar-importer.c:336
-#: ../calendar/importers/icalendar-importer.c:586
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1728
 #, fuzzy
 msgid "Opening calendar"
 msgstr "Novi kalendar"
 
-#: ../calendar/importers/icalendar-importer.c:429
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar datoteke (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar uvoznik"
 
-#: ../calendar/importers/icalendar-importer.c:494
-msgid "Reminder!!"
+#: ../calendar/importers/icalendar-importer.c:531
+#, fuzzy
+msgid "Reminder!"
 msgstr "Podsjetnik!!"
 
-#: ../calendar/importers/icalendar-importer.c:539
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar datoteke (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:540
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar uvoznik"
 
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
 msgstr "Kalendarski događaji"
 
-#: ../calendar/importers/icalendar-importer.c:739
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr "Inteligentni uvoznik Evolution kalendara"
 
 #.
+#. *
+#. * This program is free software; you can redistribute it and/or
+#. * modify it under the terms of the GNU Lesser General Public
+#. * License as published by the Free Software Foundation; either
+#. * version 2 of the License, or (at your option) version 3.
+#. *
+#. * This program is distributed in the hope that it will be useful,
+#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#. * Lesser General Public License for more details.
+#. *
+#. * You should have received a copy of the GNU Lesser General Public
+#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. *
+#. *
+#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+#. *
+#.
+#.
 #. * 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.
 #.
-#: ../calendar/zones.h:7
+#: ../calendar/zones.h:26
 msgid "Africa/Abidjan"
 msgstr "Afrika/Abidjan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "Afrika/Accra"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "Afrika/Adis_Ababa"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "Afrika/Alžir"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "Afrika/Banjul"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "Afrika/Kairo"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "Afrika/Conakry"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_Salaam"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "Afrika/Djibouti"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "Afrika/Douala"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Aaiun"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "Afrika/Freetown"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaborone"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johannesbur"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "Afrika/Khartoum"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinshasa"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "Afrika/Liberville"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbashi"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "Afrika/Mogadishu"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovia"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndjamena"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamey"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nouakchott"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ouagadougou"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripoli"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "Afrika/Windhoek"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "Amerika/Anchorage"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "Amerika/Anguilla"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "Amerika/Antigua"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "Amerika/Araguaina"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "Amerika/Asuncion"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "Amerika/Boise"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Cambridge_Bay"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "Amerika/Cancun"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "Amerika/Caracas"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "Amerika/Catamarca"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "Amerika/Cayenne"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "Amerika/Cayman"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "Amerika/Chicago"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "Amerika/Chihuahua"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "Amerika/Cordoba"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "Amerika/Costa_Rica"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "Amerika/Cuiaba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "Amerika/Curacao"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "Amerika/Danmarkshavn"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "Amerika/Dawson"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Dawson_Creek"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "Amerika/Dominica"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "Amerika/Eirunepe"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glace_Bay"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "Amerika/Godthab"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "Amerika/Goose_Bay"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grand_Turk"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "Amerika/Guadaloupe"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "Amerika/Guatemala"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "Amerika/Guayaquil"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "Amerika/Guyana"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "Amerika/Halifax"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosillo"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indiana/Indianapolis"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indiana/Knox"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indiana/Marengo"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indiana/Vevay"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "Amerika/Indianapolis"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "Amerika/Iqaluit"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "Amerika/Jamaica"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "Amerika/Jujuy"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "Amerika/Juneau"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentucky/Louisville"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentucky/Monticello"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "Amerika/La_Paz"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Angeles"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "Amerika/Louisville"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "Amerika/Maceio"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "Amerika/Managua"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "Amerika/Martinique"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "Amerika/Mazatlan"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "Amerika/Menominee"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "Amerika/Mexico_City"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "Amerika/Miquelon"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "Amerika/Monterrey"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "Amerika/Montserrat"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: ../calendar/zones.h:138
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../calendar/zones.h:157
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "Amerika/Nome"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "Amerika/Noronha"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "Amerika/North_Dakota/Center"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramari"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "Amerika/Phoenix"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Port-au-Prince"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_of_Spain"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "Amerika/Porto_Velho"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Puerto_Rico"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "Amerika/Rainy_River"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Rankin_Inlet"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "Amerika/Recife"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branco"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "Amerika/Rosario"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "Amerika/Santiago"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "America/Santo_Domingo"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao_Paulo"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "Amerika/Scoresbysund"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "Amerika/Shiprock"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "Amerika/St_Johns"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "Amerika/St_Kitts"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "Amerika/St_Lucia"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "Amerika/St_Thomas"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "Amerika/St_Vincent"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "Amerika/Swift_Current"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegucigalpa"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "Amerika/Thule"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Thunder_Bay"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "Amerika/Tijuana"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "Amerika/Vancouver"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "Amerika/Whitehorse"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "Amerika/Winnipeg"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "Amerika/Yakutat"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "Amerika/Yellowknife"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "Antarktika/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antarktika/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktika/DumontDUrville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antarktika/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antarktika/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antarktika/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antarktika/South_Pole"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antarktika/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antarktika/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Arktik/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Azija/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "Azija/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Azija/Amman"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Azija/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Azija/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Azija/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Azija/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Azija/Bagdad"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Azija/Bahrain"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Azija/Baku"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Azija/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Azija/Bejrut"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Azija/Bishkek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "Azija/Brunei"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Azija/Kalkuta"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Azija/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Azija/Chongqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Azija/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Azija/Damascus"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Azija/Dhaka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Azija/Dili"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "Azija/Dubai"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Azija/Dushanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Azija/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Azija/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "Azija/Hong_Kong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Azija/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Azija/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Azija/Istanbul"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Azija/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Azija/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Azija/Jeruzalem"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Azija/Kabul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Azija/Kamchatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Azija/Karachi"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Azija/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "Azija/Katmandu"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Azija/Krasnoyarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Azija/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Azija/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Azija/Kuvajt"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Azija/Macao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Azija/Macau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Azija/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Azija/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Azija/Manila"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Azija/Muscat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Azija/Nicosia"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Azija/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Azija/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Azija/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Azija/Phnom_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Azija/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Azija/Pyongyang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Azija/Qatar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Azija/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Azija/Rangoon"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Azija/Riyadh"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Azija/Saigon"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Azija/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Azija/Samarkand"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Azija/Seul"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Azija/Shanghai"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Azija/Singapore"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Azija/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Azija/Tashkent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Azija/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Azija/Tehran"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Azija/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Azija/Tokyo"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Azija/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Azija/Ulaanbaatar"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "Azija/Urumqi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Azija/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Azija/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Azija/Yakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Azija/Yekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Azija/Yerevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azores"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermuda"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlantik/Kanari"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Cape_Verde"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlantik/Faeroe"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantik/Jan_Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Atlantik/Madeira"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantik/Reykjavik"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantik/South_Georgia"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/Sv._Helena"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Atlantik/Stanley"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "Australija/Adelaide"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Australija/Brisbane"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Australija/Broken_Hill"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Australija/Darwin"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Australija/Hobart"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Australija/Lindeman"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Australija/Lord_Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Australija/Melbourne"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Australija/Perth"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Australija/Sydney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Europa/Andora"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Europa/Atena"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Europa/Beograd"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Europa/Berlin"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Europa/Bruxelles"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Europa/Bukurešt"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Europa/Budimpešta"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Europa/Copenhagen"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisabon"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Europa/London"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxemburg"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Europa/Moskva"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Europa/Nikozija"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Europa/Pariz"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Europa/Prag"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Europa/Rime"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferpol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Europa/Stockholm"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Europa/Vatikan"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Europa/Beč"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Europa/Varšava"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozyhe"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Europa/Zurich"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "Indijski okean/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "Indijski okean/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "Indijski okean/Božićni_otoci"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "Indijski okean/Cocos"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "Indijski okean/Comoro"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "Indijski okean/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "Indijski okean/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "Indijski okean/Maldives"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "Indijski okean/Mauritius"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "Indijski okean/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "Indijski okean/Reunion"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Pacifik/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Pacifik/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Pacifik/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Pacifik/Easter"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Pacifik/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Pacifik/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Pacifik/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Pacifik/Fiji"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Pacifik/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Pacifik/Galapagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Pacifik/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Pacifik/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Pacifik/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Pacifik/Honolulu"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Pacifik/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Pacifik/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Pacifik/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Pacifik/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Pacifik/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Pacifik/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Pacifik/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Pacifik/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Pacifik/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Pacifik/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Pacifik/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Pacifik/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Pacifik/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Pacifik/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Pacifik/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Pacifik/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Pacifik/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Pacifik/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Pacifik/Tahiti"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Pacifik/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Pacifik/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Pacifik/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Pacifik/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Pacifik/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Pacifik/Yap"
 
-#: ../composer/e-msg-composer-hdrs.c:558
-msgid "Posting destination"
+#: ../composer/e-composer-autosave.c:445
+msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:559
-msgid "Choose folders to post the message to."
+#: ../composer/e-composer-actions.c:84
+msgid "Untitled Message"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:593
-msgid "Click here for the address book"
+#: ../composer/e-composer-actions.c:317
+#: ../widgets/misc/e-attachment-view.c:328
+msgid "Attach a file"
 msgstr ""
 
-#.
-#. * 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:623
-msgid "_Reply-To:"
+#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:195
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
 msgstr ""
 
-#.
-#. * From
-#.
-#: ../composer/e-msg-composer-hdrs.c:630
-msgid "Fr_om:"
+#: ../composer/e-composer-actions.c:324
+msgid "Close the current file"
 msgstr ""
 
-#.
-#. * Subject
-#.
-#: ../composer/e-msg-composer-hdrs.c:637
-msgid "S_ubject:"
+#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "_Štampaj..."
+
+#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:345
+msgid "Save the current file"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-composer-actions.c:350
+msgid "Save _As..."
+msgstr ""
+
+#: ../composer/e-composer-actions.c:352
+msgid "Save the current file with a different name"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:357
 #, fuzzy
-msgid "_To:"
-msgstr "Vrh:"
+msgid "Save as _Draft"
+msgstr "Snimi kao VCard..."
 
-#: ../composer/e-msg-composer-hdrs.c:647
-msgid "Enter the recipients of the message"
+#: ../composer/e-composer-actions.c:359
+#, fuzzy
+msgid "Save as draft"
+msgstr "Snimi kao VCard..."
+
+#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:191
+#, fuzzy
+msgid "S_end"
+msgstr "Pošalji"
+
+#: ../composer/e-composer-actions.c:366
+msgid "Send this message"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:650
-msgid "_Cc:"
+#: ../composer/e-composer-actions.c:373
+#, fuzzy
+msgid "Insert Send options"
+msgstr "Opcije"
+
+#: ../composer/e-composer-actions.c:378
+#, fuzzy
+msgid "New _Message"
+msgstr "Poruka"
+
+#: ../composer/e-composer-actions.c:380
+#, fuzzy
+msgid "Open New Message window"
+msgstr "Pošalji poruku kontaktu"
+
+#: ../composer/e-composer-actions.c:387
+msgid "Character _Encoding"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:651
-msgid "Enter the addresses that will receive a carbon copy of the message"
+#: ../composer/e-composer-actions.c:394
+msgid "_Security"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:654
-msgid "_Bcc:"
+#: ../composer/e-composer-actions.c:404
+msgid "PGP _Encrypt"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:655
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
+#: ../composer/e-composer-actions.c:406
+msgid "Encrypt this message with PGP"
 msgstr ""
 
-#.
-#. * Post-To
-#.
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-composer-actions.c:412
+msgid "PGP _Sign"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:414
+msgid "Sign this message with your PGP key"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:420
 #, fuzzy
-msgid "_Post To:"
-msgstr "_Port:"
+msgid "_Prioritize Message"
+msgstr "Ne mogu otvoriti poruku"
 
-#: ../composer/e-msg-composer-hdrs.c:667
-msgid "Click here to select folders to post to"
+#: ../composer/e-composer-actions.c:422
+msgid "Set the message priority to high"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:673
-msgid "Post To:"
+#: ../composer/e-composer-actions.c:428
+#, fuzzy
+msgid "Re_quest Read Receipt"
+msgstr "Obavezan učesnik"
+
+#: ../composer/e-composer-actions.c:430
+msgid "Get delivery notification when your message is read"
 msgstr ""
 
-#: ../composer/e-msg-composer-select-file.c:82
-msgid "A_ttach"
+#: ../composer/e-composer-actions.c:436
+msgid "S/MIME En_crypt"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:738
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+#: ../composer/e-composer-actions.c:438
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:444
+msgid "S/MIME Sig_n"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:446
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:452
+msgid "_Bcc Field"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:454
+msgid "Toggles whether the BCC field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:460
+msgid "_Cc Field"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:462
+msgid "Toggles whether the CC field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:468
+msgid "_From Field"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:470
+msgid "Toggles whether the From chooser is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:476
+msgid "_Reply-To Field"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:478
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:521
+#, fuzzy
+msgid "Save Draft"
+msgstr "Nacrtaj fokus"
+
+#: ../composer/e-composer-header.c:120
+msgid "Show"
+msgstr ""
+
+#: ../composer/e-composer-header.c:123
+#, fuzzy
+msgid "Hide"
+msgstr "Zaglavlje"
+
+#: ../composer/e-composer-header-table.c:41
+msgid "Enter the recipients of the message"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:745
+#: ../composer/e-composer-header-table.c:43
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:46
 msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1224 ../composer/e-msg-composer.c:1257
-#: ../plugins/mail-remote/e-corba-utils.c:135
-msgid "Unknown reason"
+#: ../composer/e-composer-header-table.c:945
+msgid "Fr_om:"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1294
-msgid "Could not open file"
+#: ../composer/e-composer-header-table.c:945 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:923 ../mail/em-mailer-prefs.c:76
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:296
+msgid "From"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1302
-msgid "Unable to retrieve message from editor"
+#: ../composer/e-composer-header-table.c:954
+msgid "_Reply-To:"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1572
-msgid "Untitled Message"
+#: ../composer/e-composer-header-table.c:959
+#, fuzzy
+msgid "_To:"
+msgstr "Vrh:"
+
+#: ../composer/e-composer-header-table.c:965
+msgid "_Cc:"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:965 ../mail/em-filter-i18n.h:8
+msgid "CC"
 msgstr ""
 
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1606
+#: ../composer/e-composer-header-table.c:971
+msgid "_Bcc:"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:971 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:976
 #, fuzzy
-msgid "Open File"
-msgstr "Ulazna datoteka"
+msgid "_Post To:"
+msgstr "_Port:"
 
-#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
-msgid "Autogenerated"
+#: ../composer/e-composer-header-table.c:980
+msgid "S_ubject:"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:2105
+#: ../composer/e-composer-header-table.c:989
 msgid "Si_gnature:"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
-#: ../composer/e-msg-composer.c:3528
-msgid "Compose a message"
+#: ../composer/e-composer-name-header.c:116
+msgid "Click here for the address book"
+msgstr ""
+
+#: ../composer/e-composer-post-header.c:137
+msgid "Posting destination"
+msgstr ""
+
+#: ../composer/e-composer-post-header.c:138
+msgid "Choose folders to post the message to."
 msgstr ""
 
-#: ../composer/e-msg-composer.c:3643
-msgid "_Attachment Bar"
+#: ../composer/e-composer-post-header.c:172
+msgid "Click here to select folders to post to"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:4718
+#: ../composer/e-composer-private.c:208
+#, fuzzy
+msgid "Save draft"
+msgstr "Nacrtaj fokus"
+
+#: ../composer/e-msg-composer.c:807
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:814
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:1350 ../composer/e-msg-composer.c:2189
+#, fuzzy
+msgid "Compose Message"
+msgstr "Poruka kalendara"
+
+#: ../composer/e-msg-composer.c:3347
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)</"
+"b>"
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:1
@@ -9967,8 +10073,7 @@ msgstr ""
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:17
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr ""
 
@@ -10008,26 +10113,29 @@ msgid "Do you want to recover unfinished messages?"
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:14
-msgid "Don't Recover"
+msgid "Download in progress. Do you want to send the mail?"
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:15
-msgid "Download in progress. Do you want to send the mail?"
+msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "Error saving to autosave because &quot;{1}&quot;."
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"Send options available only for Novell GroupWise and Microsoft Exchange "
+"accounts."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:18
-msgid "Recover"
-msgstr ""
+#, fuzzy
+msgid "Send options not available."
+msgstr "TLS nije dostupan"
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -10068,23 +10176,35 @@ msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:31
 #, fuzzy
-msgid "_Discard Changes"
-msgstr "Zanemari promjene"
+msgid "_Do not Recover"
+msgstr "Nemoj ukloniti"
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:32
 #, fuzzy
-msgid "_Save Message"
-msgstr "Poruka servera:"
+msgid "_Recover"
+msgstr "_Ukloni"
+
+#: ../composer/mail-composer.error.xml.h:33
+#, fuzzy
+msgid "_Save Draft"
+msgstr "Nacrtaj fokus"
 
 #: ../data/evolution.desktop.in.in.h:1
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:509
-msgid "Evolution"
+#, fuzzy
+msgid "Evolution Mail and Calendar"
+msgstr "Evolution kalendar i zadaci"
+
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:947
+msgid "Groupware Suite"
 msgstr ""
 
-#: ../data/evolution.desktop.in.in.h:2
-msgid "The Evolution Groupware Suite"
+#: ../data/evolution.desktop.in.in.h:3
+msgid "Manage your email, contacts and schedule"
 msgstr ""
 
 #: ../data/evolution.keys.in.in.h:1
@@ -10095,139 +10215,176 @@ msgstr ""
 msgid "calendar information"
 msgstr ""
 
-#: ../designs/OOA/ooa.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:188 ../plugins/itip-formatter/itip-view.c:191
+#: ../ui/evolution-calendar.xml.h:34 ../widgets/misc/e-cell-date-edit.c:304
+msgid "Today"
 msgstr ""
 
-#: ../designs/OOA/ooa.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr ""
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:200 ../plugins/itip-formatter/itip-view.c:219
+#, fuzzy
+msgid "Tomorrow"
+msgstr "Komori"
 
-#: ../designs/OOA/ooa.glade.h:5
-msgid "<b>Status:</b>"
-msgstr ""
+#: ../e-util/e-datetime-format.c:202
+#, fuzzy
+msgid "Yesterday"
+msgstr "Jučer %H:%M"
 
-#: ../designs/OOA/ooa.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
+#: ../e-util/e-datetime-format.c:205
+#, c-format
+msgid "%d days from now"
 msgstr ""
 
-#: ../designs/OOA/ooa.glade.h:8
-msgid "I am currently in the office"
-msgstr ""
+#: ../e-util/e-datetime-format.c:207
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr "%d dan"
 
-#: ../designs/OOA/ooa.glade.h:9
-msgid "I am currently out of the office"
+#: ../e-util/e-datetime-format.c:281 ../e-util/e-datetime-format.c:291
+#: ../e-util/e-datetime-format.c:300
+msgid "Use locale default"
 msgstr ""
 
-#: ../designs/OOA/ooa.glade.h:10
-msgid "No, Don't Change Status"
-msgstr ""
+#: ../e-util/e-datetime-format.c:494
+#, fuzzy
+msgid "Format:"
+msgstr "Format"
 
-#: ../designs/OOA/ooa.glade.h:12
-msgid "Out of Office Assistant"
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
+msgid "Evolution Error"
 msgstr ""
 
-#: ../designs/OOA/ooa.glade.h:13
-msgid "Yes, Change Status"
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
+msgid "Evolution Warning"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:1
-msgid "      "
+#: ../e-util/e-error.c:118
+msgid "Evolution Information"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:2
-msgid "<b>Receiving Email</b>"
+#: ../e-util/e-error.c:120
+msgid "Evolution Query"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:3
-msgid "<b>Sending Email:</b>"
+#. setup a dummy error
+#: ../e-util/e-error.c:448
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:4
-msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
+#: ../e-util/e-logger.c:161
+#, fuzzy
+msgid "Component"
+msgstr "Završeno"
+
+#: ../e-util/e-logger.c:162
+msgid "Name of the component being logged"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:6
-msgid "Always send back a read receipt"
+#: ../e-util/e-non-intrusive-error-dialog.c:191
+#, fuzzy
+msgid "Debug Logs"
+msgstr "Web dnevnik:"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:205
+msgid "Show _errors in the status bar for"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:7
-msgid "Ask me if I want to send back a read receipt"
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../e-util/e-non-intrusive-error-dialog.c:223
+#, fuzzy
+msgid "second(s)."
+msgstr "drugoj"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:229
+#, fuzzy
+msgid "Log Messages:"
+msgstr "_Poruka:"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:274
+msgid "Log Level"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:8
-msgid "Never send back a read receipt"
+#: ../e-util/e-non-intrusive-error-dialog.c:282
+#: ../widgets/misc/e-dateedit.c:380
+#, fuzzy
+msgid "Time"
+msgstr "Titula"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2527
+#: ../mail/message-list.etspec.h:10
+#, fuzzy
+msgid "Messages"
+msgstr "Poruka"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:301
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+msgid "Close this window"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:9
-msgid "Read Receipts"
+#: ../e-util/e-non-intrusive-error-dialog.h:39
+msgid "Error"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:10
-msgid "Request a read receipt for all messages I send"
+#: ../e-util/e-non-intrusive-error-dialog.h:39
+msgid "Errors"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:11
-msgid "Unless the message is sent to a mailing list, and not to me personally"
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Warnings and Errors"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:12
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Debug"
 msgstr ""
 
-#: ../e-util/e-dialog-utils.c:267
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Error, Warnings and Debug messages"
 msgstr ""
 
-#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
-msgid "Overwrite file?"
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:957
+#: ../plugins/plugin-manager/plugin-manager.c:355
+#: ../plugins/publish-calendar/publish-calendar.c:718
+msgid "Enabled"
+msgstr "Uključeno"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
 msgstr ""
 
-#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
-msgid "Evolution Error"
+#: ../e-util/e-print.c:160
+msgid "An error occurred while printing"
 msgstr ""
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
-msgid "Evolution Warning"
+#: ../e-util/e-print.c:167
+msgid "The printing system reported the following details about the error:"
 msgstr ""
 
-#: ../e-util/e-error.c:124
-msgid "Evolution Information"
+#: ../e-util/e-print.c:173
+msgid ""
+"The printing system did not report any additional details about the error."
 msgstr ""
 
-#: ../e-util/e-error.c:126
-msgid "Evolution Query"
+#: ../e-util/e-signature.c:690
+msgid "Autogenerated"
 msgstr ""
 
-#. setup a dummy error
-#: ../e-util/e-error.c:438
-#, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
 msgstr ""
 
 #: ../e-util/e-system.error.xml.h:2
 #, fuzzy
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "Ne mogu otvoriti \"{0}\"."
+msgid "Cannot open file \"{0}\"."
+msgstr "Ne mogu otvoriti datoteku"
 
 #: ../e-util/e-system.error.xml.h:3
 #, fuzzy
-msgid "Cannot save file &quot;{0}&quot;."
+msgid "Cannot save file \"{0}\"."
 msgstr "Ne mogu snimiti \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:4
@@ -10236,150 +10393,164 @@ msgstr "Želite li prepisati preko?"
 
 #: ../e-util/e-system.error.xml.h:5
 #, fuzzy
-msgid "File exists &quot;{0}&quot;."
+msgid "File exists \"{0}\"."
 msgstr "Datoteka postoji \"{0}\"."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
-msgid "_Overwrite"
-msgstr ""
-
-#. 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.
-#: ../e-util/e-time-utils.c:185 ../e-util/e-time-utils.c:398
-msgid "%a %m/%d/%Y %I:%M %p"
+#: ../e-util/e-system.error.xml.h:6
+msgid "Overwrite file?"
 msgstr ""
 
-#. 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.
-#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %H:%M"
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+msgid "_Overwrite"
 msgstr ""
 
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:195
-msgid "%a %m/%d/%Y %I %p"
-msgstr ""
+#: ../e-util/e-util.c:133
+#, fuzzy
+msgid "Could not open the link."
+msgstr "Ne mogu otvoriti odredište"
 
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:200
-msgid "%a %m/%d/%Y %H"
-msgstr ""
+#: ../e-util/e-util.c:183
+#, fuzzy
+msgid "Could not display help for Evolution."
+msgstr "Nisam mogao ažurirati objekt"
 
-#. strptime format of a date and a time, in 12-hour format.
-#: ../e-util/e-time-utils.c:211
-msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr ""
+#: ../e-util/e-util-labels.c:45
+#, fuzzy
+msgid "I_mportant"
+msgstr "Uvezi..."
 
-#. strptime format of a date and a time, in 24-hour format.
-#: ../e-util/e-time-utils.c:215
-msgid "%m/%d/%Y %H:%M:%S"
-msgstr ""
+#. red
+#: ../e-util/e-util-labels.c:46
+#, fuzzy
+msgid "_Work"
+msgstr "Posao"
 
-#. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:220
-msgid "%m/%d/%Y %I:%M %p"
-msgstr ""
+#. orange
+#: ../e-util/e-util-labels.c:47
+#, fuzzy
+msgid "_Personal"
+msgstr "Osobni podaci"
 
-#. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:225
-msgid "%m/%d/%Y %H:%M"
-msgstr ""
+#. green
+#: ../e-util/e-util-labels.c:48
+#, fuzzy
+msgid "_To Do"
+msgstr "Togo"
 
-#. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:230
-msgid "%m/%d/%Y %I %p"
-msgstr ""
+#. blue
+#: ../e-util/e-util-labels.c:49
+#, fuzzy
+msgid "_Later"
+msgstr "nakon"
 
-#. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:235
-msgid "%m/%d/%Y %H"
-msgstr ""
+#: ../e-util/e-util-labels.c:320
+#, fuzzy
+msgid "Label _Name:"
+msgstr "_Ime:"
 
-#. 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 ""
+#: ../e-util/e-util-labels.c:343
+#, fuzzy
+msgid "Edit Label"
+msgstr "Može se uređivati"
 
-#. 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"
+#: ../e-util/e-util-labels.c:343
+msgid "Add Label"
 msgstr ""
 
-#. 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.
-#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1720
-msgid "%I:%M %p"
+#: ../e-util/e-util-labels.c:362
+msgid "Label name cannot be empty."
 msgstr ""
 
-#. 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:1435 ../widgets/misc/e-dateedit.c:1717
-msgid "%H:%M"
+#: ../e-util/e-util-labels.c:367
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
 msgstr ""
 
-#. strptime format for hour and AM/PM, 12-hour format.
-#: ../e-util/e-time-utils.c:356
-msgid "%I %p"
-msgstr ""
+#: ../e-util/gconf-bridge.c:1222
+#, fuzzy, c-format
+msgid "GConf error: %s"
+msgstr "Greška pri provjeri: %s"
 
-#: ../e-util/eggtrayicon.c:119
-msgid "The orientation of the tray."
+#: ../e-util/gconf-bridge.c:1233
+msgid "All further errors shown only on terminal."
 msgstr ""
 
-#: ../filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:74
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:76
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:78
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
@@ -10389,98 +10560,106 @@ msgstr[1] ""
 
 #: ../filter/filter-datespec.c:84
 #, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../filter/filter-datespec.c:85
+#, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../filter/filter-datespec.c:285
+#: ../filter/filter-datespec.c:86
+#, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr ""
 
-#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
+#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr ""
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:295
+#: ../filter/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr ""
 
-#: ../filter/filter-datespec.c:415
+#: ../filter/filter-datespec.c:447
 msgid "Select a time to compare against"
 msgstr ""
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:281
 msgid "Choose a file"
 msgstr ""
 
-#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
-#: ../mail/mail-config.glade.h:91
-msgid "Important"
-msgstr ""
-
-#. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
-#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr ""
-
-#. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
-#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:95
-msgid "Later"
-msgstr ""
-
-#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:528
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr ""
 
-#: ../filter/filter-rule.c:791
+#: ../filter/filter-rule.c:854
 #, fuzzy
-msgid "_Rule name:"
+msgid "R_ule name:"
 msgstr "_Puno ime:"
 
-#: ../filter/filter-rule.c:819
-#, fuzzy
-msgid "If"
-msgstr "I"
+#: ../filter/filter-rule.c:882
+msgid "Find items that meet the following conditions"
+msgstr ""
 
-#: ../filter/filter-rule.c:858
-msgid "if all criteria are met"
+#: ../filter/filter-rule.c:916
+msgid "A_dd Condition"
 msgstr ""
 
-#: ../filter/filter-rule.c:858
-msgid "if any criteria are met"
+#: ../filter/filter-rule.c:922
+msgid "If all conditions are met"
 msgstr ""
 
-#: ../filter/filter-rule.c:860
-msgid "Execute actions"
+#: ../filter/filter-rule.c:922
+msgid "If any conditions are met"
 msgstr ""
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:924
+#, fuzzy
+msgid "_Find items:"
+msgstr "Premještam stavke"
+
+#: ../filter/filter-rule.c:942
 msgid "All related"
 msgstr ""
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:942
 msgid "Replies"
 msgstr ""
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:942
 msgid "Replies and parents"
 msgstr ""
 
-#: ../filter/filter-rule.c:883
-msgid "Include threads"
+#: ../filter/filter-rule.c:942
+msgid "No reply or parent"
+msgstr ""
+
+#: ../filter/filter-rule.c:944
+msgid "I_nclude threads"
 msgstr ""
 
-#: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:291
+#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr ""
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
+#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
 #, fuzzy
 msgid "Outgoing"
 msgstr "Brisanje"
@@ -10505,7 +10684,7 @@ msgstr ""
 msgid "Missing file name."
 msgstr ""
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:65
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr ""
 
@@ -10560,42 +10739,38 @@ msgid ""
 msgstr ""
 
 #: ../filter/filter.glade.h:12
-msgid "a time relative to the current time"
-msgstr ""
-
-#: ../filter/filter.glade.h:13
-msgid "ago"
-msgstr ""
-
-#: ../filter/filter.glade.h:17
-msgid "months"
-msgstr ""
-
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
-msgid "seconds"
-msgstr ""
-
-#: ../filter/filter.glade.h:19
-msgid "the current time"
+msgid ""
+"ago\n"
+"in the future"
 msgstr ""
 
-#: ../filter/filter.glade.h:20
-msgid "the time you specify"
+#: ../filter/filter.glade.h:14
+msgid ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
 msgstr ""
 
-#: ../filter/filter.glade.h:22
-msgid "years"
+#: ../filter/filter.glade.h:21
+msgid ""
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
 msgstr ""
 
-#: ../filter/rule-editor.c:290
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr ""
 
-#: ../filter/rule-editor.c:366
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr ""
 
-#: ../filter/rule-editor.c:698
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr ""
 
@@ -10617,57 +10792,180 @@ msgid "Configure your email accounts here"
 msgstr ""
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Configure your network connection settings here"
+msgstr "Podesi samodopunjavanje"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr ""
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr ""
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr ""
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr ""
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr ""
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:494
-#: ../mail/importers/elm-importer.c:342
-#: ../mail/importers/netscape-importer.c:1902
-#: ../mail/importers/pine-importer.c:388 ../mail/mail-component.c:561
-#: ../mail/mail-component.c:648
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Network configuration control"
+msgstr "Kontrola podešavanja Evolution kalendara"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
+#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
+#: ../mail/mail-component.c:793
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr ""
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:490
 msgid "Mail Accounts"
 msgstr ""
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:108
 msgid "Mail Preferences"
 msgstr ""
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+#, fuzzy
+msgid "Network Preferences"
+msgstr "pojave"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
+#: ../plugins/pst-import/pst-importer.c:297
 msgid "_Mail"
 msgstr ""
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
+msgid "_Forward"
+msgstr ""
+
+#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Reply to Sender"
+msgstr ""
+
+#. Translators: This is only for multiple messages.
+#: ../mail/e-attachment-handler-mail.c:334
+#, fuzzy, c-format
+msgid "%d attached messages"
+msgstr "Dodaj kolonu..."
+
+#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1642
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:607
+#, fuzzy
+msgid "Icon View"
+msgstr "Mjesečni pregled"
+
+#: ../mail/e-mail-attachment-bar.c:616
+#: ../widgets/misc/e-attachment-paned.c:608
+#, fuzzy
+msgid "List View"
+msgstr "Vlastiti pogled"
+
+#: ../mail/e-mail-search-bar.c:76
+#, c-format
+msgid "Matches: %d"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:520
+msgid "Close the find bar"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:528
+#, fuzzy
+msgid "Fin_d:"
+msgstr "_Nađi"
+
+#: ../mail/e-mail-search-bar.c:540
+#, fuzzy
+msgid "Clear the search"
+msgstr "Uvijek traži"
+
+#: ../mail/e-mail-search-bar.c:559
+msgid "_Previous"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:565
+msgid "Find the previous occurrence of the phrase"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:573
+#, fuzzy
+msgid "_Next"
+msgstr "Tekst"
+
+#: ../mail/e-mail-search-bar.c:579
+msgid "Find the next occurrence of the phrase"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:587
+msgid "Mat_ch case"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:615
+msgid "Reached bottom of page, continued from top"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:637
+msgid "Reached top of page, continued from bottom"
+msgstr ""
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:309
+#, fuzzy
+msgid "No encryption"
+msgstr "Nema informacija"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:313
+#, fuzzy
+msgid "TLS encryption"
+msgstr "Opis"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:317
+#, fuzzy
+msgid "SSL encryption"
+msgstr "Opis"
+
+#: ../mail/em-account-editor.c:408
 #, c-format
 msgid "%s License Agreement"
 msgstr ""
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:415
 #, c-format
 msgid ""
 "\n"
@@ -10676,111 +10974,133 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr ""
 
-#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:494
+#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr ""
 
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:797
+msgid "Never"
+msgstr "Nikada"
+
+#: ../mail/em-account-editor.c:798
+msgid "Always"
+msgstr "Uvijek"
+
+#: ../mail/em-account-editor.c:799
 msgid "Ask for each message"
 msgstr ""
 
-#: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1877 ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr ""
 
-#: ../mail/em-account-editor.c:1760 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1928 ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr ""
 
-#: ../mail/em-account-editor.c:1943
-msgid "Automatically check for _new mail every"
+#: ../mail/em-account-editor.c:2200
+msgid "Check for _new messages every"
 msgstr ""
 
-#: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2208
+#, fuzzy
+msgid "minu_tes"
+msgstr "minute"
+
+#: ../mail/em-account-editor.c:2398 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr ""
 
-#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2457 ../mail/mail-config.glade.h:73
 msgid "Defaults"
 msgstr ""
 
 #. Security settings
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:311
+#: ../mail/em-account-editor.c:2523 ../mail/mail-config.glade.h:133
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 msgid "Security"
 msgstr ""
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2260 ../mail/em-account-editor.c:2334
+#: ../mail/em-account-editor.c:2560 ../mail/em-account-editor.c:2655
 msgid "Receiving Options"
 msgstr ""
 
-#: ../mail/em-account-editor.c:2261 ../mail/em-account-editor.c:2335
-msgid "Checking for New Mail"
+#: ../mail/em-account-editor.c:2561 ../mail/em-account-editor.c:2656
+msgid "Checking for New Messages"
 msgstr ""
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3123 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr ""
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:3123 ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr ""
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:455
+#: ../mail/em-account-prefs.c:426
 msgid "[Default]"
 msgstr ""
 
-#: ../mail/em-account-prefs.c:510
+#: ../mail/em-account-prefs.c:483
 msgid "Account name"
 msgstr ""
 
-#: ../mail/em-account-prefs.c:512
+#: ../mail/em-account-prefs.c:485
 msgid "Protocol"
 msgstr ""
 
-#: ../mail/em-account-prefs.c:517
-#, fuzzy
-msgid "Mail Accounts Table"
-msgstr "_Ime računa:"
-
-#: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:958
+#: ../mail/em-composer-prefs.c:318 ../mail/em-composer-prefs.c:452
+#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:481
 msgid "Unnamed"
 msgstr ""
 
-#: ../mail/em-composer-prefs.c:897
+#: ../mail/em-composer-prefs.c:961
 msgid "Language(s)"
 msgstr ""
 
-#: ../mail/em-composer-prefs.c:940
+#: ../mail/em-composer-prefs.c:994
 msgid "Add signature script"
 msgstr ""
 
-#: ../mail/em-composer-prefs.c:960
+#: ../mail/em-composer-prefs.c:1036
 msgid "Signature(s)"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:1132 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:1648
+#: ../mail/em-composer-utils.c:1585
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:1591
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:2058
 msgid "an unknown sender"
 msgstr ""
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1695
+#: ../mail/em-composer-utils.c:2105
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: ../mail/em-filter-editor.c:147
+#: ../mail/em-composer-utils.c:2248
+msgid "-----Original Message-----"
+msgstr ""
+
+#: ../mail/em-filter-editor.c:172
 msgid "_Filter Rules"
 msgstr ""
 
@@ -10797,1770 +11117,2334 @@ msgstr ""
 msgid "Assign Score"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:7
-msgid "contains"
-msgstr ""
+#: ../mail/em-filter-i18n.h:9
+#, fuzzy
+msgid "Completed On"
+msgstr "Završeno "
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:12
-msgid "Deleted"
-msgstr ""
+#: ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:765
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Obriši"
 
-#: ../mail/em-filter-i18n.h:13
-msgid "does not contain"
+#: ../mail/em-filter-i18n.h:15
+msgid "Deleted"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:18
 msgid "does not exist"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:19
 msgid "does not return"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:20
 msgid "does not sound like"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:21
 msgid "does not start with"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:19
-msgid "Do Not Exist"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:24
 msgid "ends with"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Exist"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:27
 msgid "Expression"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:28
 msgid "Follow Up"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:27
-msgid "is"
+#: ../mail/em-filter-i18n.h:29
+#, fuzzy
+msgid "Forward to"
+msgstr "Prosljedi kontakt"
+
+#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
+msgid "Important"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:31
-msgid "is greater than"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:32
-msgid "is less than"
+#: ../mail/em-filter-i18n.h:38
+msgid "is not Flagged"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:33
-msgid "is not"
+#: ../mail/em-filter-i18n.h:39
+msgid "is not set"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is not Flagged"
-msgstr ""
+#: ../mail/em-filter-i18n.h:40
+#, fuzzy
+msgid "is set"
+msgstr "Gđica"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1063
-#: ../widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:43
 msgid "Label"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:45
 msgid "Match All"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Body"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:47
 msgid "Message Header"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:50
+#, fuzzy
+msgid "Message Location"
+msgstr "Poruka"
+
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
+#. Translators: "Read" as in "has been read" (message-tag-followup.c)
+#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
 msgid "Read"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:60
 msgid "returns less than"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:64
+#, fuzzy
+msgid "Sender or Recipients"
+msgstr "_Pretrage"
+
+#: ../mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Set Label"
+msgstr "Izaberi datum"
+
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:70
 msgid "Specific header"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:71
 msgid "starts with"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:73
 msgid "Stop Processing"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1572
-#: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
-#: ../mail/message-tag-followup.c:330
+#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1131
+#: ../smime/lib/e-cert.c:1112
 msgid "Subject"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr ""
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:488
-msgid "<b>Then</b>"
-msgstr ""
+#: ../mail/em-filter-rule.c:521
+#, fuzzy
+msgid "Then"
+msgstr "Zatim po"
+
+#: ../mail/em-filter-rule.c:549
+#, fuzzy
+msgid "Add Ac_tion"
+msgstr "Zahtjeva akciju"
 
-#: ../mail/em-folder-browser.c:134
+#: ../mail/em-folder-browser.c:194
 msgid "C_reate Search Folder From Search..."
 msgstr ""
 
+#: ../mail/em-folder-browser.c:219
+#, fuzzy
+msgid "All Messages"
+msgstr "Izaberi sve"
+
+#: ../mail/em-folder-browser.c:220
+#, fuzzy
+msgid "Unread Messages"
+msgstr "Poruka servera:"
+
+#: ../mail/em-folder-browser.c:222
+#, fuzzy
+msgid "No Label"
+msgstr "Bez slike"
+
+#: ../mail/em-folder-browser.c:229
+#, fuzzy
+msgid "Read Messages"
+msgstr "Poruka servera:"
+
+#: ../mail/em-folder-browser.c:230
+#, fuzzy
+msgid "Recent Messages"
+msgstr "Poruka kalendara"
+
+#: ../mail/em-folder-browser.c:231
+#, fuzzy
+msgid "Last 5 Days' Messages"
+msgstr "Neispravna poruka o zadatku"
+
+#: ../mail/em-folder-browser.c:232
+#, fuzzy
+msgid "Messages with Attachments"
+msgstr "Snimi sastanak"
+
+#: ../mail/em-folder-browser.c:233
+#, fuzzy
+msgid "Important Messages"
+msgstr "Poruka kalendara"
+
+#: ../mail/em-folder-browser.c:234
+#, fuzzy
+msgid "Messages Not Junk"
+msgstr "Poruka"
+
+#: ../mail/em-folder-browser.c:1194
+#, fuzzy
+msgid "Account Search"
+msgstr "_Ime računa:"
+
+#: ../mail/em-folder-browser.c:1256
+msgid "All Account Search"
+msgstr ""
+
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:174
+#, fuzzy
+msgid "Unread messages:"
+msgid_plural "Unread messages:"
+msgstr[0] "Potpisujem poruku"
+msgstr[1] "Potpisujem poruku"
+msgstr[2] "Potpisujem poruku"
+
 #. TODO: can this be done in a loop?
-#: ../mail/em-folder-properties.c:144
-msgid "Total message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:178
+#, fuzzy
+msgid "Total messages:"
 msgid_plural "Total messages:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Šifrujem poruku"
+msgstr[1] "Šifrujem poruku"
+msgstr[2] "Šifrujem poruku"
 
-#: ../mail/em-folder-properties.c:156
-msgid "Unread message:"
-msgid_plural "Unread messages:"
-msgstr[0] ""
-msgstr[1] ""
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr ""
 
-#: ../mail/em-folder-properties.c:278
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../mail/em-folder-properties.c:198
+#, c-format
+msgid "Quota usage"
+msgstr ""
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
+#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:168
+#: ../mail/mail-component.c:608
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
+msgid "Inbox"
+msgstr ""
+
+#: ../mail/em-folder-properties.c:390
+#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr ""
 
-#: ../mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: ../mail/em-folder-selector.c:261
-msgid "Create"
-msgstr ""
+#: ../mail/em-folder-selector.c:249
+#, fuzzy
+msgid "C_reate"
+msgstr "Završeno"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:253
 msgid "Folder _name:"
 msgstr ""
 
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
-#: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
+#. load store to mail component
+#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
 #, fuzzy
 msgid "Search Folders"
 msgstr "_Pretrage"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 msgid "UNMATCHED"
 msgstr ""
 
-#: ../mail/em-folder-tree-model.c:469 ../mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
 #, fuzzy
 msgid "Drafts"
 msgstr "Nacrtaj fokus"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:472 ../mail/mail-component.c:143
-msgid "Inbox"
-msgstr ""
+#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#, fuzzy
+msgid "Templates"
+msgstr "Delegirano"
 
-#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:145
+#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr ""
 
-#: ../mail/em-folder-tree-model.c:477 ../mail/mail-component.c:146
+#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
 #, fuzzy
 msgid "Sent"
 msgstr "Pošalji"
 
-#: ../mail/em-folder-tree-model.c:498 ../mail/em-folder-tree-model.c:802
+#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
 msgid "Loading..."
 msgstr ""
 
-#: ../mail/em-folder-tree.c:689
+#. Translators: This is the string used for displaying the
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
+#. *
+#. * Most languages should translate this as "%s (%u%s)". The
+#. * languages that use localized digits (like Persian) may
+#. * need to replace "%u" with "%Iu". Right-to-left languages
+#. * (like Arabic and Hebrew) may need to add bidirectional
+#. * formatting codes to take care of the cases the folder
+#. * name appears in either direction.
+#.
+#: ../mail/em-folder-tree.c:318
+#, fuzzy, c-format
+msgctxt "folder-display"
+msgid "%s (%u%s)"
+msgstr "%s (%d%% dovršeno)"
+
+#: ../mail/em-folder-tree.c:727
 msgid "Mail Folder Tree"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:849
+#: ../mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving folder %s"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:851
+#: ../mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying folder %s"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:858 ../mail/message-list.c:1613
+#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2018
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:860 ../mail/message-list.c:1615
+#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2020
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:876
+#: ../mail/em-folder-tree.c:912
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:1678 ../mail/mail-ops.c:1057
-#, c-format
-msgid "Scanning folders in \"%s\""
+#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2110
+msgid "_Move"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
-msgid "_View"
+#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2112
+msgid "Cancel _Drag"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1063
+#, c-format
+msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2032
+#: ../mail/em-folder-tree.c:2107
 msgid "Open in _New Window"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2036
-msgid "_Copy..."
+#. FIXME: need to disable for nochildren folders
+#: ../mail/em-folder-tree.c:2112
+msgid "_New Folder..."
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2037
+#: ../mail/em-folder-tree.c:2115
 msgid "_Move..."
 msgstr ""
 
-#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2041
-msgid "_New Folder..."
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
+#, fuzzy
+msgid "Re_fresh"
+msgstr "Osvježi"
+
+#: ../mail/em-folder-tree.c:2124
+msgid "Fl_ush Outbox"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2044 ../ui/evolution-mail-list.xml.h:30
-msgid "_Rename..."
+#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
+msgid "_Empty Trash"
 msgstr ""
 
-#: ../mail/em-folder-utils.c:104
+#: ../mail/em-folder-tree.c:2232
+#, fuzzy
+msgid "_Unread Search Folder"
+msgstr "_Pretrage"
+
+#: ../mail/em-folder-utils.c:99
 #, fuzzy, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopiram stavke"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:931
-#: ../mail/em-folder-view.c:946 ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
+#: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder"
 msgstr ""
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:946
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr ""
 
-#: ../mail/em-folder-utils.c:503
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr ""
-
-#: ../mail/em-folder-utils.c:505
-msgid "Rename Folder"
-msgstr ""
-
-#: ../mail/em-folder-utils.c:511
-msgid "Folder names cannot contain '/'"
-msgstr ""
-
-#: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:537
+#: ../plugins/groupwise-features/share-folder-common.c:144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr ""
 
-#: ../mail/em-folder-utils.c:730
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr ""
 
-#: ../mail/em-folder-utils.c:730
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:546 ../mail/em-popup.c:557
-msgid "Reply to _All"
-msgstr ""
-
-#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
-msgid "_Reply to Sender"
+#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
+msgid "Mail Deletion Failed"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
-#: ../ui/evolution-mail-message.xml.h:108
-msgid "_Forward"
-msgstr ""
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
+#, fuzzy
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "Nisam mogao dobaviti informacije šeme za LDAP server."
 
-#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
+#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:1050
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:1055
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1056
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1057
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1058
-msgid "_Mark as Unimportant"
-msgstr ""
+#: ../mail/em-folder-view.c:1349
+#, fuzzy
+msgid "Mark as Un_important"
+msgstr "Uvezi..."
 
-#: ../mail/em-folder-view.c:1059
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1060
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1061
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:1069
+#: ../mail/em-folder-view.c:1354
+#, fuzzy
+msgid "_Label"
+msgstr "_Uključi"
+
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:469
+#, fuzzy
+msgid "_None"
+msgstr "Nijedan"
+
+#: ../mail/em-folder-view.c:1358
+msgid "_New Label"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1070
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1073
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1074
+#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
+#: ../mail/em-folder-view.c:1368
 #, fuzzy
-msgid "Search Folder from _Subject"
+msgid "Search Folder based on _Subject"
 msgstr "_Pretrage"
 
-#: ../mail/em-folder-view.c:1075
+#: ../mail/em-folder-view.c:1369
 #, fuzzy
-msgid "Search Folder from Se_nder"
+msgid "Search Folder based on Se_nder"
 msgstr "_Pretrage"
 
-#: ../mail/em-folder-view.c:1076
+#: ../mail/em-folder-view.c:1370
 #, fuzzy
-msgid "Search Folder from _Recipients"
+msgid "Search Folder based on _Recipients"
 msgstr "_Pretrage"
 
-#: ../mail/em-folder-view.c:1077
+#: ../mail/em-folder-view.c:1371
 #, fuzzy
-msgid "Search Folder from Mailing _List"
+msgid "Search Folder based on Mailing _List"
 msgstr "Napravi novu listu kontakata"
 
-#: ../mail/em-folder-view.c:1081
-msgid "Filter on Sub_ject"
+#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
+#: ../mail/em-folder-view.c:1376
+msgid "Filter based on Sub_ject"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1082
-msgid "Filter on Sen_der"
+#: ../mail/em-folder-view.c:1377
+msgid "Filter based on Sen_der"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1083
-msgid "Filter on Re_cipients"
+#: ../mail/em-folder-view.c:1378
+msgid "Filter based on Re_cipients"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1084
-msgid "Filter on _Mailing List"
-msgstr ""
+#: ../mail/em-folder-view.c:1379
+#, fuzzy
+msgid "Filter based on _Mailing List"
+msgstr "Napravi novu listu kontakata"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1921 ../mail/em-folder-view.c:1965
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:593
+#: ../plugins/google-account-setup/google-source.c:764
 msgid "Default"
 msgstr ""
 
-#: ../mail/em-folder-view.c:2064
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-#: ../plugins/print-message/print-message.c:87
-msgid "Print Message"
-msgstr ""
-
-#: ../mail/em-folder-view.c:2220
+#: ../mail/em-folder-view.c:2493
 #, fuzzy
 msgid "Unable to retrieve message"
 msgstr "Nisam mogao primiti poruku"
 
-#: ../mail/em-folder-view.c:2413
-msgid "_Copy Link Location"
-msgstr ""
-
-#: ../mail/em-folder-view.c:2415
+#: ../mail/em-folder-view.c:2696
 #, fuzzy
 msgid "Create _Search Folder"
 msgstr "_Pretrage"
 
-#: ../mail/em-folder-view.c:2416
+#: ../mail/em-folder-view.c:2697
 msgid "_From this Address"
 msgstr ""
 
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2698
 #, fuzzy
 msgid "_To this Address"
 msgstr "_Adresa:"
 
-#: ../mail/em-folder-view.c:2698
+#: ../mail/em-folder-view.c:3191
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
-#. message-search popup match count string
-#: ../mail/em-format-html-display.c:445
-#, c-format
-msgid "Matches: %d"
+#: ../mail/em-folder-view.c:3203
+#, fuzzy, c-format
+msgid "Click to call %s"
+msgstr "Kliknite za otvaranje %s"
+
+#: ../mail/em-folder-view.c:3208
+msgid "Click to hide/unhide addresses"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:560 ../mail/em-format-html.c:654
 msgid "Unsigned"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:696
+#: ../mail/em-format-html-display.c:560
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:561 ../mail/em-format-html.c:655
 msgid "Valid signature"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:697
+#: ../mail/em-format-html-display.c:561
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:562 ../mail/em-format-html.c:656
 msgid "Invalid signature"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:698
+#: ../mail/em-format-html-display.c:562
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:699
-msgid "Valid signature, cannot verify sender"
+#: ../mail/em-format-html-display.c:563 ../mail/em-format-html.c:657
+msgid "Valid signature, but cannot verify sender"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:699
+#: ../mail/em-format-html-display.c:563
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:705 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:564 ../mail/em-format-html.c:658
+msgid "Signature exists, but need public key"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:564
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:664
 msgid "Unencrypted"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:705
+#: ../mail/em-format-html-display.c:571
 msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
+"This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:665
 msgid "Encrypted, weak"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:706
+#: ../mail/em-format-html-display.c:572
 msgid ""
-"This message is encrypted, but with a weak encryption algorithm.  It would "
-"be difficult, but not impossible for an outsider to view the content of this "
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:666
 msgid "Encrypted"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:707
+#: ../mail/em-format-html-display.c:573
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:574 ../mail/em-format-html.c:667
 msgid "Encrypted, strong"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:708
+#: ../mail/em-format-html-display.c:574
 msgid ""
-"This message is encrypted, with a strong encryption algorithm.  It would be "
+"This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:809 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:675 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:824
+#: ../mail/em-format-html-display.c:690
 msgid "This certificate is not viewable"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1106
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr ""
+#: ../mail/em-format-html-display.c:980
+#, fuzzy
+msgid "Completed on"
+msgstr "Završeno "
 
-#: ../mail/em-format-html-display.c:1114
+#: ../mail/em-format-html-display.c:988
 msgid "Overdue:"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1117
-msgid "by %B %d, %Y, %l:%M %p"
+#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/em-format-html-display.c:992
+msgid "by"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1177
+#: ../mail/em-format-html-display.c:1071
+#: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1178
+#: ../mail/em-format-html-display.c:1072
+#: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1179
+#: ../mail/em-format-html-display.c:1073
 #, fuzzy
 msgid "_Fit to Width"
 msgstr "Širina izrezanog"
 
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1074
 msgid "Show _Original Size"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1550
-msgid "Attachment Button"
-msgstr ""
-
-#: ../mail/em-format-html-display.c:1757
+#: ../mail/em-format-html-display.c:1575 ../mail/em-format-html-display.c:1614
 #, fuzzy
-msgid "Select folder to save all attachments..."
-msgstr "Snimi kao..."
-
-#: ../mail/em-format-html-display.c:1796
-msgid "Select folder to save selected attachments..."
-msgstr ""
+msgid "View _Unformatted"
+msgstr "Format vremena:"
 
-#: ../mail/em-format-html-display.c:1804
+#: ../mail/em-format-html-display.c:1577
 #, fuzzy
-msgid "Save Selected..."
-msgstr "Izabrano"
-
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1871
-#, fuzzy, c-format
-msgid "%d attachment"
-msgid_plural "%d attachments"
-msgstr[0] "Dodaj kolonu..."
-msgstr[1] "Dodaj kolonu..."
-msgstr[2] "Dodaj kolonu..."
+msgid "Hide _Unformatted"
+msgstr "Format vremena:"
 
-#: ../mail/em-format-html-display.c:1935
+#: ../mail/em-format-html-display.c:1634
 #, fuzzy
-msgid "No Attachment"
-msgstr "Snimi sastanak"
+msgid "O_pen With"
+msgstr "Ulazna datoteka"
 
-#: ../mail/em-format-html-display.c:1938
-#, fuzzy
-msgid "Save All"
-msgstr "Ukloni sve"
+#: ../mail/em-format-html-display.c:1711
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
 
-#: ../mail/em-format-html-print.c:130
+#: ../mail/em-format-html-print.c:157
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: ../mail/em-format-html.c:473 ../mail/em-format-html.c:475
+#: ../mail/em-format-html.c:505 ../mail/em-format-html.c:514
 #, c-format
 msgid "Retrieving `%s'"
 msgstr ""
 
-#: ../mail/em-format-html.c:600
-msgid "Valid signature but cannot verify sender"
-msgstr ""
+#: ../mail/em-format-html.c:929
+#, fuzzy
+msgid "Unknown external-body part."
+msgstr "(Nepoznata greška)"
 
-#: ../mail/em-format-html.c:870
+#: ../mail/em-format-html.c:937
 msgid "Malformed external-body part."
 msgstr ""
 
-#: ../mail/em-format-html.c:900
+#: ../mail/em-format-html.c:967
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: ../mail/em-format-html.c:911
+#: ../mail/em-format-html.c:978
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: ../mail/em-format-html.c:913
+#: ../mail/em-format-html.c:980
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:1001
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: ../mail/em-format-html.c:945
+#: ../mail/em-format-html.c:1012
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: ../mail/em-format-html.c:1171
+#: ../mail/em-format-html.c:1240
 msgid "Formatting message"
 msgstr ""
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
-msgid "From"
-msgstr ""
-
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:84
-msgid "Reply-To"
-msgstr ""
-
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:85
-#: ../mail/message-list.etspec.h:14
-msgid "To"
-msgstr ""
+#: ../mail/em-format-html.c:1414
+#, fuzzy
+msgid "Formatting Message..."
+msgstr "Potpisujem poruku"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1567 ../mail/em-format-html.c:1631
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr ""
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1637
+#: ../mail/em-format-html.c:1655 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr ""
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:987
+#: ../mail/em-format-html.c:1747 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1435
 msgid "Mailer"
 msgstr ""
 
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1603
-msgid "<I> (%a, %R %Z)</I>"
+#. To translators: This message suggests to the receipients that the sender of the mail is
+#. different from the one listed in From field.
+#.
+#: ../mail/em-format-html.c:1910
+#, c-format
+msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr ""
 
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1606
-msgid "<I> (%R %Z)</I>"
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
+#: ../mail/em-mailer-prefs.c:77
+msgid "Reply-To"
 msgstr ""
 
-#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
-#: ../mail/message-list.etspec.h:2
+#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:82
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:338
 msgid "Date"
 msgstr ""
 
-#: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr ""
 
-#: ../mail/em-format.c:1102
+#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:84
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
+#, fuzzy
+msgid "Face"
+msgstr "Francuska"
+
+#: ../mail/em-format.c:1201
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1288 ../mail/em-format.c:1575
+#: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: ../mail/em-format.c:1270 ../mail/em-format.c:1426
+#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: ../mail/em-format.c:1278
+#: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: ../mail/em-format.c:1445
+#: ../mail/em-format.c:1394
+msgid "Could not parse PGP/MIME message"
+msgstr ""
+
+#: ../mail/em-format.c:1394
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr ""
+
+#: ../mail/em-format.c:1552
 msgid "Unsupported signature format"
 msgstr ""
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
 msgid "Error verifying signature"
 msgstr ""
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
 msgid "Unknown error verifying signature"
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:101
+#: ../mail/em-format.c:1772
+#, fuzzy
+msgid "Could not parse PGP message"
+msgstr "Ne mogu otvoriti izvor"
+
+#: ../mail/em-format.c:1772
+msgid "Could not parse PGP message: Unknown error"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr ""
 
-#: ../mail/em-migrate.c:1198
+#: ../mail/em-mailer-prefs.c:332
+msgid "Add Custom Junk Header"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:336
+#, fuzzy
+msgid "Header Name:"
+msgstr "_Puno ime:"
+
+#: ../mail/em-mailer-prefs.c:337
+msgid "Header Value Contains:"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:438 ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "Zaglavlje"
+
+#: ../mail/em-mailer-prefs.c:442
+msgid "Contains Value"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:465
+#, fuzzy
+msgid "Color"
+msgstr "_Boja:"
+
+#: ../mail/em-mailer-prefs.c:468
+msgid "Tag"
+msgstr ""
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1063 ../mail/em-mailer-prefs.c:1117
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr ""
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1071 ../mail/em-mailer-prefs.c:1126
+#, c-format
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
+"%s plugin is not available. Please check whether the package is installed."
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:1092
+#, fuzzy
+msgid "No Junk plugin available"
+msgstr "Opis ne postoji."
+
+#: ../mail/em-mailer-prefs.c:1455
+#, fuzzy
+msgid "Date header:"
+msgstr "Adapter za ETree tabelu"
+
+#. green
+#: ../mail/em-migrate.c:961
+msgid "To Do"
+msgstr ""
+
+#. blue
+#: ../mail/em-migrate.c:962
+msgid "Later"
 msgstr ""
 
-#: ../mail/em-migrate.c:1632
+#: ../mail/em-migrate.c:1128
+#, fuzzy
+msgid "Migration"
+msgstr "Migriranje..."
+
+#: ../mail/em-migrate.c:1573
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:1658
+#: ../mail/em-migrate.c:1599
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:1843
+#: ../mail/em-migrate.c:1784
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2047
+#: ../mail/em-migrate.c:1789
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../mail/em-migrate.c:1990
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2061
+#: ../mail/em-migrate.c:2004
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:2033
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
+#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2693
+#: ../mail/em-migrate.c:2874
+#, fuzzy
+msgid "Migrating Folders"
+msgstr "Migriram `%s':"
+
+#: ../mail/em-migrate.c:2874
+#, fuzzy
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Lokacija i hijerarhija Evolution zadatak je promjenjena u odnosu na "
+"Evolution 1.x.\n"
+"\n"
+"Molim pričekajte dok Evolution ne migrira vaše direktorije..."
+
+#: ../mail/em-migrate.c:2955
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2711
+#: ../mail/em-migrate.c:2974
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: ../mail/em-popup.c:399
+#: ../mail/em-popup.c:364
 msgid "Save As..."
 msgstr ""
 
-#: ../mail/em-popup.c:424
+#: ../mail/em-popup.c:389
 #, c-format
 msgid "untitled_image.%s"
 msgstr ""
 
-#: ../mail/em-popup.c:542 ../mail/em-popup.c:553
+#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
 msgid "Set as _Background"
 msgstr ""
 
-#: ../mail/em-popup.c:544 ../mail/em-popup.c:555
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr ""
 
-#: ../mail/em-popup.c:545 ../mail/em-popup.c:556
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply to _List"
 msgstr ""
 
-#: ../mail/em-popup.c:607
-msgid "_Open Link in Browser"
-msgstr ""
-
-#: ../mail/em-popup.c:608
+#. make it first item
+#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
 #, fuzzy
-msgid "_Send New Message To..."
-msgstr "Pošalji poruku kontaktu"
-
-#: ../mail/em-popup.c:609
-msgid "_Add to Addressbook"
-msgstr ""
+msgid "_Add to Address Book"
+msgstr "_Dodaj adresar"
 
-#: ../mail/em-popup.c:762
+#: ../mail/em-popup.c:725
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: ../mail/em-subscribe-editor.c:614
+#: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr ""
 
-#: ../mail/em-subscribe-editor.c:647
+#: ../mail/em-subscribe-editor.c:643
 msgid "Folder"
 msgstr ""
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:862
+#: ../mail/em-subscribe-editor.c:858
 msgid "Please select a server."
 msgstr ""
 
-#: ../mail/em-subscribe-editor.c:883
+#: ../mail/em-subscribe-editor.c:894
 msgid "No server has been selected"
 msgstr ""
 
-#: ../mail/em-utils.c:105
-msgid "Don't show this message again."
-msgstr ""
+#. Check buttons
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
+#, fuzzy
+msgid "_Do not show this message again."
+msgstr "Ne pitaj me ponovno."
 
-#: ../mail/em-utils.c:299
-msgid "Filters"
-msgstr ""
+#: ../mail/em-utils.c:317
+#, fuzzy
+msgid "Message Filters"
+msgstr "Poruka"
 
-#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr ""
 
-#: ../mail/em-utils.c:614
+#: ../mail/em-utils.c:652
 msgid "Save Message..."
 msgstr ""
 
-#: ../mail/em-utils.c:663
+#: ../mail/em-utils.c:702
 msgid "Add address"
 msgstr ""
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1142
+#: ../mail/em-utils.c:1223
 #, c-format
 msgid "Messages from %s"
 msgstr ""
 
-#: ../mail/em-vfolder-editor.c:104
+#: ../mail/em-vfolder-editor.c:114
 #, fuzzy
 msgid "Search _Folders"
 msgstr "_Pretrage"
 
-#: ../mail/em-vfolder-rule.c:574
+#: ../mail/em-vfolder-rule.c:592
 #, fuzzy
 msgid "Search Folder source"
 msgstr "_Pretrage"
 
-#: ../mail/evolution-mail.schemas.in.in.h:1
-msgid "Automatic link recognition"
+#: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Send and Receive Mail\" window width"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:2
-msgid "Automatic smiley recognition"
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "Allows Evolution to display text part of limited size"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:5
+#, fuzzy
+msgid "Always request read receipt"
+msgstr "Obavezan učesnik"
+
+#: ../mail/evolution-mail.schemas.in.h:7
+#, fuzzy
+msgid "Automatic emoticon recognition"
+msgstr "Nema kontakata"
+
+#: ../mail/evolution-mail.schemas.in.h:8
+msgid "Automatic link recognition"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:14
+msgid "Composer load/attach directory"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:15
+msgid "Compress display of addresses in TO/CC/BCC"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:16
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid "Custom headers to use while checking for junk."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
-msgid "Default height of the Composer Window"
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Default height of the Composer Window."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
-msgid "Default height of the Message Window"
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid "Default height of the message window."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
-msgid "Default height of the Subscribe dialog"
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Default height of the subscribe dialog."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
-msgid "Default width of the Composer Window"
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid "Default value for thread expand state"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:30
+msgid "Default width of the Composer Window."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid "Default width of the message window."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid "Default width of the subscribe dialog."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Determines whether to lookup in address book for sender email"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:35
+msgid ""
+"Determines whether to lookup the sender email in address book. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:36
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:37
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:38
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
-msgid "Default width of the Message Window"
+#: ../mail/evolution-mail.schemas.in.h:39
+msgid "Directory for loading/attaching files to composer."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
-msgid "Default width of the Subscribe dialog"
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Directory for saving mail component files."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "Empty Junk folders on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:47
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:49
+msgid "Enable or disable magic space bar"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:51
+msgid "Enable or disable type ahead search feature"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:52
+#, fuzzy
+msgid "Enable search folders"
+msgstr "_Pretrage"
+
+#: ../mail/evolution-mail.schemas.in.h:53
+msgid "Enable search folders on startup."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:54
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:56
+msgid "Enable to render message text part of limited size."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:58 ../mail/mail-config.glade.h:86
+msgid "Encode file names in an Outlook/GMail way"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid ""
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid "Hides the per-folder preview and removes the selection"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:64
+msgid ""
+"If the \"Preview\" pane is on, then show it side-by-side rather than "
+"vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:65
+msgid ""
+"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
+"any MIME types appearing in this list which map to a Bonobo component viewer "
+"in GNOME's MIME type database may be used for displaying content."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:67
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:68
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
-"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
-"any mime-types appearing in this list which map to a bonobo-component viewer "
-"in GNOME's mime-type database may be used for displaying content."
+"It disables/enables the repeated prompts to ask if offline sync is required "
+"before going into offline mode."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "Last time empty junk was run"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Last time empty trash was run"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of Labels and their associated colors"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accepted licenses"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of accounts"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
-msgid "List of mime types to check for bonobo component viewers"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "List of protocol names whose license has been accepted."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
-msgid "Load images for HTML messages over http"
+#: ../mail/evolution-mail.schemas.in.h:83
+msgid "Load images for HTML messages over HTTP"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net 1 - Load images in mail from contacts 2 - Always "
-"load images off the net"
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default height"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message Window default width"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
-msgid "Message-display style (normal, full headers, source)"
+#: ../mail/evolution-mail.schemas.in.h:95
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:96
+msgid "Minimum days between emptying the junk on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
-msgid "Minimum time between emptying the trash on exit, in days."
+#: ../mail/evolution-mail.schemas.in.h:98
+msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
-msgid "New Mail Notify sound file"
+#: ../mail/evolution-mail.schemas.in.h:99
+msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
-msgid "New Mail Notify type"
+#: ../mail/evolution-mail.schemas.in.h:100
+msgid "Number of addresses to display in TO/CC/BCC"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Prompt to check if the user wants to go offline immediately"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:105
+msgid "Prompt when deleting messages in search folder"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid "Prompt while marking multiple messages"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Put personalized signatures at the top of replies"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Put the cursor at the bottom of replies"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid "Recognize emoticons in text and replace them with images."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
-msgid "Recognize smileys in text and replace them with images."
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid "Run junk test on incoming mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
-msgid "Run junk test on incoming mail"
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Save directory"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:119
+msgid "Search for the sender photo in local address books"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Send HTML mail by default"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Send HTML mail by default."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:122
+#, fuzzy
+msgid "Sender email-address column in the message list"
+msgstr "Ukloni email adresu iz liste"
+
+#: ../mail/evolution-mail.schemas.in.h:123
+msgid "Server synchronization interval"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Show \"From\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Show Animations"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Show animated images as animations."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Show deleted messages in the message-list"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Show the \"Preview\" pane"
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Show image animations"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Show the \"Preview\" pane."
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "Show photo of the sender"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid ""
+"Show the \"From\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
-msgid "Sound file to play when new mail arrives."
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
-msgid "Specifies the type of New Mail Notification the user wishes to use."
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:144
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid "Show the photo of the sender in the message reading pane."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Spell check inline"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:147
+msgid "Spell checking color"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:148
+msgid "Spell checking languages"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Subscribe dialog default height"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Subscribe dialog default width"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Terminal font"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
-msgid "The last time empty trash was run, in days since the epoch."
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:152
+#, fuzzy
+msgid "Text message part limit"
+msgstr "Pošalji poruku kontaktu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
-msgid "The terminal font for mail display"
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid "The default plugin for Junk hook"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
-msgid "The variable width font for mail display"
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid "The last time empty junk was run, in days since the epoch."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
-msgid ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
+#: ../mail/evolution-mail.schemas.in.h:155
+msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
-msgid "Thread the message list."
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "The terminal font for mail display."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
-msgid "Thread the message-list"
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "The variable width font for mail display."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
-msgid "Thread the message-list based on Subject"
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
-msgid "Timeout for marking message as Seen"
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid ""
+"This decides the max size of the text part that can be formatted under "
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
-msgid "Timeout for marking message as Seen."
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won't fall back "
+"to the other available plugins."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
-msgid "UID string of the default account."
+#: ../mail/evolution-mail.schemas.in.h:161
+msgid ""
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
-msgid "Use Spamassassin daemon and client"
+#: ../mail/evolution-mail.schemas.in.h:162
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
-msgid "Use Spamassassin daemon and client (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:163
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local address book only to exclude "
+"mail sent by known contacts from junk filtering."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
-msgid "Use custom fonts"
+#: ../mail/evolution-mail.schemas.in.h:164
+msgid "This option would help in improving the speed of fetching."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
-msgid "Use custom fonts for displaying mail"
+#: ../mail/evolution-mail.schemas.in.h:165
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
-msgid "Use only local spam tests."
+#: ../mail/evolution-mail.schemas.in.h:166
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
-msgid "Use only the local spam tests (no DNS)."
+#: ../mail/evolution-mail.schemas.in.h:167
+msgid ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message's date. Evolution requires a "
+"restart."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
-msgid "Variable width font"
+#: ../mail/evolution-mail.schemas.in.h:168
+msgid "Thread the message list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
-msgid "View/Bcc menu item is checked"
+#: ../mail/evolution-mail.schemas.in.h:169
+msgid "Thread the message-list"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
-msgid "View/Bcc menu item is checked."
+#: ../mail/evolution-mail.schemas.in.h:170
+msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
-msgid "View/Cc menu item is checked"
+#: ../mail/evolution-mail.schemas.in.h:171
+msgid "Timeout for marking message as seen"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
-msgid "View/Cc menu item is checked."
+#: ../mail/evolution-mail.schemas.in.h:172
+msgid "Timeout for marking message as seen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
-msgid "View/From menu item is checked"
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid "UID string of the default account."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
-msgid "View/From menu item is checked."
+#: ../mail/evolution-mail.schemas.in.h:174
+msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
-msgid "View/PostTo menu item is checked"
+#: ../mail/evolution-mail.schemas.in.h:175
+msgid "Use SpamAssassin daemon and client"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
-msgid "View/PostTo menu item is checked."
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
-msgid "View/ReplyTo menu item is checked"
+#: ../mail/evolution-mail.schemas.in.h:177
+msgid "Use custom fonts"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
-msgid "View/ReplyTo menu item is checked."
+#: ../mail/evolution-mail.schemas.in.h:178
+msgid "Use custom fonts for displaying mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid "Use only local spam tests."
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:193
-msgid "Importing Elm data"
+#: ../mail/evolution-mail.schemas.in.h:180
+msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:382
-msgid "Evolution Elm importer"
+#: ../mail/evolution-mail.schemas.in.h:181
+msgid "Use side-by-side or wide layout"
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:383
-msgid "Import mail from Elm."
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
 msgstr ""
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../mail/importers/evolution-outlook-importer.c:131
-msgid "Destination folder:"
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
 msgstr ""
 
-#: ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
-msgid "Select folder to import into"
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "Variable width font"
 msgstr ""
 
-#: ../mail/importers/evolution-mbox-importer.c:216
-msgid "Berkeley Mailbox (mbox)"
+#: ../mail/evolution-mail.schemas.in.h:185
+msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 
-#: ../mail/importers/evolution-mbox-importer.c:217
-msgid "Importer Berkeley Mailbox format folders"
+#: ../mail/evolution-mail.schemas.in.h:186
+msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 
-#: ../mail/importers/evolution-outlook-importer.c:257
-#: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
-#, c-format
-msgid "Importing `%s'"
+#: ../mail/evolution-mail.schemas.in.h:187
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
 msgstr ""
 
-#: ../mail/importers/evolution-outlook-importer.c:259
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Importing..."
+#: ../mail/evolution-mail.schemas.in.h:188
+msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 
-#: ../mail/importers/evolution-outlook-importer.c:261
-#: ../mail/importers/netscape-importer.c:1253
-#: ../plugins/startup-wizard/startup-wizard.c:236
-#: ../shell/e-shell-importer.c:523
-msgid "Please wait"
+#: ../mail/evolution-mail.schemas.in.h:189
+msgid "Width of the message-list pane"
 msgstr ""
 
-#: ../mail/importers/evolution-outlook-importer.c:305
-#: ../mail/importers/mail-importer.c:144
-msgid "Importing mailbox"
+#: ../mail/evolution-mail.schemas.in.h:190
+msgid "Width of the message-list pane."
 msgstr ""
 
-#: ../mail/importers/mail-importer.c:373
-#, c-format
-msgid "Scanning %s"
+#: ../mail/importers/elm-importer.c:182
+msgid "Importing Elm data"
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:73
-#, c-format
-msgid "Priority Filter \"%s\""
+#: ../mail/importers/elm-importer.c:367
+msgid "Evolution Elm importer"
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:662
-msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
+#: ../mail/importers/elm-importer.c:368
+msgid "Import mail from Elm."
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:686
-msgid ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
+#: ../mail/importers/evolution-mbox-importer.c:79
+#: ../plugins/pst-import/pst-importer.c:309
+msgid "Destination folder:"
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:703
-msgid ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
+#: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:302
+msgid "Select folder to import into"
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:1250
-msgid "Evolution is importing your old Netscape data"
+#: ../mail/importers/evolution-mbox-importer.c:219
+msgid "Berkeley Mailbox (mbox)"
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:1707
-msgid "Importing Netscape data"
+#: ../mail/importers/evolution-mbox-importer.c:220
+msgid "Importer Berkeley Mailbox format folders"
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:1907
-msgid "Settings"
+#: ../mail/importers/mail-importer.c:147
+msgid "Importing mailbox"
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:1912
-msgid "Mail Filters"
+#. Destination folder, was set in our widget
+#: ../mail/importers/mail-importer.c:231
+#: ../plugins/pst-import/pst-importer.c:454
+#: ../plugins/pst-import/pst-importer.c:560 ../shell/e-shell-importer.c:555
+#, c-format
+msgid "Importing `%s'"
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:1933
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
+#: ../mail/importers/mail-importer.c:371
+#, c-format
+msgid "Scanning %s"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:230
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:435
+#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr ""
 
-#: ../mail/mail-autofilter.c:78
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: ../mail/mail-autofilter.c:265
+#: ../mail/mail-autofilter.c:258
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: ../mail/mail-autofilter.c:300
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: ../mail/mail-autofilter.c:369
+#: ../mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr ""
 
-#: ../mail/mail-component.c:509
+#: ../mail/mail-component.c:573
+#, fuzzy, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] ", %d izabrani"
+msgstr[1] ", %d izabrana"
+msgstr[2] ", %d izabranih"
+
+#: ../mail/mail-component.c:577
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/mail-component.c:511
+#: ../mail/mail-component.c:584
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/mail-component.c:534
+#: ../mail/mail-component.c:587
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:589
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:591
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:597
 #, c-format
-msgid "%d total"
-msgid_plural "%d total"
+msgid "%d unread, "
+msgid_plural "%d unread, "
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:598
 #, c-format
-msgid ", %d unread"
-msgid_plural ", %d unread"
+msgid "%d total"
+msgid_plural "%d total"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/mail-component.c:765
+#: ../mail/mail-component.c:952
 msgid "New Mail Message"
 msgstr ""
 
-#: ../mail/mail-component.c:766
+#: ../mail/mail-component.c:953
+#, fuzzy
+msgctxt "New"
 msgid "_Mail Message"
-msgstr ""
+msgstr "Poruka servera:"
 
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:954
 msgid "Compose a new mail message"
 msgstr ""
 
-#: ../mail/mail-component.c:773
+#: ../mail/mail-component.c:960
 msgid "New Mail Folder"
 msgstr ""
 
-#: ../mail/mail-component.c:774
+#: ../mail/mail-component.c:961
+#, fuzzy
+msgctxt "New"
 msgid "Mail _Folder"
-msgstr ""
+msgstr "_Pretrage"
 
-#: ../mail/mail-component.c:775
+#: ../mail/mail-component.c:962
 msgid "Create a new mail folder"
 msgstr ""
 
-#: ../mail/mail-component.c:919
+#: ../mail/mail-component.c:1109
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-config.glade.h:2
-msgid " Ch_eck for Supported Types "
+#: ../mail/mail-config.glade.h:1
+msgid "(Note: Requires restart of the application)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:3
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr ""
 
+#: ../mail/mail-config.glade.h:4
+#, fuzzy
+msgid "<b>Sender Photograph</b>"
+msgstr "<b>Opcije</b>"
+
 #: ../mail/mail-config.glade.h:5
-msgid "<b>S_ignatures</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Sig_natures</b>"
+msgstr "<b>Ponovi</b>"
 
 #: ../mail/mail-config.glade.h:6
-msgid "<b>_Languages</b>"
+msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:7
-msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgid "<b>_Languages</b>"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr ""
-
 #: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
@@ -12573,78 +13457,78 @@ msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:17
-msgid "<span weight=\"bold\">Filter Options</span>"
-msgstr ""
+#, fuzzy
+msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+msgstr "<span weight=\"bold\">Status</span>"
 
 #: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1977
-msgid "<span weight=\"bold\">General</span>"
-msgstr ""
+#, fuzzy
+msgid "<span weight=\"bold\">Labels</span>"
+msgstr "<span weight=\"bold\">Status</span>"
 
 #: ../mail/mail-config.glade.h:19
-msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:22
 #, fuzzy
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Status</span>"
 
+#: ../mail/mail-config.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:3
+msgid "<span weight=\"bold\">Optional Information</span>"
+msgstr ""
+
 #: ../mail/mail-config.glade.h:24
-msgid "<span weight=\"bold\">New Mail Notification</span>"
+msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:25
-msgid "<span weight=\"bold\">Optional Information</span>"
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:26
-msgid "<span weight=\"bold\">Options</span>"
+msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:27
-msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr ""
+#, fuzzy
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">Status</span>"
 
 #: ../mail/mail-config.glade.h:28
-msgid "<span weight=\"bold\">Printed Fonts</span>"
+msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:29
-msgid "<span weight=\"bold\">Required Information</span>"
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:30
-msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:31
-msgid "<span weight=\"bold\">Security</span>"
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:32
-msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:33
-msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr ""
+#, fuzzy
+msgid "<span weight=\"bold\">_Authentication Type</span>"
+msgstr "<span weight=\"bold\">Status</span>"
 
 #: ../mail/mail-config.glade.h:35
 msgid "Account Management"
@@ -12663,7 +13547,7 @@ msgid "Al_ways sign outgoing messages when using this account"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:39
-msgid "Also encrypt to sel_f when sending encrypted mail"
+msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:40
@@ -12679,76 +13563,85 @@ msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:43
-msgid "Always encrypt to _myself when sending encrypted mail"
+msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
+#, fuzzy
+msgid "Always request rea_d receipt"
+msgstr "Obavezan učesnik"
+
+#: ../mail/mail-config.glade.h:45
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
+#: ../mail/mail-config.glade.h:48
+msgid ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:46
-msgid "Automatically _insert smiley images"
+#: ../mail/mail-config.glade.h:52
+msgid "Automatically insert _emoticon images"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:53
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:54
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:49
-msgid "Beep w_hen new mail arrives"
+#: ../mail/mail-config.glade.h:55
+msgid "C_haracter set:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:50
-msgid "C_haracter set:"
+#: ../mail/mail-config.glade.h:56
+#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+msgid "Ch_eck for Supported Types"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:51
-msgid "Ch_eck for Supported Types "
+#: ../mail/mail-config.glade.h:57
+msgid "Check cu_stom headers for junk"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:52
-msgid "Check _incoming mail for junk"
+#: ../mail/mail-config.glade.h:58
+msgid "Check incoming _messages for junk"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:59
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:60
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Cle_ar"
 msgstr "_Očisti"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Clea_r"
 msgstr "_Očisti"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:63
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:58
-msgid "Colors"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:64
 msgid "Confirm _when expunging a folder"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.glade.h:65
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12758,372 +13651,477 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:71
 msgid "De_fault"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.glade.h:72
 msgid "Default character e_ncoding:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:70
-msgid "Digitally _sign outgoing messages (by default)"
+#: ../mail/mail-config.glade.h:74
+msgid "Delete junk messages on e_xit"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:71
-msgid "Do not quote original message"
+#: ../mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr "Šifrujem poruku"
+
+#: ../mail/mail-config.glade.h:77
+msgid "Do not format messages when text si_ze exceeds"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:78
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:79
 msgid "Done"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:80
 msgid "Drafts _Folder:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:81
 msgid "Email Accounts"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:82
 msgid "Email _Address:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:83
 msgid "Empty trash folders on e_xit"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:84
+msgid "Enable Magic S_pacebar"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Enable Sea_rch Folders"
+msgstr "_Pretrage"
+
+#: ../mail/mail-config.glade.h:87
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Encrypt out_going messages (by default)"
 msgstr "Šifrujem poruku"
 
-#: ../mail/mail-config.glade.h:81
-msgid "Execute Command..."
+#: ../mail/mail-config.glade.h:90
+msgid "Fi_xed-width:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:82
-msgid "Fi_xed-width:"
+#: ../mail/mail-config.glade.h:91
+msgid "Fix_ed width Font:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:92
 msgid "Font Properties"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:93
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:86
-msgid "HTML Mail"
-msgstr ""
+#: ../mail/mail-config.glade.h:94
+#, fuzzy
+msgid "Full Nam_e:"
+msgstr "_Puno ime:"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:96
+#, fuzzy
+msgid "HTML Messages"
+msgstr "Poruka"
+
+#: ../mail/mail-config.glade.h:97
+#, fuzzy
+msgid "H_TTP Proxy:"
+msgstr "_Poštanski broj:"
+
+#: ../mail/mail-config.glade.h:98
 msgid "Headers"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:99
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:89
-msgid "I_nclude remote tests"
+#: ../mail/mail-config.glade.h:101
+msgid ""
+"If the server uses a non-standard port then specify the server address as "
+"\"server-name:port-number\""
 msgstr ""
 
-#: ../mail/mail-config.glade.h:92
-msgid "Inline"
+#: ../mail/mail-config.glade.h:103
+msgid "KB"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Labels"
+msgstr "Laos"
+
+#: ../mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Languages Table"
 msgstr "Jezik"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:106
 msgid "Mail Configuration"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Headers Table"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:109
 msgid "Mailbox location"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:110
 msgid "Message Composer"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:111
+msgid "No _Proxy for:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:112
+msgid ""
+"Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:113
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:114
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:115
 msgid "Or_ganization:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:116
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:106
-msgid "Play sound file when new mail arri_ves"
+#: ../mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Pass_word:"
+msgstr "Ši_fra:"
+
+#: ../mail/mail-config.glade.h:119
+msgid "Please configure the following account settings."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:120
 msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
+"Please enter a descriptive name for this account in the space below. This "
+"name will be used for display purposes only."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:121
 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 ""
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:122
 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 ""
 
-#: ../mail/mail-config.glade.h:111
-msgid "Please select among the following options"
-msgstr ""
+#: ../mail/mail-config.glade.h:123
+#, fuzzy
+msgid "Port:"
+msgstr "_Port:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:124
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:113
-msgid "Quote original message"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:114
-msgid "Quoted"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:125
 msgid "Re_member password"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:126
 msgid "Re_ply-To:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:128
 msgid "Remember _password"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:129
+msgid "S_earch for sender photograph only in local address books"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:130
 #, fuzzy
 msgid "S_elect..."
 msgstr "Izaberi"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:131
+#, fuzzy
+msgid "S_end message receipts:"
+msgstr "Pošalji poruku kontaktu"
+
+#: ../mail/mail-config.glade.h:132
 msgid "S_tandard Font:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:121
-#, fuzzy
-msgid "Se_lect..."
-msgstr "Izaberi"
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:127
-#, fuzzy
-msgid "Send message receipts:"
-msgstr "Pošalji poruku kontaktu"
-
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:132
-msgid "Server _Type: "
-msgstr ""
+#: ../mail/mail-config.glade.h:142
+#, fuzzy
+msgid "Server _Type:"
+msgstr "_Server:"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:143
 #, fuzzy
 msgid "Sig_ning certificate:"
 msgstr "Potpisujem poruku"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:137
-msgid "Specify _filename:"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:139
-msgid "T_erminal Font:"
+#: ../mail/mail-config.glade.h:148
+msgid "Start _typing at the bottom on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:140
-msgid "T_ype: "
-msgstr ""
+#: ../mail/mail-config.glade.h:149
+#, fuzzy
+msgid "T_ype:"
+msgstr "Vrsta:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
+"signature. The name you specify will be used for display purposes only."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:153
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:155
+#, fuzzy
+msgid "Us_ername:"
+msgstr "_Korisničko ime:"
+
+#: ../mail/mail-config.glade.h:156
+#, fuzzy
+msgid "Use Authe_ntication"
+msgstr "<b>Identifikacija</b>"
+
+#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:681
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:158
 msgid "V_ariable-width:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:159
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Forward\" to begin. "
+"Click \"Forward\" to begin."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:162
 msgid "_Add Signature"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:163
 msgid "_Always load images from the Internet"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:156
-msgid "_Do not notify me when new mail arrives"
+#: ../mail/mail-config.glade.h:164
+msgid "_Default junk plugin:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:157
-msgid "_Don't sign meeting requests (for Outlook compatibility)"
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:159
-msgid "_Forward style:"
+#: ../mail/mail-config.glade.h:166
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:160
-msgid "_Full Name:"
-msgstr "_Puno ime:"
+#: ../mail/mail-config.glade.h:168
+msgid "_Forward style:"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:161
-msgid "_Load images in mail from contacts"
+#: ../mail/mail-config.glade.h:169
+msgid "_Keep Signature above the original message on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:170
+#, fuzzy
+msgid "_Load images in messages from contacts"
+msgstr "Pošalji poruku kontaktu"
+
+#: ../mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Lookup in local address book only"
+msgstr "Izlistaj lokalne direktorije adresara"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
+#: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:172
-msgid "_Show animated images"
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Select..."
+msgstr "Izaberi"
+
+#. If enabled, show animation; if disabled, only display a static image without any animation
+#: ../mail/mail-config.glade.h:186
+msgid "_Show image animations"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:187
+msgid "_Show the photograph of sender in the message preview"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:188
+msgid "_Shrink To / Cc / Bcc headers to "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:189
 #, fuzzy
 msgid "_Use Secure Connection:"
 msgstr "_Koristi osiguranu vezu:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:194
+#, fuzzy
+msgid "addresses"
+msgstr "Adresa"
+
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr ""
 
+#: ../mail/mail-config.glade.h:197
+msgid "seconds"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:1
+msgid "    "
+msgstr "    "
+
 #: ../mail/mail-dialogs.glade.h:2
 #, fuzzy
 msgid "<b>Search Folder Sources</b>"
@@ -13138,640 +14136,695 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "Case _Sensitive"
+msgid "All active remote folders"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:6
 #, fuzzy
-msgid "Co_mpleted"
-msgstr "Završeno"
+msgid "All local and active remote folders"
+msgstr "Izlistaj lokalne direktorije adresara"
+
+#: ../mail/mail-dialogs.glade.h:7
+msgid "All local folders"
+msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:8
 #, fuzzy
-msgid "F_ind:"
-msgstr "_Nađi"
+msgid "Co_mpleted"
+msgstr "Završeno"
 
-#: ../mail/mail-dialogs.glade.h:9
-msgid "Find in Message"
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
+msgid "Flag to Follow Up"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:295
-#: ../mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
+#: ../mail/mail-dialogs.glade.h:10
+msgid "Folder Subscriptions"
 msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:11
-msgid "Folder Subscriptions"
+msgid "License Agreement"
 msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:12
-msgid "License Agreement"
+msgid "S_erver:"
 msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:13
-msgid "None Selected"
+msgid "Security Information"
 msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:14
-msgid "S_erver:"
-msgstr ""
+#, fuzzy
+msgid "Specific folders"
+msgstr "_Pretrage"
 
 #: ../mail/mail-dialogs.glade.h:15
-msgid "Security Information"
-msgstr ""
-
-#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:17
 #, fuzzy
 msgid "_Accept License"
 msgstr "Prihvaćeno"
 
-#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:18
 msgid "_Due By:"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:22
-msgid "_Subscribe"
-msgstr ""
-
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:24
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr ""
-
-#: ../mail/mail-dialogs.glade.h:25
-msgid "specific folders only"
-msgstr ""
-
-#: ../mail/mail-dialogs.glade.h:26
-msgid "with all active remote folders"
-msgstr ""
-
-#: ../mail/mail-dialogs.glade.h:27
-msgid "with all local and active remote folders"
-msgstr ""
-
-#: ../mail/mail-dialogs.glade.h:28
-msgid "with all local folders"
-msgstr ""
-
-#: ../mail/mail-folder-cache.c:855
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:102
-msgid "Filtering Folder"
-msgstr ""
+#: ../mail/mail-ops.c:107
+#, fuzzy
+msgid "Filtering Selected Messages"
+msgstr "Poruka servera:"
 
-#: ../mail/mail-ops.c:263
+#: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr ""
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:563
+#: ../mail/mail-ops.c:562
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
+#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: ../mail/mail-ops.c:621
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:733
+#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
+#, fuzzy
+msgid "Sending message"
+msgstr "Potpisujem poruku"
+
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: ../mail/mail-ops.c:758
+#: ../mail/mail-ops.c:761
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
-msgid "Cancelled."
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:701
+#, fuzzy
+msgid "Canceled."
 msgstr "Poništeno."
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:703
 msgid "Complete."
 msgstr ""
 
-#: ../mail/mail-ops.c:859
+#: ../mail/mail-ops.c:877
 msgid "Saving message to folder"
 msgstr ""
 
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1171
 msgid "Forwarded messages"
 msgstr ""
 
-#: ../mail/mail-ops.c:1210
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:1282
+#: ../mail/mail-ops.c:1277
+#, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:1360
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:1454
+#: ../mail/mail-ops.c:1535
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1519
+#: ../mail/mail-ops.c:1598
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1520
+#: ../mail/mail-ops.c:1599
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1575
+#: ../mail/mail-ops.c:1653
 msgid "Refreshing folder"
 msgstr ""
 
-#: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
 msgid "Expunging folder"
 msgstr ""
 
-#: ../mail/mail-ops.c:1659
+#: ../mail/mail-ops.c:1740
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1660
+#: ../mail/mail-ops.c:1741
 msgid "Local Folders"
 msgstr ""
 
-#: ../mail/mail-ops.c:1743
+#: ../mail/mail-ops.c:1822
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:1853
+#: ../mail/mail-ops.c:1931
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/mail-ops.c:1939
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/mail-ops.c:1989
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-
-#: ../mail/mail-ops.c:2017
+#: ../mail/mail-ops.c:2096
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2168
 msgid "Saving attachment"
 msgstr ""
 
-#: ../mail/mail-ops.c:2100
+#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2110
+#: ../mail/mail-ops.c:2209
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2376
-msgid "Checking Service"
-msgstr ""
-
-#: ../mail/mail-send-recv.c:158
-msgid "Cancelling..."
-msgstr ""
-
-#: ../mail/mail-send-recv.c:265
+#: ../mail/mail-ops.c:2450
 #, c-format
-msgid "Server: %s, Type: %s"
+msgid "Preparing account '%s' for offline"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:267
-#, c-format
-msgid "Path: %s, Type: %s"
+#: ../mail/mail-ops.c:2536
+msgid "Checking Service"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:269
-#, c-format
-msgid "Type: %s"
-msgstr ""
+#: ../mail/mail-send-recv.c:181
+#, fuzzy
+msgid "Canceling..."
+msgstr "Odustani"
 
-#: ../mail/mail-send-recv.c:320
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:327
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:416
+#: ../mail/mail-send-recv.c:503
 msgid "Updating..."
 msgstr ""
 
-#: ../mail/mail-send-recv.c:416 ../mail/mail-send-recv.c:468
+#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr ""
 
-#: ../mail/mail-send-recv.c:699
+#: ../mail/mail-send-recv.c:814
+#, c-format
 msgid "Checking for new mail"
 msgstr ""
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:210
+#, fuzzy, c-format
+msgid "Enter Passphrase for %s"
+msgstr "Unesite šifru za %s"
+
+#: ../mail/mail-session.c:212
+#, fuzzy
+msgid "Enter Passphrase"
+msgstr "Upišite šifru"
+
+#: ../mail/mail-session.c:215
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:217
 msgid "Enter Password"
 msgstr ""
 
-#: ../mail/mail-session.c:244
+#: ../mail/mail-session.c:259
 msgid "User canceled operation."
 msgstr ""
 
-#: ../mail/mail-signature-editor.c:372
-msgid "Edit signature"
+#: ../mail/mail-signature-editor.c:202
+msgid "_Save and Close"
 msgstr ""
 
-#: ../mail/mail-signature-editor.c:412
-msgid "Enter a name for this signature."
-msgstr ""
+#: ../mail/mail-signature-editor.c:356
+#, fuzzy
+msgid "Edit Signature"
+msgstr "Promijeni sastanak"
 
-#: ../mail/mail-signature-editor.c:415
-#: ../plugins/groupwise-features/properties.glade.h:5
-msgid "Name:"
+#: ../mail/mail-signature-editor.c:371
+msgid "_Signature Name:"
 msgstr ""
 
-#: ../mail/mail-tools.c:116
+#: ../mail/mail-tools.c:120
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr ""
 
-#: ../mail/mail-tools.c:143
+#: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr ""
 
-#: ../mail/mail-tools.c:242
+#: ../mail/mail-tools.c:256
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: ../mail/mail-tools.c:244
+#: ../mail/mail-tools.c:258
 msgid "Forwarded message"
 msgstr ""
 
-#: ../mail/mail-tools.c:284
+#: ../mail/mail-tools.c:298
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr ""
 
-#: ../mail/mail-vfolder.c:91
+#: ../mail/mail-vfolder.c:89
 #, fuzzy, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "_Pretrage"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:234
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr ""
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:241
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr ""
 
-#: ../mail/mail-vfolder.c:1046
+#: ../mail/mail-vfolder.c:1067
 #, fuzzy
 msgid "Edit Search Folder"
 msgstr "_Pretrage"
 
-#: ../mail/mail-vfolder.c:1130
+#: ../mail/mail-vfolder.c:1155
 #, fuzzy
 msgid "New Search Folder"
 msgstr "_Pretrage"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:2
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:3
 msgid ""
-"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"A non-empty folder at \"{1}\" already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
+"quit."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;.  Send "
-"the reciept notification to {0}?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:8
+msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:9
 #, fuzzy
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Sigurno želite izbrisati ovaj unos u dnevniku?"
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:11
+#, fuzzy
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr "Sigurno želite izbrisati ovaj unos u dnevniku?"
+
+#: ../mail/mail.error.xml.h:12
 #, fuzzy
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr ""
 "Sigurni ste da želite\n"
 "obrisati ovaj kontakt?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:14
+#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
+"folder \"{0}\"?"
 msgstr ""
+"Sigurni ste da želite\n"
+"obrisati ovaj kontakt?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:16
-msgid "Because &quot;{0}&quot;."
-msgstr ""
-
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{2}&quot;."
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:19
-#, fuzzy
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "Nisam mogao da napravim sadržaj za dešifrovanje"
-
 #: ../mail/mail.error.xml.h:20
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Because \"{2}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:21
-#, fuzzy
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "Nisam mogao da napravim sadržaj za dešifrovanje"
+msgid "Blank Signature"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot create temporary save directory."
-msgstr ""
+#, fuzzy
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "Nisam mogao da napravim sadržaj za dešifrovanje"
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr ""
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "Nisam mogao da napravim sadržaj za dešifrovanje"
 
 #: ../mail/mail.error.xml.h:25
-msgid "Cannot delete system folder &quot;{0}&quot;."
+msgid "Cannot create temporary save directory."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:26
-#, fuzzy
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "Nisam mogao da napravim sadržaj za dešifrovanje"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr ""
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr ""
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Nisam mogao da napravim sadržaj za dešifrovanje"
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr ""
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Ne mogu otvoriti datoteku"
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr ""
+#, fuzzy
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "Nisam mogao da napravim sadržaj za dešifrovanje"
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot open target &quot;{2}&quot;."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:31
-msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem.  You will not be able to use this provider until you can accept its "
-"license."
-msgstr ""
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "Ne mogu otvoriti izvor"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr ""
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "Ne mogu otvoriti izvor"
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr ""
+#, fuzzy
+msgid "Cannot open target \"{2}\"."
+msgstr "Ne mogu premjestiti kontakt."
 
 #: ../mail/mail.error.xml.h:34
-msgid "Cannot save changes to account."
+msgid ""
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot save to directory &quot;{0}&quot;."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:36
 #, fuzzy
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "Ne mogu snimiti \"{0}\"."
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Nisam mogao da napravim sadržaj za dešifrovanje"
 
 #: ../mail/mail.error.xml.h:37
-msgid "Cannot set signature script &quot;{0}&quot;."
+msgid "Cannot save changes to account."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:38
-msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Ne mogu snimiti \"{0}\"."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Could not save signature file."
-msgstr ""
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
+msgstr "Ne mogu snimiti \"{0}\"."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Delete &quot;{0}&quot;?"
+msgid "Cannot set signature script \"{0}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:41
-msgid "Delete account?"
-msgstr ""
+#, fuzzy
+msgid "Check Junk Failed"
+msgstr "Evolution alarm"
 
 #: ../mail/mail.error.xml.h:42
-msgid "Discard changed?"
+#, fuzzy
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
 msgstr ""
+"Provjerite da li je šifra ispravno unijeta i da li koristite podržani način "
+"prijave. Ne zaboravite da je veličina slova bitna u šiframa; moguće da je "
+"uključen 'Caps Lock'."
 
 #: ../mail/mail.error.xml.h:43
-msgid "Do you want the operation to be performed in the subfolders?"
+msgid "Could not save signature file."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:44
-msgid "Do you wish to save your changes?"
-msgstr ""
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "Obriši"
 
 #: ../mail/mail.error.xml.h:45
-msgid "Don't delete"
+msgid "Delete account?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:46
-msgid "Enter password."
+msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:47
+#, fuzzy
+msgid "Delete messages in Search Folder?"
+msgstr "_Pretrage"
+
+#: ../mail/mail.error.xml.h:48
+#, fuzzy
+msgid "Discard changes?"
+msgstr "Zanemari promjene"
+
+#: ../mail/mail.error.xml.h:49
+#, fuzzy
+msgid "Do not d_elete"
+msgstr "Unesi delegata"
+
+#: ../mail/mail.error.xml.h:50
+#, fuzzy
+msgid "Do not delete"
+msgstr "Unesi delegata"
+
+#: ../mail/mail.error.xml.h:51
+#, fuzzy
+msgid "Do not disable"
+msgstr "Isključi"
+
+#: ../mail/mail.error.xml.h:52
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:53
+#, fuzzy
+msgid "Do you want to mark all messages as read?"
+msgstr ""
+"Sigurni ste da želite\n"
+"obrisati ovaj kontakt?"
+
+#: ../mail/mail.error.xml.h:54
+msgid "Do you wish to save your changes?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:55
+msgid "Enter password."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:56
 msgid "Error loading filter definitions."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:57
 msgid "Error while performing operation."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:63
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13779,84 +14832,108 @@ msgid ""
 "recipient."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:63
-msgid "Mark all messages as read in the selected folder"
-msgstr ""
-
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:79
+msgid "Please enable the account or send using another account."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:83
+msgid "Please provide an unique name to identify this signature."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:74
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:78
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:90
+msgid "Report Junk Failed"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:91
+msgid "Report Not Junk Failed"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:93
 #, fuzzy
 msgid "Send Receipt"
 msgstr "Pošalji obavještenje"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:94
+#, fuzzy
+msgid "Signature Already Exists"
+msgstr "ID kontakta već postoji"
+
+#: ../mail/mail.error.xml.h:95
+msgid "Synchronize"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:96
+msgid "Synchronize folders locally for offline usage?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:97
 msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13866,208 +14943,235 @@ msgid ""
 "recipient. "
 msgstr ""
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:95
-msgid ""
-"The message was sent via the &quot;sendmail&quot; external application.  "
-"Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:114
 msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:115
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:118
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:120
 msgid ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
+"Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:121
 #, fuzzy
 msgid "Unable to read license file."
 msgstr "Nisam mogao da procesiram 'spool' direktorij"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:124
+msgid ""
+"Warning: Deleting messages from a Search Folder will delete the actual "
+"message from one of your local or remote folders.\n"
+"Do you really want to do this?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:115
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+#: ../mail/mail.error.xml.h:134
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:116
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:135
 msgid "_Append"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:119
-msgid "_Empty Trash"
+#: ../mail/mail.error.xml.h:137
+msgid "_Do not Synchronize"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:140
 #, fuzzy
 msgid "_Open Messages"
 msgstr "Poruka kalendara"
 
-#: ../mail/message-list.c:996
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr ""
 
-#: ../mail/message-list.c:997
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr ""
 
-#: ../mail/message-list.c:998
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr ""
 
-#: ../mail/message-list.c:999
+#: ../mail/message-list.c:1054
+#, fuzzy
+msgid "Forwarded"
+msgstr "_Proslijedi kao iCalendar "
+
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: ../mail/message-list.c:1000
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr ""
 
-#: ../mail/message-list.c:1004
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr ""
 
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr ""
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr ""
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr ""
 
-#: ../mail/message-list.c:1338 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:198
-#: ../widgets/table/e-cell-date.c:72
+#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Danas %H:%M"
 
-#: ../mail/message-list.c:1354 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1670
 msgid "Yesterday %l:%M %p"
 msgstr "Jučer %H:%M"
 
-#: ../mail/message-list.c:1366 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1682
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1690
 msgid "%b %d %l:%M %p"
 msgstr "%d %b H%:%M"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1692
 msgid "%b %d %Y"
 msgstr "%d.%b.%Y."
 
-#: ../mail/message-list.c:2042
-#, fuzzy
-msgid "Message List"
-msgstr "Poruka"
-
-#: ../mail/message-list.c:3387
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3987 ../mail/message-list.c:4462
 msgid "Generating message list"
 msgstr ""
 
+#: ../mail/message-list.c:4299
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4301
+msgid ""
+"There are only hidden messages in this folder. Use View->Show Hidden "
+"Messages to show them."
+msgstr ""
+
+#: ../mail/message-list.c:4303
+#, fuzzy
+msgid "There are no messages in this folder."
+msgstr ""
+"\n"
+"\n"
+"Nema se šta pokazati u ovom pogledu."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr ""
@@ -14084,51 +15188,58 @@ msgstr ""
 msgid "Follow Up Flag"
 msgstr ""
 
-#: ../mail/message-list.etspec.h:8
-msgid "Original Location"
-msgstr ""
-
-#: ../mail/message-list.etspec.h:9
+#: ../mail/message-list.etspec.h:11
 msgid "Received"
 msgstr ""
 
-#: ../mail/message-list.etspec.h:11
+#: ../mail/message-list.etspec.h:15
+#, fuzzy
+msgid "Sent Messages"
+msgstr "Poruka kalendara"
+
+#: ../mail/message-list.etspec.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+#: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:74
+#: ../mail/message-list.etspec.h:19
+msgid "Subject - Trimmed"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:54
 msgid "Call"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
 msgid "Reply"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
 msgid "Reply to All"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:64
 msgid "Review"
 msgstr ""
 
@@ -14154,190 +15265,560 @@ msgstr ""
 
 #: ../mail/searchtypes.xml.h:6
 #, fuzzy
+msgid "Subject or Addresses contains"
+msgstr "Opis sadrži"
+
+#: ../mail/searchtypes.xml.h:7
+#, fuzzy
+msgid "Subject or Recipients contains"
+msgstr "Opis sadrži"
+
+#: ../mail/searchtypes.xml.h:8
+#, fuzzy
 msgid "Subject or Sender contains"
 msgstr "Opis sadrži"
 
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+#, fuzzy
+msgid "Add local address books to Evolution."
+msgstr "Izlistaj lokalne direktorije adresara"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+#, fuzzy
+msgid "Local Address Books"
+msgstr "Adresar"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr ""
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:476
+#: ../plugins/templates/templates.c:389
+msgid "Keywords"
 msgstr ""
 
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+#, fuzzy
+msgid "Attachment Reminder"
+msgstr "Snimi sastanak"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr ""
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr ""
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#, fuzzy
+msgid "Message has no attachments"
+msgstr "Snimi sastanak"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#, fuzzy
+msgid "_Add attachment..."
+msgstr "Dodaj kolonu..."
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#, fuzzy
+msgid "_Edit Message"
+msgstr "Šifrujem poruku"
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+#, fuzzy
+msgid "Audio Inline"
+msgstr "Dopusti nove linije"
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
+msgid "Play audio attachments directly from Evolution."
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:51
-msgid "Select name of Evolution archive"
+#: ../plugins/backup-restore/backup-restore.c:139
+msgid "Select name of the Evolution backup file"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:61
+#: ../plugins/backup-restore/backup-restore.c:167
 msgid "_Restart Evolution after backup"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:89
-msgid "Select Evolution archive to restore"
+#: ../plugins/backup-restore/backup-restore.c:190
+msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:97
+#: ../plugins/backup-restore/backup-restore.c:214
 msgid "_Restart Evolution after restore"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:109
+#: ../plugins/backup-restore/backup-restore.c:287
+msgid "Restore from backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:289
+msgid ""
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:297
+msgid "_Restore Evolution from the backup file"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:304
+msgid "Please select an Evolution Archive to restore:"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:307
+msgid "Choose a file to restore"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:113
+#: ../plugins/backup-restore/backup.c:66
 #, fuzzy
-msgid "Check Evolution archive"
+msgid "Check Evolution Backup"
 msgstr "Evolution alarm"
 
-#: ../plugins/backup-restore/backup.c:115
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-msgid "A plugin for backing up and restore Evolution data and settings."
+#: ../plugins/backup-restore/backup.c:70
+msgid "With Graphical User Interface"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
+msgid "Shutting down Evolution"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:195
+msgid "Backing Evolution accounts and settings"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:201
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:212
+#, fuzzy
+msgid "Backup complete"
+msgstr "_Datum završetka:"
+
+#: ../plugins/backup-restore/backup.c:217
+#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:284
+msgid "Restarting Evolution"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:254
+msgid "Backup current Evolution data"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:259
+msgid "Extracting files from backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:266
+#, fuzzy
+msgid "Loading Evolution settings"
+msgstr "Podešavanje samodopunjavanja"
+
+#: ../plugins/backup-restore/backup.c:273
+msgid "Removing temporary backup files"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:280
+msgid "Ensuring local sources"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:429
+#, fuzzy, c-format
+msgid "Backing up to the folder %s"
+msgstr "_Pretrage"
+
+#: ../plugins/backup-restore/backup.c:434
+#, fuzzy, c-format
+msgid "Restoring from the folder %s"
+msgstr "_Pretrage"
+
+#. Backup / Restore only can have GUI. We should restrict the rest
+#: ../plugins/backup-restore/backup.c:454
+#, fuzzy
+msgid "Evolution Backup"
+msgstr "Evolution alarm"
+
+#: ../plugins/backup-restore/backup.c:454
+#, fuzzy
+msgid "Evolution Restore"
+msgstr "Evolution adresar"
+
+#: ../plugins/backup-restore/backup.c:489
+msgid "Backing up Evolution Data"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:490
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:492
+msgid "Restoring Evolution Data"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:493
+msgid "Please wait while Evolution is restoring your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:511
+msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 
 #. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+msgid "Backup and Restore"
+msgstr ""
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
+msgid "Backup and restore your Evolution data and settings."
 msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 #, fuzzy
-msgid "Backup Settings..."
-msgstr "_Postavke..."
+msgid "Are you sure you want to close Evolution?"
+msgstr "Jeste li sigurni da želite obrisati ovu adresu?"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+#, fuzzy
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "Sigurno želite obrisati ovaj sastanak?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid ""
+"Evolution backup can start only when Evolution is not running. Please make "
+"sure that you save and close all your unsaved windows before proceeding.  If "
+"you want Evolution to restart automatically after backup, please enable the "
+"toggle button."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#, fuzzy
+msgid "Insufficient Permissions"
+msgstr "Delegirano"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Invalid Evolution backup file"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#, fuzzy
+msgid "Please select a valid backup file to restore."
+msgstr "Odaberite sliku za ovaj kontakt"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "The selected folder is not writable."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid ""
+"This will delete all your current Evolution data and settings and restore "
+"them from your backup. Evolution restore can start only when Evolution is "
+"not running. Please make sure that you close all your unsaved windows before "
+"you proceed. If you want Evolution to restart automatically restart after "
+"restore, please enable the toggle button."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
 msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 #, fuzzy
-msgid "Restore Settings..."
+msgid "R_estore Settings..."
 msgstr "Podešavanja pilota..."
 
-#: ../plugins/bbdb/bbdb.c:404
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+#, fuzzy
+msgid "_Backup Settings..."
+msgstr "_Postavke..."
+
+#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 #, fuzzy
 msgid "Automatic Contacts"
 msgstr "Važni kontakti"
 
-#: ../plugins/bbdb/bbdb.c:413
+#. Enable BBDB checkbox
+#: ../plugins/bbdb/bbdb.c:646
 #, fuzzy
-msgid "<span weight=\"bold\">Automatic Contacts</span>"
-msgstr "<span weight=\"bold\">Status</span>"
+msgid "Create _address book entries when sending mails"
+msgstr "_Sakrij adrese prilikom slanja pošte na ovu listu"
 
-#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:426
-msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
-msgstr ""
+#: ../plugins/bbdb/bbdb.c:652
+#, fuzzy
+msgid "Select Address book for Automatic Contacts"
+msgstr "Važni kontakti"
 
-#: ../plugins/bbdb/bbdb.c:444
+#: ../plugins/bbdb/bbdb.c:667
 #, fuzzy
-msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-msgstr "<span weight=\"bold\">Osnove</span>"
+msgid "Instant Messaging Contacts"
+msgstr "<b>Instant Messaging</b>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:457
-msgid ""
-"Periodically synchronize contact information and images from my _instant "
-"messenger"
+#: ../plugins/bbdb/bbdb.c:682
+msgid "Synchronize contact info and images from Pidgin buddy list"
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:688
+msgid "Select Address book for Pidgin buddy list"
 msgstr ""
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:464
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Synchronize with _buddy list now"
 msgstr ""
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-#, fuzzy
-msgid "Automatic contacts"
-msgstr "Nema kontakata"
-
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-msgid ""
-"Automatically fills your addressbook with names and email addresses as you "
-"reply to mails. Also fills in IM contact information from your buddy lists."
+msgid "BBDB"
 msgstr ""
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid "BBDB"
+msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
+msgstr ""
+
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
+msgid "Convert message text to _Unicode"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
+msgid "Bogofilter Junk Filter"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+#, fuzzy
+msgid "Bogofilter Options"
+msgstr "Opcije"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
+msgid "Filter junk messages using Bogofilter."
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:64
+msgid "CalDAV"
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-contacts-source.c:303
+msgid "Use _SSL"
+msgstr ""
+
+#. add refresh option
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-file/calendar-file.c:267
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:508
+#: ../plugins/google-account-setup/google-source.c:698
+#: ../plugins/google-account-setup/google-contacts-source.c:322
+#, fuzzy
+msgid "Re_fresh:"
+msgstr "_Osvježi:"
+
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-file/calendar-file.c:289
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:723
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+msgid "weeks"
+msgstr "sedmice"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "Add CalDAV support to Evolution."
+msgstr ""
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV Support"
+msgstr ""
+
+#: ../plugins/calendar-file/calendar-file.c:204
+#, fuzzy
+msgid "_Customize options"
+msgstr "_Opis:"
+
+#: ../plugins/calendar-file/calendar-file.c:224
+#, fuzzy
+msgid "File _name:"
+msgstr "_Puno ime:"
+
+#: ../plugins/calendar-file/calendar-file.c:228
+#, fuzzy
+msgid "Choose calendar file"
+msgstr "Evolution iCalendar uvoznik"
+
+#: ../plugins/calendar-file/calendar-file.c:272
+#, fuzzy
+msgid "On open"
+msgstr "Otvori"
+
+#: ../plugins/calendar-file/calendar-file.c:273
+msgid "On file change"
+msgstr ""
+
+#: ../plugins/calendar-file/calendar-file.c:274
+#, fuzzy
+msgid "Periodically"
+msgstr "Osobni podaci"
+
+#: ../plugins/calendar-file/calendar-file.c:301
+msgid "Force read _only"
 msgstr ""
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
+msgid "Add local calendars to Evolution."
+msgstr ""
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 #, fuzzy
 msgid "Local Calendars"
 msgstr "Učitavam kalendar"
 
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Provides core functionality for local calendars."
-msgstr ""
+#: ../plugins/calendar-http/calendar-http.c:369
+#, fuzzy
+msgid "_Secure connection"
+msgstr "_Koristi osiguranu vezu:"
 
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
+#: ../plugins/calendar-http/calendar-http.c:455
 #, fuzzy
-msgid "HTTP Calendars"
-msgstr "Kalendari"
+msgid "Userna_me:"
+msgstr "_Korisničko ime:"
 
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
+msgid "Add web calendars to Evolution."
 msgstr ""
 
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
-msgid "Weather: Cloudy"
-msgstr ""
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+#, fuzzy
+msgid "Web Calendars"
+msgstr "Kalendari"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr ""
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
-msgid "Weather: Partly Cloudy"
+msgid "Weather: Cloudy"
 msgstr ""
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
-msgid "Weather: Rain"
+msgid "Weather: Cloudy Night"
 msgstr ""
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
+#, fuzzy
+msgid "Weather: Overcast"
+msgstr "Kalendari"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+#, fuzzy
+msgid "Weather: Showers"
+msgstr "Kalendari"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Snow"
 msgstr ""
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Sunny"
 msgstr ""
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:68
+#, fuzzy
+msgid "Weather: Clear Night"
+msgstr "Kalendari"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Thunderstorms"
 msgstr ""
 
-#: ../plugins/calendar-weather/calendar-weather.c:267
+#: ../plugins/calendar-weather/calendar-weather.c:230
 #, fuzzy
 msgid "Select a location"
 msgstr "Izaberi akciju"
 
-#: ../plugins/calendar-weather/calendar-weather.c:654
+#: ../plugins/calendar-weather/calendar-weather.c:606
 #, fuzzy
 msgid "_Units:"
 msgstr "Jedinica"
 
-#: ../plugins/calendar-weather/calendar-weather.c:661
+#: ../plugins/calendar-weather/calendar-weather.c:613
 msgid "Metric (Celsius, cm, etc)"
 msgstr ""
 
-#: ../plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:614
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr ""
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
+msgid "Add weather calendars to Evolution."
 msgstr ""
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
@@ -14346,45 +15827,136 @@ msgid "Weather Calendars"
 msgstr "Kalendari"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr ""
-
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 #, fuzzy
-msgid "Copy _Email Address"
-msgstr "Email adresa"
+msgid "Copy Tool"
+msgstr "Kopiraj"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-#, fuzzy
-msgid "Copy tool"
-msgstr "Kopiraj"
+msgid "Copy things to the clipboard."
+msgstr ""
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr ""
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
+msgid "Check whether Evolution is the default mail client on startup."
 msgstr ""
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client "
-msgstr ""
+#, fuzzy
+msgid "Default Mail Client"
+msgstr "Uobičajeni prioritet:"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr ""
 
-#: ../plugins/default-source/default-source.c:82
-#: ../plugins/default-source/default-source.c:109
-msgid "Mark as default folder"
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:627
+msgid "Evolution"
+msgstr ""
+
+#: ../plugins/default-source/default-source.c:80
+#, fuzzy
+msgid "Mark as _default address book"
+msgstr "Greška kod učitavanja uobičajenog adresara."
+
+#: ../plugins/default-source/default-source.c:101
+#, fuzzy
+msgid "Mark as _default calendar"
+msgstr "Napravi novi kalendar"
+
+#: ../plugins/default-source/default-source.c:102
+#, fuzzy
+msgid "Mark as _default task list"
+msgstr "Napravi novu listu zadataka"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default memo list"
+msgstr ""
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+#, fuzzy
+msgid "Default Sources"
+msgstr "Uobičajena adresa za sinhronizovanje:"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid "Mark your preferred address book and calendar as default."
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:333
+msgid "Security:"
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:338
+msgid "Unclassified"
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:339
+#, fuzzy
+msgid "Protected"
+msgstr "Završeno"
+
+#: ../plugins/email-custom-header/email-custom-header.c:341
+#, fuzzy
+msgid "Secret"
+msgstr "Servis"
+
+#: ../plugins/email-custom-header/email-custom-header.c:342
+msgid "Top secret"
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:584
+#, fuzzy
+msgid "_Custom Header"
+msgstr "Proizvoljna _poruka"
+
+#: ../plugins/email-custom-header/email-custom-header.c:906
+#, fuzzy
+msgid "Key"
+msgstr "Kenija"
+
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:395
+msgid "Values"
+msgstr ""
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr ""
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Add custom headers to outgoing mail messages."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+#, fuzzy
+msgid "Custom Header"
+msgstr "Proizvoljna _poruka"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr ""
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
@@ -14432,364 +16004,582 @@ msgid ""
 "password authentication."
 msgstr "Ova opcija će povezati na server korištenjem Kerberos 5 prijave."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:251
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
 #, fuzzy
 msgid "Out Of Office"
 msgstr "Van ureda"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:258
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:270
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:290
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 #, fuzzy
 msgid "I am out of the office"
 msgstr "Van ureda"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:294
 msgid "I am in the office"
 msgstr ""
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:321
+#: ../plugins/exchange-operations/exchange-account-setup.c:340
 #, fuzzy
 msgid "Change the password for Exchange account"
 msgstr "Unesite šifru za %s"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:323
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#: ../plugins/exchange-operations/exchange-account-setup.c:342
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #, fuzzy
 msgid "Change Password"
 msgstr "Upišite šifru"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Manage the delegate settings for Exchange account"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
-msgid "Delegation Assitant"
-msgstr ""
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#, fuzzy
+msgid "Delegation Assistant"
+msgstr "Pomoćnik"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:339
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 #, fuzzy
 msgid "Miscelleneous"
 msgstr "<b>Razno</b>"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:371
 msgid "View the size of all Exchange folders"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:351
+#: ../plugins/exchange-operations/exchange-account-setup.c:373
 #, fuzzy
 msgid "Folders Size"
 msgstr "Veličina razgranika"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
+#: ../plugins/exchange-operations/exchange-account-setup.c:380
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:601
-msgid "_OWA Url:"
-msgstr ""
+#: ../plugins/exchange-operations/exchange-account-setup.c:726
+#, fuzzy
+msgid "_OWA URL:"
+msgstr "_URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:626
+#: ../plugins/exchange-operations/exchange-account-setup.c:752
 #, fuzzy
 msgid "A_uthenticate"
 msgstr "Prijava nije uspjela"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:814
+#: ../plugins/exchange-operations/exchange-account-setup.c:774
+msgid "Mailbox name is _different than user name"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:787
+msgid "_Mailbox:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:1001
 #, fuzzy
-msgid "Authentication Type"
+msgid "_Authentication Type"
 msgstr "Prijava nije uspjela"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
-msgid "Ch_eck for Supported Types"
+#: ../plugins/exchange-operations/exchange-account-setup.c:1130
+#: ../plugins/exchange-operations/exchange-contacts.c:217
+#, fuzzy, c-format
+msgid "%s KB"
+msgstr "%d %B"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:1132
+#: ../plugins/exchange-operations/exchange-contacts.c:219
+#, c-format
+msgid "0 KB"
+msgstr ""
+
+#. FIXME: Take care of i18n
+#: ../plugins/exchange-operations/exchange-account-setup.c:1137
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
+msgid "Size:"
+msgstr "Veličina:"
+
+#: ../plugins/exchange-operations/exchange-calendar.c:196
+#: ../plugins/exchange-operations/exchange-contacts.c:170
+msgid ""
+"Evolution is in offline mode. You cannot create or modify folders now.\n"
+"Please switch to online mode for such operations."
 msgstr ""
 
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
+#: ../plugins/exchange-operations/exchange-change-password.c:114
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Ši_fra:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 #, fuzzy
 msgid "Current Password:"
 msgstr "Upišite šifru"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 #, fuzzy
 msgid "New Password:"
 msgstr "Ši_fra:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
 msgid "Your current password has expired. Please change your password now."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:144
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
+#: ../plugins/exchange-operations/exchange-config-listener.c:657
+#, c-format
+msgid "Your password will expire in the next %d days"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:142
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
 #, fuzzy
 msgid "Custom"
 msgstr "Vlastiti pogled"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:191
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:168
+msgid "Editor (read, create, edit)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:172
+msgid "Author (read, create)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:176
+msgid "Reviewer (read-only)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:225
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#, fuzzy
+msgid "Delegate Permissions"
+msgstr "Delegirano"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, fuzzy, c-format
 msgid "Permissions for %s"
 msgstr "Pristup odbijen"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#. To translators: This is a part of the message to be sent to the delegatee
+#. summarizing the permissions assigned to him.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:326
+msgid ""
+"This message was sent automatically by Evolution to inform you that you have "
+"been designated as a delegate. You can now send messages on my behalf."
+msgstr ""
+
+#. To translators: Another chunk of the same message.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:331
+msgid "You have been given the following permissions on my folders:"
+msgstr ""
+
+#. To translators: This message is included if the delegatee has been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:351
+msgid "You are also permitted to see my private items."
+msgstr ""
+
+#. To translators: This message is included if the delegatee has not been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+msgid "However you are not permitted to see my private items."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:390
+#, c-format
+msgid "You have been designated as a delegate for %s"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 #, fuzzy
 msgid "Delegate To"
 msgstr "Delegiraj za:"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:562
+#: ../plugins/exchange-operations/exchange-delegates.c:581
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:679
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 #, fuzzy
 msgid "Could not access Active Directory"
 msgstr ""
 "Ne mogu kreirati direktorij %s:\n"
 "%s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:694
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 #, fuzzy
 msgid "Could not find self in Active Directory"
 msgstr ""
 "Ne mogu kreirati direktorij %s:\n"
 "%s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:707
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:719
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, fuzzy, c-format
 msgid "Could not remove delegate %s"
 msgstr "Nisam mogao ukloniti keš unos: %s: %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:779
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 #, fuzzy
 msgid "Could not update list of delegates."
 msgstr "Nisam mogao ažurirati objekt"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, fuzzy, c-format
 msgid "Could not add delegate %s"
 msgstr "Ne mogu učitati %s: %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:965
+#: ../plugins/exchange-operations/exchange-delegates.c:980
 #, fuzzy
 msgid "Error reading delegates list."
 msgstr "Greška kod dodavanja liste"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
-msgid "Author (read, create)"
-msgstr ""
-
+#. Translators: This is used for permissions for <user> for the folder Calendar.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 #, fuzzy
 msgid "C_alendar:"
 msgstr "Kalendar:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
 #, fuzzy
 msgid "Co_ntacts:"
 msgstr "Konatkti: "
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-#, fuzzy
-msgid "Delegate Permissions"
-msgstr "Delegirano"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 #, fuzzy
 msgid "Delegates"
 msgstr "Delegirano"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-msgid "Editor (read, create, edit)"
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 #, fuzzy
 msgid "Permissions for"
 msgstr "Pristup odbijen"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-msgid "Reviewer (read-only)"
-msgstr ""
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 msgid "_Delegate can see private items"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
 msgid "_Inbox:"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
+#, fuzzy
+msgid "_Summarize permissions"
+msgstr "Delegirano"
+
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+#: ../plugins/itip-formatter/itip-view.c:1912
 #, fuzzy
 msgid "_Tasks:"
 msgstr "_Zadaci"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:58
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 #, fuzzy
 msgid "Permissions..."
 msgstr "Pristup odbijen"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:136
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 #, fuzzy
 msgid "Folder Name"
 msgstr "Naziv polja"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 #, fuzzy
 msgid "Folder Size"
 msgstr "Veličina razgranika"
 
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
+#, fuzzy
+msgid "User"
+msgstr "Korisničko ime"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+msgid "Subscribe to Other User's Folder"
+msgstr ""
+
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-folder.c:62
-#: ../plugins/exchange-operations/exchange-folder.c:223
+#: ../plugins/exchange-operations/exchange-folder.c:65
 #: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:243
 msgid "Unsubscribe Folder..."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-folder.c:460
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:518
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-folder.c:472
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:530
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
+#: ../plugins/exchange-operations/exchange-oof.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
+msgid "<b>Status:</b>"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
+msgid "I am currently in the office"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
+msgid "I am currently out of the office"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+msgid "No, Don't Change Status"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
+msgid "Out of Office Assistant"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
+msgid "Yes, Change Status"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
+msgid "Password Expiry Warning..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
+msgid "Your password will expire in 7 days..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
+#, fuzzy
+msgid "_Change Password"
+msgstr "Upišite šifru"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 #, fuzzy
 msgid "(Permission denied.)"
 msgstr "Pristup odbijen"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid "Add User:"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
+#: ../plugins/exchange-operations/exchange-send-options.c:410
+#: ../plugins/groupwise-features/proxy.c:932
+#: ../plugins/groupwise-features/share-folder.c:713
 #, fuzzy
 msgid "Add User"
 msgstr "_Dodaj adresu"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
 #, fuzzy
 msgid "<b>Permissions</b>"
 msgstr "<b>Opcije</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 #, fuzzy
 msgid "Cannot Delete"
 msgstr "Unesi delegata"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 #, fuzzy
 msgid "Cannot Edit"
 msgstr "Editor kontakata"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 #, fuzzy
 msgid "Create items"
 msgstr "Kategorije"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 #, fuzzy
 msgid "Create subfolders"
 msgstr "Nacrtaj granice"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 #, fuzzy
 msgid "Delete Any Items"
 msgstr "Delegirano"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 #, fuzzy
 msgid "Delete Own Items"
 msgstr "Delegirano"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 #, fuzzy
 msgid "Edit Any Items"
 msgstr "Promijeni sastanak"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Own Items"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 #, fuzzy
 msgid "Folder contact"
 msgstr "%d kontakt"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 #, fuzzy
 msgid "Folder owner"
 msgstr "Izvor papira:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 #, fuzzy
 msgid "Folder visible"
 msgstr "Izvor papira:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Read items"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 #, fuzzy
 msgid "Role: "
 msgstr "Uloga"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:144
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
+#, fuzzy
+msgid "<b>Message Settings</b>"
+msgstr "<b>Opcije liste zadataka</b>"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
+#, fuzzy
+msgid "<b>Tracking Options</b>"
+msgstr "<b>Opcije liste zadataka</b>"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
+#, fuzzy
+msgid "Exchange - Send Options"
+msgstr "Opcije"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
+#, fuzzy
+msgid "I_mportance: "
+msgstr "Uvezi..."
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
+msgid ""
+"Normal\n"
+"High\n"
+"Low"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
+msgid ""
+"Normal\n"
+"Personal\n"
+"Private\n"
+"Confidential"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
+msgid "Request a _delivery receipt for this message"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
+#, fuzzy
+msgid "Request a _read receipt for this message"
+msgstr "Obavezan učesnik"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
+#, fuzzy
+msgid "Send as Delegate"
+msgstr "Unesi delegata"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
+msgid "_Sensitivity: "
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
+#, fuzzy
+msgid "_User"
+msgstr "_Korisničko ime:"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:134
 #, fuzzy
 msgid "Select User"
 msgstr "Izabrano"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:182
+#: ../plugins/exchange-operations/exchange-user-dialog.c:172
 #, fuzzy
-msgid "Addressbook..."
+msgid "Address Book..."
 msgstr "Adresar"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
@@ -14800,207 +16590,240 @@ msgstr ""
 msgid "Subscribe to Other User's Calendar"
 msgstr ""
 
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+msgid "Activates the Evolution-Exchange extension package."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
+msgid "Exchange Operations"
+msgstr ""
+
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
-msgid "Cannot change password due to configuration problems."
+msgid "Cannot access the \"Exchange settings\" tab in offline mode."
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+msgid "Cannot change password due to configuration problems."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 #, fuzzy
 msgid "Cannot display folders."
 msgstr "Ne mogu otvoriti datoteku"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#, fuzzy
+msgid "Cannot perform the operation."
+msgstr "Nepodržana operacija: pretraga po uid-u: za %s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid ""
-"Changes to Exchange account configuration will take place after you quit and "
-"restart Evolution."
+"Changes to options for Exchange account \"{0}\" will only take effect after "
+"restarting Evolution."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 #, fuzzy
 msgid "Could not authenticate to server."
 msgstr "Neuspješna prijava na LDAP server."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 #, fuzzy
 msgid "Could not change password."
 msgstr "Ne mogu otkazati"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#, fuzzy
+msgid "Could not connect to Exchange server."
+msgstr "Ne mogu otvoriti izvor"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 #, fuzzy
 msgid "Could not connect to server {0}."
 msgstr "Ne mogu otvoriti izvor"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 #, fuzzy
 msgid "Could not determine folder permissions for delegates."
 msgstr "Nisam mogao dobaviti informacije šeme za LDAP server."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not find Exchange Web Storage System."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 #, fuzzy
 msgid "Could not locate server {0}."
 msgstr "Ne mogu učitati %s: %s"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not make {0} a delegate"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 #, fuzzy
 msgid "Could not read folder permissions"
 msgstr "Ne mogu ukloniti adresar."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 #, fuzzy
 msgid "Could not read folder permissions."
 msgstr "Ne mogu ukloniti adresar."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 #, fuzzy
 msgid "Could not read out-of-office state"
 msgstr "Nisam mogao napraviti 'pipe': %s"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 #, fuzzy
 msgid "Could not update folder permissions."
 msgstr "Nisam mogao ažurirati objekt"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 #, fuzzy
 msgid "Could not update out-of-office state"
 msgstr "Nisam mogao ažurirati objekt"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
-msgid "Exchange Account is offline."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Exchange Connector access error."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
+msgid "Exchange Account is offline."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
-"to be disabled or blocked.  (This is usually \n"
-"unintentional.)  Your Exchange Administrator will \n"
+"to be disabled or blocked. (This is usually \n"
+"unintentional.) Your Exchange Administrator will \n"
 "need to enable this functionality in order for \n"
-"you to be able to use Ximian Connector.\n"
+"you to be able to use Evolution Exchange Connector.\n"
 "\n"
 "For information to provide to your Exchange \n"
 "administrator, please follow the link below:\n"
 "\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
+"{0}\n"
 "  "
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 #, fuzzy
 msgid "Failed to update delegates:"
 msgstr "Ne mogu da prenesem kalendar '%s'"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 #, fuzzy
 msgid "Folder already exists"
 msgstr "ID kontakta već postoji"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 #, fuzzy
 msgid "Folder does not exist"
 msgstr "Adresar ne postoji"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 #, fuzzy
 msgid "Folder offline"
 msgstr "Izvor papira:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1265
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../shell/e-shell.c:1259
 msgid "Generic error"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+msgid "Global Catalog Server is not reachable"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the URL is correct and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No Global Catalog server configured for this account."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No mailbox for user {0} on {1}."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 #, fuzzy
 msgid "No such user {0}"
 msgstr "Nema takvog izvora"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Password successfully changed."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "Please restart Evolution"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+msgid "Please make sure the Global Catalog Server name is correct."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+msgid "Please restart Evolution for changes to take effect"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 #, fuzzy
 msgid "Please select a user."
 msgstr "Odaberite sliku za ovaj kontakt"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "Server rejected password because it is too weak."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
-"The server is runinng Exchange 5.5. Exchange Connector \n"
+"The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15009,86 +16832,95 @@ msgid ""
 "Or you might have just typed your password wrong."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Try again with a different password."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to add user to access control list:"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 #, fuzzy
 msgid "Unable to edit delegates."
 msgstr "Nisam mogao da procesiram 'spool' direktorij"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 #, fuzzy
 msgid "Unknown error looking up {0}"
 msgstr "(Nepoznata greška)"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/google-account-setup/google-source.c:604
+#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:821
 #, fuzzy
 msgid "Unknown error."
 msgstr "(Nepoznata greška)"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 #, fuzzy
 msgid "Unknown type"
 msgstr "Nepoznato"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "Nepodržana operacija: pretraga po uid-u: za %s"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "You are nearing your quota available for storing mails on this server."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+msgid ""
+"You are permitted to send a message on behalf of only one delegator at a "
+"time."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You cannot make yourself your own delegate"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-msgid "You have exceeded your quota for storing mails on this server."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+msgid "You have exceeded your quota for storing mail on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "You may only configure a single Exchange account."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
-"Your current usage is : {0}KB. Try to clear up some space by deleting some "
-"mails."
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
-"Your current usage is : {0}KB. You will not be able to either send or "
-"recieve mails now."
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid ""
-"Your current usage is : {0}KB. You will not be able to send mails till you "
-"clear up some space by deleting some mails."
+"Your current usage is: {0} KB. You will not be able to send mail until you "
+"clear up some space by deleting some mail."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "Your password has expired."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} cannot be added to an access control list"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already a delegate"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
 msgid "{0} is already in the list"
 msgstr ""
 
@@ -15100,49 +16932,215 @@ msgstr ""
 msgid "Check folder permissions"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr ""
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:120
+msgid "Automatically launch when a new mail is edited"
+msgstr ""
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
+#, fuzzy
+msgid "Default External Editor"
+msgstr "Uobičajeni prioritet:"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
+msgid "The default command that must be used as the editor."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+#, fuzzy
+msgid "External Editor"
+msgstr "Editor pretrage"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+msgid "Editor not launchable"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+msgid "External editor still running"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
 msgstr ""
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#: ../plugins/external-editor/external-editor.c:109
+msgid "Command to be executed to launch the editor: "
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:110
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:354
+#: ../plugins/external-editor/external-editor.c:356
+#, fuzzy
+msgid "Compose in External Editor"
+msgstr "Editor kontakata"
+
+#: ../plugins/face/face.c:59
+msgid "Select a (48*48) png of size < 700bytes"
+msgstr ""
+
+#: ../plugins/face/face.c:69
+msgid "PNG files"
+msgstr ""
+
+#: ../plugins/face/face.c:126
+#, fuzzy
+msgid "_Face"
+msgstr "Francuska"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid ""
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+"sent messages."
+msgstr ""
+
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the folder tree context menu."
+msgid "Unsubscribe Folders"
 msgstr ""
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
-msgid "Unsubscribe Folders"
+msgid ""
+"Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgstr ""
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+msgid "_Unsubscribe"
+msgstr ""
+
+#: ../plugins/google-account-setup/google-source.c:81
+#: ../plugins/google-account-setup/google-contacts-source.c:51
+#, fuzzy
+msgid "Google"
+msgstr "Uloga"
+
+#: ../plugins/google-account-setup/google-source.c:499
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr ""
+
+#: ../plugins/google-account-setup/google-source.c:604
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
 msgstr ""
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/google-account-setup/google-source.c:739
+#, fuzzy
+msgid "Cal_endar:"
+msgstr "Kalendar:"
+
+#: ../plugins/google-account-setup/google-source.c:774
+msgid "Retrieve _list"
+msgstr ""
+
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
+#, fuzzy
+msgid "<b>Server</b>"
+msgstr "<b>Općenito</b> "
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+msgid "Add Google Calendars to Evolution."
+msgstr ""
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+#, fuzzy
+msgid "Google Calendars"
+msgstr "Gnome Calendar"
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
 msgid "Checklist"
 msgstr ""
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "Groupwise Account Setup"
+msgid "Add Novell GroupWise support to Evolution."
+msgstr ""
+
+#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
+msgid "GroupWise Account Setup"
+msgstr ""
+
+#: ../plugins/groupwise-features/install-shared.c:219
+#, c-format
+msgid ""
+"The user '%s' has shared a folder with you\n"
+"\n"
+"Message from '%s'\n"
+"\n"
+"\n"
+"%s\n"
+"\n"
+"\n"
+"Click 'Forward' to install the shared folder\n"
+"\n"
+msgstr ""
+
+#: ../plugins/groupwise-features/install-shared.c:224
+msgid "Install the shared folder"
+msgstr ""
+
+#: ../plugins/groupwise-features/install-shared.c:226
+msgid "Shared Folder Installation"
 msgstr ""
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:77
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 #, fuzzy
 msgid "Junk Settings"
 msgstr "_Postavke..."
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:90
+#: ../plugins/groupwise-features/junk-mail-settings.c:93
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
 #, fuzzy
-msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>Opcije liste zadataka</b>"
+msgid "Junk Mail Settings"
+msgstr "Novi sastanak"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:112
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 #, fuzzy
 msgid "Junk Mail Settings..."
 msgstr "_Postavke..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
 #, fuzzy
-msgid "<b>Junk List :</b>"
+msgid "<b>Junk List:</b>"
 msgstr "<b>Lista zadataka</b>"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
@@ -15150,13 +17148,8 @@ msgstr "<b>Lista zadataka</b>"
 msgid "Email:"
 msgstr "Email"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
-#, fuzzy
-msgid "Junk Mail Settings"
-msgstr "Novi sastanak"
-
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 #, fuzzy
 msgid "_Disable"
 msgstr "Isključi"
@@ -15171,36 +17164,171 @@ msgstr "Uključi"
 msgid "_Junk List"
 msgstr "_Ned"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
+#: ../plugins/groupwise-features/mail-retract.c:52
+#, fuzzy
+msgid "Message Retract"
+msgstr "Poruka"
+
+#: ../plugins/groupwise-features/mail-retract.c:57
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
 msgstr ""
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../widgets/misc/e-send-options.glade.h:17
-#, fuzzy
-msgid "Send Options"
-msgstr "Opcije"
+#: ../plugins/groupwise-features/mail-retract.c:76
+msgid "Message retracted successfully"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:86
+msgid "Retract Mail"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
+msgid "Add Send Options to GroupWise messages"
+msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
+msgid "Fine-tune your GroupWise accounts."
 msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
+#, fuzzy
+msgid "GroupWise Features"
+msgstr "GroupWise"
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
+#, fuzzy
+msgid "Message retract failed"
+msgstr "Poruka"
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
+msgid "The server did not allow the selected message to be retracted."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+#, fuzzy
+msgid "Account Already Exists"
+msgstr "ID kontakta već postoji"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
+#, fuzzy
+msgid "Invalid user"
+msgstr "pogrešno vrijeme"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
 msgstr ""
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
+#, fuzzy
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "Ne mogu snimiti \"{0}\"."
+
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
+#, fuzzy
+msgid "Specify User"
+msgstr "Izabrano"
+
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
+msgid "You have already given proxy permissions to this user."
+msgstr ""
+
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
+#, fuzzy
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "Ne mogu snimiti \"{0}\"."
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
+msgid "You have to specify a user name which you want to add to the list"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+#, fuzzy
+msgid "Do you want to resend the meeting ?"
+msgstr "Sigurno želite obrisati ovaj sastanak?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+#, fuzzy
+msgid "Do you want to resend the recurring meeting ?"
+msgstr "Sigurno želite obrisati ovaj sastanak?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+#, fuzzy
+msgid "Do you want to retract the original item ?"
+msgstr "Sigurno želite izbrisati ovaj unos u dnevniku '{0}'?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+msgid "The original will be removed from the recipient's mailbox."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
+msgid "This is a recurring meeting"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr ""
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
+#, fuzzy
+msgid "Would you like to accept it?"
+msgstr "Želite li snimiti promjene?"
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
+#, fuzzy
+msgid "Would you like to decline it?"
+msgstr "Želite li snimiti promjene?"
+
+#: ../plugins/groupwise-features/process-meeting.c:53
 #, fuzzy
 msgid "Accept Tentatively"
 msgstr "Okvirno"
 
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/process-meeting.c:319
+#, fuzzy
+msgid "Rese_nd Meeting..."
+msgstr "Podešavanja pilota..."
+
+#: ../plugins/groupwise-features/properties.glade.h:1
 #, fuzzy
-msgid "<b>Users :</b>"
+msgid "<b>Users:</b>"
 msgstr "<b>Upozorenja</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:4
-#: ../widgets/table/e-table-click-to-add.c:510
+#: ../plugins/groupwise-features/properties.glade.h:2
+#, fuzzy
+msgid "C_ustomize notification message"
+msgstr "Proizvoljna _poruka"
+
+#: ../plugins/groupwise-features/properties.glade.h:3
+msgid "Con_tacts..."
+msgstr "Ko_ntakti..."
+
+#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../widgets/table/e-table-click-to-add.c:514
 msgid "Message"
 msgstr "Poruka"
 
@@ -15212,25 +17340,17 @@ msgstr ""
 msgid "The participants will receive the following notification.\n"
 msgstr ""
 
-#: ../plugins/groupwise-features/properties.glade.h:11
-#, fuzzy
-msgid "_Contacts..."
-msgstr "Kontakti..."
-
 #: ../plugins/groupwise-features/properties.glade.h:12
-msgid "_Cutomize notification message"
-msgstr ""
-
-#: ../plugins/groupwise-features/properties.glade.h:13
 #, fuzzy
 msgid "_Not Shared"
 msgstr "Nije započelo"
 
-#: ../plugins/groupwise-features/properties.glade.h:15
-msgid "_Shared With ..."
-msgstr ""
+#: ../plugins/groupwise-features/properties.glade.h:14
+#, fuzzy
+msgid "_Shared With..."
+msgstr "_Snimi kao..."
 
-#: ../plugins/groupwise-features/properties.glade.h:16
+#: ../plugins/groupwise-features/properties.glade.h:15
 #, fuzzy
 msgid "_Sharing"
 msgstr "Sjenčanje"
@@ -15276,298 +17396,554 @@ msgid "Subscribe to my _notifications"
 msgstr ""
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:121
-#, fuzzy
-msgid "_Read"
-msgstr "_Sri"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
 #, fuzzy
 msgid "_Write"
 msgstr "_Titula:"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: strip the part in front of the | and the | itself
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
 #, fuzzy
-msgid "Proxy"
-msgstr "Prioritet"
+msgid "permission to read|_Read"
+msgstr "Pristup odbijen"
 
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/proxy-listing.glade.h:2
-#: ../smime/gui/smime-ui.glade.h:49
-#: ../widgets/table/e-table-config-no-group.glade.h:20
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "dialog1"
-msgstr "dialog1"
+#, fuzzy
+msgid "Proxy"
+msgstr "Prioritet"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
 #, fuzzy
 msgid "<b>Account Name</b>"
 msgstr "_Ime računa:"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 #, fuzzy
 msgid "Proxy Login"
 msgstr "Prijava"
 
-#: ../plugins/groupwise-features/proxy-login.c:219
-#: ../plugins/groupwise-features/proxy-login.c:261
-#: ../plugins/groupwise-features/proxy.c:490
-#: ../plugins/groupwise-features/send-options.c:83
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:488
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sUnesite šifru za %s (korisnik %s)"
 
-#: ../plugins/groupwise-features/proxy-login.c:484
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
+#. * feature by which one person can send/read mails/appointments using another person's identity
+#. * without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login.c:512
 #, fuzzy
 msgid "_Proxy Login..."
 msgstr "_Štampaj..."
 
-#: ../plugins/groupwise-features/proxy.c:672
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:689
+msgid "The Proxy tab will be available only when the account is online."
+msgstr ""
+
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/send-options.c:214
+#, fuzzy
+msgid "Advanced send options"
+msgstr "Opcije"
+
+#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder.c:748
 #, fuzzy
 msgid "Users"
 msgstr "Korisničko ime"
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:321
 msgid "Enter the users and set permissions"
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder-common.c:338
+#: ../plugins/groupwise-features/share-folder-common.c:340
 #, fuzzy
 msgid "New _Shared Folder..."
 msgstr "Idi u direktorij..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:453
+#: ../plugins/groupwise-features/share-folder-common.c:447
 #, fuzzy
 msgid "Sharing"
 msgstr "Sjenčanje"
 
-#: ../plugins/groupwise-features/status-track.c:235
+#: ../plugins/groupwise-features/share-folder.c:531
+#, fuzzy
+msgid "Custom Notification"
+msgstr "Poravnavanje"
+
+#: ../plugins/groupwise-features/share-folder.c:753
+#, fuzzy
+msgid "Add   "
+msgstr "_Dodaj adresu"
+
+#: ../plugins/groupwise-features/share-folder.c:759
+#, fuzzy
+msgid "Modify"
+msgstr "Model"
+
+#: ../plugins/groupwise-features/status-track.c:94
+#, fuzzy
+msgid "Message Status"
+msgstr "_Snimi kao..."
+
+#. Subject
+#: ../plugins/groupwise-features/status-track.c:108
+msgid "Subject:"
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:122
+msgid "From:"
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:137
+#, fuzzy
+msgid "Creation date:"
+msgstr "Datum dovršetka"
+
+#: ../plugins/groupwise-features/status-track.c:176
+#, fuzzy
+msgid "Recipient: "
+msgstr "Opis:"
+
+#: ../plugins/groupwise-features/status-track.c:183
+#, fuzzy
+msgid "Delivered: "
+msgstr "_Izbriši"
+
+#: ../plugins/groupwise-features/status-track.c:189
+#, fuzzy
+msgid "Opened: "
+msgstr "Otvori"
+
+#: ../plugins/groupwise-features/status-track.c:194
+#, fuzzy
+msgid "Accepted: "
+msgstr "Prihvaćeno"
+
+#: ../plugins/groupwise-features/status-track.c:199
+#, fuzzy
+msgid "Deleted: "
+msgstr "Obriši"
+
+#: ../plugins/groupwise-features/status-track.c:204
+#, fuzzy
+msgid "Declined: "
+msgstr "Odbijeno"
+
+#: ../plugins/groupwise-features/status-track.c:209
+#, fuzzy
+msgid "Completed: "
+msgstr "Završeno "
+
+#: ../plugins/groupwise-features/status-track.c:214
+#, fuzzy
+msgid "Undelivered: "
+msgstr "_Izbriši"
+
+#: ../plugins/groupwise-features/status-track.c:238
 #, fuzzy
 msgid "Track Message Status..."
 msgstr "_Snimi kao..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:724
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
+msgid "Add Hula support to Evolution."
+msgstr ""
+
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
+msgid "Hula Support"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.c:332
+#, fuzzy
+msgid "Custom Headers"
+msgstr "Proizvoljna _poruka"
+
+#: ../plugins/imap-features/imap-headers.c:345
+#, fuzzy
+msgid "IMAP Headers"
+msgstr "Zaglavlje"
+
+#: ../plugins/imap-features/imap-headers.glade.h:1
+#, fuzzy
+msgid "<b>Custom Headers</b>"
+msgstr "<b>Prisu_tni</b>"
+
+#: ../plugins/imap-features/imap-headers.glade.h:2
+#, fuzzy
+msgid "<b>IMAP Headers</b>"
+msgstr "<b>Upozorenja</b>"
+
+#: ../plugins/imap-features/imap-headers.glade.h:3
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:4
+msgid ""
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
+"You can ignore this if you choose \"All Headers\"."
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:6
+msgid ""
+"Select your IMAP Header Preferences. \n"
+"The more headers you have the more time it will take to download."
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:8
+msgid ""
+"_Basic Headers - (Fastest) \n"
+"Use this if you do not have filters based on mailing lists"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:10
+#, fuzzy
+msgid "_Fetch All Headers"
+msgstr "Puno zaglavlje"
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
+msgid "Fine-tune your IMAP accounts."
+msgstr ""
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+msgid "IMAP Features"
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
+msgid "Hardware Abstraction Layer not loaded"
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
+msgid ""
+"The \"hald\" service is required but not currently running. Please enable "
+"the service and rerun this program, or contact your system administrator."
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
+msgid "Search for an iPod failed"
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
+msgid ""
+"Evolution could not find an iPod to synchronize with. Either the iPod is not "
+"connected to the system or it is not powered on."
+msgstr ""
+
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
+#, fuzzy
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar datoteke (.ics)"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
+msgid "Synchronize to iPod"
+msgstr ""
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+msgid "Synchronize your data with your Apple iPod."
+msgstr ""
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
+msgid "iPod Synchronization"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:482
+#: ../plugins/itip-formatter/itip-formatter.c:607
+#, fuzzy, c-format
+msgid "Failed to load the calendar '%s'"
+msgstr "Nije moguće otvoriti kalendar '%s'."
+
+#: ../plugins/itip-formatter/itip-formatter.c:627
+#, fuzzy, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr "Nije moguće otvoriti kalendar %s' za kreiranje događaja i sastanaka"
+
+#: ../plugins/itip-formatter/itip-formatter.c:663
+#, fuzzy, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "Nije moguće otvoriti kalendar '%s'."
+
+#: ../plugins/itip-formatter/itip-formatter.c:753
+#, fuzzy
+msgid "Unable to find any calendars"
+msgstr "Ne mogu da prenesem kalendar '%s'"
+
+#: ../plugins/itip-formatter/itip-formatter.c:760
+#, fuzzy
+msgid "Unable to find this meeting in any calendar"
+msgstr "Nije moguće otvoriti kalendar '%s'."
+
+#: ../plugins/itip-formatter/itip-formatter.c:764
+#, fuzzy
+msgid "Unable to find this task in any task list"
+msgstr "Nije moguće otvaranje zadataka u '%s'."
+
+#: ../plugins/itip-formatter/itip-formatter.c:768
+msgid "Unable to find this memo in any memo list"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:839
+#, fuzzy
+msgid "Opening the calendar. Please wait.."
+msgstr "Novi kalendar"
+
+#: ../plugins/itip-formatter/itip-formatter.c:842
+msgid "Searching for an existing version of this appointment"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, fuzzy
 msgid "Unable to parse item"
 msgstr "Nije moguća analiza sadržaja poruke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:780
+#: ../plugins/itip-formatter/itip-formatter.c:1111
 #, fuzzy, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Nije moguće otvoriti kalendar '%s'."
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:1127
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:805
+#: ../plugins/itip-formatter/itip-formatter.c:1137
 #, c-format
-msgid "Sent to calendar '%s' as cancelled"
+msgid "Sent to calendar '%s' as canceled"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:898
+#: ../plugins/itip-formatter/itip-formatter.c:1231
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:905
-msgid "Sent a cancellation notice to the delegate"
+#: ../plugins/itip-formatter/itip-formatter.c:1238
+#, fuzzy
+msgid "Sent a cancelation notice to the delegate"
 msgstr ""
+"Želite li da pošaljete obavještenje o otkazivanju za ovaj unos u dnevniku?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:907
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 #, fuzzy
-msgid "Could not send the cancellation notice to the delegate"
+msgid "Could not send the cancelation notice to the delegate"
 msgstr ""
 "Želite li da pošaljete obavještenje o otkazivanju za ovaj unos u dnevniku?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:991
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 #, fuzzy
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Stanje prisutne osobe nije moglo biti osvježeno zbog neispravnog stanja!\n"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 #, fuzzy, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Ne mogu da prenesem kalendar '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1021
+#: ../plugins/itip-formatter/itip-formatter.c:1381
 #, fuzzy
 msgid "Attendee status updated"
 msgstr "Osvježeno stanje prisutne osobe\n"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1148
+#: ../plugins/itip-formatter/itip-formatter.c:1407
+#, fuzzy
+msgid "Meeting information sent"
+msgstr "Informacije o sastanku"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1410
+#, fuzzy
+msgid "Task information sent"
+msgstr "Informacija o zadatku"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1413
+#, fuzzy
+msgid "Memo information sent"
+msgstr "Nema informacija"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1422
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1425
+msgid "Unable to send task information, the task does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1428
+msgid "Unable to send memo information, the memo does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 #, fuzzy
 msgid "The calendar attached is not valid"
 msgstr ""
 "Podaci za kontakt nisu ispravni:\n"
 "\n"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1149
+#: ../plugins/itip-formatter/itip-formatter.c:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1508
 msgid ""
-"The message claims to contain a calendar, but the calendar is not valid "
+"The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1183
-#: ../plugins/itip-formatter/itip-formatter.c:1198
-#: ../plugins/itip-formatter/itip-formatter.c:1274
+#: ../plugins/itip-formatter/itip-formatter.c:1548
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The item in the calendar is not valid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1184
-#: ../plugins/itip-formatter/itip-formatter.c:1199
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1549
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1209
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1210
+#: ../plugins/itip-formatter/itip-formatter.c:1589
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1968
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 #, fuzzy
-msgid "Meetings and Tasks"
-msgstr "Kalendar i zadaci"
+msgid "This meeting recurs"
+msgstr "Ovaj sastanak se po_navlja"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2338
+#, fuzzy
+msgid "This task recurs"
+msgstr "Ovaj sastanak se po_navlja"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2341
+#, fuzzy
+msgid "This memo recurs"
+msgstr "Ovaj sastanak se po_navlja"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1991
+#: ../plugins/itip-formatter/itip-formatter.c:2574
 msgid "_Delete message after acting"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2001
+#: ../plugins/itip-formatter/itip-formatter.c:2584
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 #, fuzzy
-msgid "<span weight=\"bold\">Conflict Search</span>"
-msgstr "<span weight=\"bold\">Status</span>"
+msgid "Conflict Search"
+msgstr "Sporan kontakt:"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2014
+#: ../plugins/itip-formatter/itip-formatter.c:2599
 msgid "Select the calendars to search for meeting conflicts"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2031
-msgid "Conflict Search Table"
-msgstr ""
-
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
-msgid "Today"
-msgstr ""
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:189
+#: ../plugins/itip-formatter/itip-view.c:196
 #, fuzzy
 msgid "Today %H:%M"
 msgstr "Danas %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:200
 #, fuzzy
 msgid "Today %H:%M:%S"
 msgstr "Danas %H:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:202
+#: ../plugins/itip-formatter/itip-view.c:209
 #, fuzzy
 msgid "Today %l:%M:%S %p"
 msgstr "Danas %H:%M"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:212
-#, fuzzy
-msgid "Tomorrow"
-msgstr "Komori"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr ""
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr ""
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:233
 #, fuzzy
 msgid "Tomorrow %l:%M %p"
 msgstr "Danas %H:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:230
+#: ../plugins/itip-formatter/itip-view.c:237
 #, fuzzy
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Danas %H:%M"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:249
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr ""
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:261
 #, fuzzy
 msgid "%A %H:%M"
 msgstr "%a %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:258
+#: ../plugins/itip-formatter/itip-view.c:265
 #, fuzzy
 msgid "%A %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:270
 #, fuzzy
 msgid "%A %l:%M %p"
 msgstr "%a %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:267
+#: ../plugins/itip-formatter/itip-view.c:274
 #, fuzzy
 msgid "%A %l:%M:%S %p"
 msgstr "%a %H:%M"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:276
+#: ../plugins/itip-formatter/itip-view.c:283
 #, fuzzy
 msgid "%A, %B %e"
 msgstr "%A, %B %d, %Y"
@@ -15575,239 +17951,408 @@ msgstr "%A, %B %d, %Y"
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:282
+#: ../plugins/itip-formatter/itip-view.c:289
 #, fuzzy
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %d, %Y"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:286
+#: ../plugins/itip-formatter/itip-view.c:293
 #, fuzzy
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:298
 #, fuzzy
 msgid "%A, %B %e %l:%M %p"
 msgstr "%d %b H%:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:295
+#: ../plugins/itip-formatter/itip-view.c:302
 #, fuzzy
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%d %b H%:%M"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:308
 #, fuzzy
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:313
 #, fuzzy
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %d, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:310
+#: ../plugins/itip-formatter/itip-view.c:317
 #, fuzzy
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:322
 #, fuzzy
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %d, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:319
+#: ../plugins/itip-formatter/itip-view.c:326
 #, fuzzy
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:344
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
+#, c-format
+msgid "Please respond on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
+#, c-format
+msgid "Received on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:358
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> je objavio podatke o sastanku."
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:360
 #, fuzzy, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> je objavio podatke o sastanku."
 
-#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:365
 #, fuzzy, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> je odgovorio na zahtjev o sastanku."
 
-#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:368
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> traži da budete prisutni na sastanku."
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:370
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> traži da budete prisutni na sastanku."
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:376
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> želi dodati postojećem sastanku."
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:378
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> želi dodati postojećem sastanku."
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:382
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following meeting:"
+msgstr "<b>%s</b> želi dobiti posljednje podatke o zadatku."
+
+#: ../plugins/itip-formatter/itip-view.c:384
 #, fuzzy, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> želi dobiti posljednje podatke o zadatku."
 
-#: ../plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:388
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgstr "<b>%s</b> je poslao nerazumljivu poruku."
+
+#: ../plugins/itip-formatter/itip-view.c:390
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> je poslao nerazumljivu poruku."
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:394
 #, fuzzy, c-format
-msgid "<b>%s</b> through %s has cancelled the following meeting:"
+msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> je otkazo sastanak."
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:396
 #, fuzzy, c-format
-msgid "<b>%s</b> has cancelled the following meeting."
+msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> je otkazo sastanak."
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:400
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgstr "<b>%s</b> je odgovorio na zahtjev o sastanku."
+
+#: ../plugins/itip-formatter/itip-view.c:402
 #, fuzzy, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> je odgovorio na zahtjev o sastanku."
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:406
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> je odgovorio na zahtjev o sastanku."
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:408
 #, fuzzy, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> je odgovorio na zahtjev o sastanku."
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:446
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> je objavio podatke o zadatku."
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:448
 #, fuzzy, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> je objavio podatke o zadatku."
 
-#: ../plugins/itip-formatter/itip-view.c:419
+#: ../plugins/itip-formatter/itip-view.c:453
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> traži da %s bude prisutan na sastanku."
 
-#: ../plugins/itip-formatter/itip-view.c:422
+#: ../plugins/itip-formatter/itip-view.c:456
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> je otkazao zadatak."
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:458
 #, fuzzy, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> je otkazao zadatak."
 
-#: ../plugins/itip-formatter/itip-view.c:430
+#: ../plugins/itip-formatter/itip-view.c:464
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> želi dodati postojećem zadatku."
 
-#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:466
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> želi dodati postojećem zadatku."
 
-#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:470
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following assigned task:"
+msgstr "<b>%s</b> želi dobiti posljednje podatke o zadatku."
+
+#: ../plugins/itip-formatter/itip-view.c:472
 #, fuzzy, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> želi dobiti posljednje podatke o zadatku."
 
-#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:476
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
+msgstr "<b>%s</b> je poslao nerazumljivu poruku."
+
+#: ../plugins/itip-formatter/itip-view.c:478
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> je poslao nerazumljivu poruku."
 
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:482
 #, fuzzy, c-format
-msgid "<b>%s</b> through %s has cancelled the following assigned task:"
+msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> je otkazao zadatak."
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:484
 #, fuzzy, c-format
-msgid "<b>%s</b> has cancelled the following assigned task:"
+msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> je otkazao zadatak."
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:488
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgstr "<b>%s</b> je odgovorio na dodijeljeni zadatak."
+
+#: ../plugins/itip-formatter/itip-view.c:490
 #, fuzzy, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> je odgovorio na dodijeljeni zadatak."
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:496
 #, fuzzy, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> je odgovorio na dodijeljeni zadatak."
 
+#: ../plugins/itip-formatter/itip-view.c:534
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has published the following memo:"
+msgstr "<b>%s</b> je objavio podatke o zadatku."
+
+#: ../plugins/itip-formatter/itip-view.c:536
+#, fuzzy, c-format
+msgid "<b>%s</b> has published the following memo:"
+msgstr "<b>%s</b> je objavio podatke o zadatku."
+
+#: ../plugins/itip-formatter/itip-view.c:541
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+msgstr "<b>%s</b> želi dodati postojećem sastanku."
+
+#: ../plugins/itip-formatter/itip-view.c:543
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing memo:"
+msgstr "<b>%s</b> želi dodati postojećem sastanku."
+
+#: ../plugins/itip-formatter/itip-view.c:547
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has canceled the following shared memo:"
+msgstr "<b>%s</b> je otkazo sastanak."
+
+#: ../plugins/itip-formatter/itip-view.c:549
+#, fuzzy, c-format
+msgid "<b>%s</b> has canceled the following shared memo:"
+msgstr "<b>%s</b> je otkazao zadatak."
+
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:823
+#, fuzzy
+msgid "_Open Calendar"
+msgstr "Novi kalendar"
+
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:861
+#, fuzzy
+msgid "_Decline"
+msgstr "Odbij"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
+#, fuzzy
+msgid "_Accept"
+msgstr "Prihvati"
+
+#: ../plugins/itip-formatter/itip-view.c:833
+#, fuzzy
+msgid "_Decline all"
+msgstr "Odbij"
+
+#: ../plugins/itip-formatter/itip-view.c:834
+#, fuzzy
+msgid "_Tentative all"
+msgstr "Okvirno"
+
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
+#, fuzzy
+msgid "_Tentative"
+msgstr "Okvirno"
+
+#: ../plugins/itip-formatter/itip-view.c:835
+#, fuzzy
+msgid "_Accept all"
+msgstr "Prihvati"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:846
+#, fuzzy
+msgid "_Send Information"
+msgstr "<b>Informacije o serveru</b>"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:850
+#, fuzzy
+msgid "_Update Attendee Status"
+msgstr "Ažuriraj stanje stranke"
+
+#: ../plugins/itip-formatter/itip-view.c:853
+#, fuzzy
+msgid "_Update"
+msgstr "Ažuriraj"
+
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:1033
 #, fuzzy
 msgid "Start time:"
 msgstr "_Početno vrijeme:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:901
+#: ../plugins/itip-formatter/itip-view.c:1044
 #, fuzzy
 msgid "End time:"
 msgstr "_Krajnje vrijeme:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:917
-#: ../plugins/itip-formatter/itip-view.c:967
+#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1118
 #, fuzzy
 msgid "Comment:"
 msgstr "Firma:"
 
-#: ../plugins/itip-formatter/itip-view.c:981
-msgid "Send u_pdates to attendees"
+#: ../plugins/itip-formatter/itip-view.c:1103
+msgid "Send _reply to sender"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:990
+#: ../plugins/itip-formatter/itip-view.c:1133
 #, fuzzy
-msgid "A_pply to all instances"
+msgid "Send _updates to attendees"
+msgstr "Ne mogu da prenesem kalendar '%s'"
+
+#: ../plugins/itip-formatter/itip-view.c:1142
+#, fuzzy
+msgid "_Apply to all instances"
 msgstr "Sve pojave"
 
+#: ../plugins/itip-formatter/itip-view.c:1151
+#, fuzzy
+msgid "Show time as _free"
+msgstr "Pokaži vrijeme kao _zauzeto"
+
+#: ../plugins/itip-formatter/itip-view.c:1154
+msgid "_Preserve my reminder"
+msgstr ""
+
+#. To Translators: This is a check box to inherit a reminder.
+#: ../plugins/itip-formatter/itip-view.c:1160
+#, fuzzy
+msgid "_Inherit reminder"
+msgstr "Po_kaži podsjetnik"
+
+#: ../plugins/itip-formatter/itip-view.c:1914
+#, fuzzy
+msgid "_Memos:"
+msgstr "Članovi"
+
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
+msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr ""
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
@@ -15817,7 +18362,7 @@ msgstr ""
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot; ?"
+"&quot;{1}&quot;?"
 msgstr ""
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -15831,89 +18376,353 @@ msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "Ovaj odgovor nije poslao trenutni učesnik. Dodati ga u učesnike?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr ""
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Allows disabling of accounts."
-msgstr ""
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
 #, fuzzy
 msgid "Disable Account"
 msgstr "Isključi"
 
-#: ../plugins/mail-remote/client.c:30
-#, fuzzy, c-format
-msgid "System error: %s"
-msgstr "Greška pri provjeri: %s"
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable an account by right-clicking on it in the folder tree."
+msgstr ""
 
-#: ../plugins/mail-remote/client.c:32
-#, fuzzy, c-format
-msgid "Camel error: %s"
-msgstr "Greška pri provjeri: %s"
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Beep or play sound file."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Blink icon in notification area."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Enable D-Bus messages."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Enable icon in notification area."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr ""
 
-#: ../plugins/mail-remote/evolution-mail-store.c:476
-msgid "Account cannot send e-mail"
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Notify new messages for Inbox only."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Popup message together with the icon."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+msgid "Show new mail icon in notification area when new messages arrive."
 msgstr ""
 
-#: ../plugins/mail-remote/evolution-mail-store.c:605
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 #, fuzzy
-msgid "No store available"
-msgstr "Opis ne postoji."
+msgid "Sound file name to be played."
+msgstr "Naziv datoteke nije dat."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+msgid "Whether play sound or beep when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Whether show message over the icon when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+msgid "Whether the icon should blink or not."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:245
+msgid "Generate a _D-Bus message"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:368
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "Servis za alarm obavijesti Evolution kalendara"
+
+#: ../plugins/mail-notification/mail-notification.c:389
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "Grupa listi zadataka"
+
+#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:498
+#, c-format
+msgid ""
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
+"You have received %d new messages\n"
+"in %s."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
+#: ../plugins/mail-notification/mail-notification.c:503
+#, c-format
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../plugins/mail-notification/mail-notification.c:520
+#: ../plugins/mail-notification/mail-notification.c:525
+#, fuzzy
+msgid "New email"
+msgstr "Novi Zeland"
+
+#: ../plugins/mail-notification/mail-notification.c:588
+msgid "Show icon in _notification area"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:591
+msgid "B_link icon in notification area"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:593
+msgid "Popup _message together with the icon"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:774
+msgid "_Play sound when new messages arrive"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:780
+msgid "_Beep"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:781
+#, fuzzy
+msgid "Play _sound file"
+msgstr "Odsviraj zvuk"
+
+#: ../plugins/mail-notification/mail-notification.c:792
+msgid "Specify _filename:"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:793
+#, fuzzy
+msgid "Select sound file"
+msgstr "Izaberite odredište"
+
+#: ../plugins/mail-notification/mail-notification.c:794
+#, fuzzy
+msgid "Pl_ay"
+msgstr "Palau"
+
+#: ../plugins/mail-notification/mail-notification.c:851
+msgid "Notify new messages for _Inbox only"
+msgstr ""
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+#, fuzzy
+msgid "Mail Notification"
+msgstr "Poravnavanje"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Notifies you when new mail messages arrive."
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:376
+#, c-format
+msgid ""
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:379
+#, c-format
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:382
+#, c-format
 msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
 msgstr ""
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
-msgid "Mail Remote"
+#: ../plugins/mail-to-task/mail-to-task.c:399
+msgid ""
+"Selected calendar contains some events for the given mails already. Would "
+"you like to create new events anyway?"
 msgstr ""
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:402
 msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
+"Selected task list contains some tasks for the given mails already. Would "
+"you like to create new tasks anyway?"
 msgstr ""
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
+#: ../plugins/mail-to-task/mail-to-task.c:405
+msgid ""
+"Selected memo list contains some memos for the given mails already. Would "
+"you like to create new memos anyway?"
 msgstr ""
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
+#: ../plugins/mail-to-task/mail-to-task.c:423
+msgid ""
+"Selected calendar contains an event for the given mail already. Would you "
+"like to create new event anyway?"
+msgid_plural ""
+"Selected calendar contains events for the given mails already. Would you "
+"like to create new events anyway?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:429
+msgid ""
+"Selected task list contains a task for the given mail already. Would you "
+"like to create new task anyway?"
+msgid_plural ""
+"Selected task list contains tasks for the given mails already. Would you "
+"like to create new tasks anyway?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:435
+msgid ""
+"Selected memo list contains a memo for the given mail already. Would you "
+"like to create new memo anyway?"
+msgid_plural ""
+"Selected memo list contains memos for the given mails already. Would you "
+"like to create new memos anyway?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:494
 #, fuzzy
-msgid "Mail to meeting"
-msgstr "Novi sastanak"
+msgid "[No Summary]"
+msgstr "Nema sažetka"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:505
+msgid "Invalid object returned from a server"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:570
+#, c-format
+msgid "An error occurred during processing: %s"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:599
+#, fuzzy, c-format
+msgid "Cannot open calendar. %s"
+msgstr "Ne mogu otvoriti datoteku"
+
+#: ../plugins/mail-to-task/mail-to-task.c:606
 msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-msgid "Con_vert to Task"
+#: ../plugins/mail-to-task/mail-to-task.c:609
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
 msgstr ""
 
+#: ../plugins/mail-to-task/mail-to-task.c:612
+msgid ""
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:821
+#, c-format
+msgid "Cannot get source list. %s"
+msgstr ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
+#, fuzzy
+msgid "Create a Mem_o"
+msgstr "Kategorije"
+
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+#, fuzzy
+msgid "Create a _Meeting"
+msgstr "Unesite novi zahtjev za sastanak"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
+#, fuzzy
+msgid "Create a _Task"
+msgstr "Napravi novi zadatak"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+#, fuzzy
+msgid "Create an _Event"
+msgstr "Napravi novi zadatak"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
+msgid "Mail-to-Task"
 msgstr ""
 
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
+msgid "Create a new event from the selected message"
+msgstr ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
+#, fuzzy
+msgid "Create a new meeting from the selected message"
+msgstr "Unesite novi zahtjev za sastanak"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+msgid "Create a new memo from the selected message"
+msgstr ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+#, fuzzy
+msgid "Create a new task from the selected message"
+msgstr "Napravi novu listu zadataka"
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 #, fuzzy
 msgid "Contact list _owner"
 msgstr "Editor liste kontakata"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get list _archive"
 msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 #, fuzzy
 msgid "Get list _usage information"
 msgstr "Informacije o sastanku"
@@ -15929,23 +18738,18 @@ msgid "Mailing _List"
 msgstr "Poštanska adresa"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, "
-"unsubscribe, ...)."
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
 msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr ""
 
@@ -15988,8 +18792,8 @@ msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -16017,15 +18821,29 @@ msgstr "Šifrujem poruku"
 msgid "_Send message"
 msgstr "Potpisujem poruku"
 
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+#, fuzzy
+msgid "Contact List _Owner"
+msgstr "Editor liste kontakata"
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get an archive of the list this message belongs to"
+msgid "Get List _Archive"
 msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+#, fuzzy
+msgid "Get List _Usage Information"
+msgstr "Informacije o sastanku"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
+msgid "Get an archive of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 
@@ -16041,49 +18859,70 @@ msgstr ""
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr ""
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr ""
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+#, fuzzy
+msgid "_Post Message to List"
+msgstr "Pošalji poruku kontaktu"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+#, fuzzy
+msgid "_Subscribe to List"
+msgstr "_Opis:"
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+msgid "_Unsubscribe from List"
 msgstr ""
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make this available offline"
+#: ../plugins/mark-all-read/mark-all-read.c:39
+#, fuzzy
+msgid "Also mark messages in subfolders?"
+msgstr "Nacrtaj granice"
+
+#: ../plugins/mark-all-read/mark-all-read.c:41
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
 msgstr ""
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Mark Calendar for offline use"
+#: ../plugins/mark-all-read/mark-all-read.c:166
+#, fuzzy
+msgid "In Current Folder and _Subfolders"
+msgstr "Nacrtaj granice"
+
+#: ../plugins/mark-all-read/mark-all-read.c:180
+msgid "In Current _Folder Only"
 msgstr ""
 
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+msgid "Mark All Read"
 msgstr ""
 
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
-msgid "Mono Loader"
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+msgid "Mark Me_ssages as Read"
 msgstr ""
 
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-msgid "Generates a D-BUS message when new mail arrives."
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
+msgid "Mark all messages in a folder as read."
 msgstr ""
 
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-msgid "New Mail Notification"
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
+msgid "Mono Loader"
 msgstr ""
 
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
-msgid "New mail notify"
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Support plugins written in Mono."
 msgstr ""
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "A plugin for managing which plugins are enabled or disabled."
+msgid "Manage your Evolution plugins."
 msgstr ""
 
+#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-msgid "Plugin manager"
-msgstr ""
+#: ../plugins/plugin-manager/plugin-manager.c:252
+#, fuzzy
+msgid "Plugin Manager"
+msgstr "Menadžer"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
@@ -16091,306 +18930,522 @@ msgstr ""
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
 #, fuzzy
-msgid "Plugins"
+msgid "_Plugins"
 msgstr "Brisanje"
 
-#: ../plugins/plugin-manager/plugin-manager.c:45
+#: ../plugins/plugin-manager/plugin-manager.c:58
 #, fuzzy
 msgid "Author(s)"
 msgstr "sat(i)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:46
-#, fuzzy
-msgid "Id"
-msgstr "I"
-
-#: ../plugins/plugin-manager/plugin-manager.c:47
+#: ../plugins/plugin-manager/plugin-manager.c:146
 #, fuzzy
-msgid "Path"
-msgstr "Umetni"
-
-#: ../plugins/plugin-manager/plugin-manager.c:48
-#: ../widgets/table/e-table-config-no-group.glade.h:6
-#: ../widgets/table/e-table-config.glade.h:5
-msgid "Description"
-msgstr "Opis"
-
-#. Setup the ui
-#: ../plugins/plugin-manager/plugin-manager.c:188
-#, fuzzy
-msgid "Plugin Manager"
-msgstr "Menadžer"
+msgid "Configuration"
+msgstr "Nema informacija"
 
-#: ../plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 
-#: ../plugins/plugin-manager/plugin-manager.c:210
-#: ../plugins/plugin-manager/plugin-manager.c:271
+#: ../plugins/plugin-manager/plugin-manager.c:291
+#, fuzzy
+msgid "Overview"
+msgstr "Prepiši"
+
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 #, fuzzy
 msgid "Plugin"
 msgstr "Brisanje"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML mails.\n"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 #, fuzzy
 msgid "Plain Text Mode"
 msgstr "Model teksta"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
-msgid "Prefer plain-text"
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+#, fuzzy
+msgid "Prefer Plain Text"
+msgstr "Model teksta"
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:150
+#: ../plugins/prefer-plain/prefer-plain.c:234
 #, fuzzy
-msgid "HTML Mode"
+msgid "HTML _Mode"
 msgstr "Model teksta"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print mail from composer"
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
+#, fuzzy
+msgid "Evolution Profiler"
+msgstr "Evolution VCard uvoznik"
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
+msgid "Profile data events in Evolution (for developers only)."
 msgstr ""
 
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+msgid "Import Outlook messages from PST file"
+msgstr ""
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook PST import"
 msgstr ""
 
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr ""
+
+#. Address book
+#: ../plugins/pst-import/pst-importer.c:315
 #, fuzzy
-msgid "Prints the message"
-msgstr "Ne mogu otvoriti poruku"
+msgid "_Address Book"
+msgstr "Adresar"
+
+#. Appointments
+#: ../plugins/pst-import/pst-importer.c:322
+#, fuzzy
+msgid "A_ppointments"
+msgstr "Sastanak"
+
+#. Journal
+#: ../plugins/pst-import/pst-importer.c:334
+#, fuzzy
+msgid "_Journal entries"
+msgstr "Stavka dnevnika - %s"
+
+#: ../plugins/pst-import/pst-importer.c:349
+#, fuzzy
+msgid "Importing Outlook data"
+msgstr "Uvezi..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:98
-msgid "Spamassassin (built-in)"
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#, fuzzy
+msgid "Calendar Publishing"
+msgstr "Kalendari"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+#, fuzzy
+msgid "Locations"
+msgstr "Lokacija"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Publish calendars to the web."
 msgstr ""
 
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Sa junk-plugin"
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+#, fuzzy
+msgid "_Publish Calendar Information"
+msgstr "iCalendar informacije"
+
+#: ../plugins/publish-calendar/publish-calendar.c:95
+#: ../plugins/publish-calendar/publish-calendar.c:337
+#, fuzzy, c-format
+msgid "Could not open %s:"
+msgstr "Ne mogu otvoriti izvor"
+
+#: ../plugins/publish-calendar/publish-calendar.c:97
+#, fuzzy, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "Ne mogu otvoriti izvor"
+
+#: ../plugins/publish-calendar/publish-calendar.c:117
+#, c-format
+msgid "There was an error while publishing to %s:"
 msgstr ""
 
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "learns junk messages using spamd."
+#: ../plugins/publish-calendar/publish-calendar.c:119
+#, c-format
+msgid "Publishing to %s finished successfully"
 msgstr ""
 
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
-msgid "A plugin for saving all attachments or parts of a message at once."
+#: ../plugins/publish-calendar/publish-calendar.c:164
+#, c-format
+msgid "Mount of %s failed:"
 msgstr ""
 
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
+#: ../plugins/publish-calendar/publish-calendar.c:624
 #, fuzzy
-msgid "Save attachments"
-msgstr "Snimi sastanak"
+msgid "Are you sure you want to remove this location?"
+msgstr "Jeste li sigurni da želite obrisati ovu adresu?"
 
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
+#: ../plugins/publish-calendar/publish-calendar.c:788
 #, fuzzy
-msgid "Save Attachments ..."
-msgstr "Snimi kao..."
+msgid "Could not create publish thread."
+msgstr "Ne mogu otkazati"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Location</span>"
+msgstr "<span weight=\"bold\">Status</span>"
 
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-msgid "Save all attachments"
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+#, fuzzy
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr "<span weight=\"bold\">Status</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:6
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
 msgstr ""
 
-#: ../plugins/save-attachments/save-attachments.c:331
-msgid "Select save base name"
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "_Uključi"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Port:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#, fuzzy
+msgid "Publishing Location"
+msgstr "<b>_Mjesto objavljivanja</b>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#, fuzzy
+msgid "Publishing _Frequency:"
+msgstr "<b>Učestalost objavljivanja</b>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:13
+msgid ""
+"Secure FTP (SSH)\n"
+"Public FTP\n"
+"FTP (with login)\n"
+"Windows share\n"
+"WebDAV (HTTP)\n"
+"Secure WebDAV (HTTPS)\n"
+"Custom Location"
 msgstr ""
 
-#: ../plugins/save-attachments/save-attachments.c:351
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
 #, fuzzy
-msgid "MIME Type"
-msgstr "Vrsta"
+msgid "Service _type:"
+msgstr "Servis"
 
-#: ../plugins/save-attachments/save-attachments.c:359
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "Save"
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#, fuzzy
+msgid "Time _duration:"
+msgstr "Vremenska _zona:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#, fuzzy
+msgid "_File:"
+msgstr "_Titula:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+msgid "_Password:"
+msgstr "Ši_fra:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#, fuzzy
+msgid "_Publish as:"
+msgstr "ljubičasto plava"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+msgid "_Remember password"
+msgstr "_Zapamti šifru"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+msgid "_Username:"
+msgstr "_Korisničko ime:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
+#, fuzzy
+msgid ""
+"iCal\n"
+"Free/Busy"
+msgstr "Slobodan/zauzet:"
+
+#: ../plugins/publish-calendar/publish-format-fb.c:69
+#: ../plugins/publish-calendar/publish-format-ical.c:82
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
+msgstr ""
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
+#, fuzzy
+msgid "New Location"
+msgstr "Lokacija"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
+#, fuzzy
+msgid "Edit Location"
+msgstr "Lokacija"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+#, fuzzy
+msgid "Hello Python"
+msgstr "Kućni telefon"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using Python."
 msgstr ""
 
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#, fuzzy, c-format
+msgid "Failed to create pipe: %s"
+msgstr "Ne mogu da prenesem kalendar '%s'"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#, fuzzy, c-format
+msgid "Error after fork: %s"
+msgstr ""
+"Greška na %s:\n"
+" %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#, c-format
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
+#, fuzzy, c-format
+msgid "SpamAssassin is not available."
+msgstr "TLS nije dostupan"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
+msgid "I_nclude remote tests"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
+msgid "Filter junk messages using SpamAssassin."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
+msgid "SpamAssassin Junk Filter"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+#, fuzzy
+msgid "SpamAssassin Options"
+msgstr "Opcije"
+
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:171
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:385
-msgid "Uid"
+#: ../plugins/save-calendar/csv-format.c:356
+msgid "UID"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:358
 #, fuzzy
 msgid "Description List"
 msgstr "Opis"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:359
 #, fuzzy
 msgid "Categories List"
 msgstr "Kategorije: %s"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:360
 #, fuzzy
 msgid "Comment List"
 msgstr "Lista kontakata"
 
-#: ../plugins/save-calendar/csv-format.c:391
-#, fuzzy
-msgid "Created"
-msgstr "Završeno"
-
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:363
 #, fuzzy
 msgid "Contact List"
 msgstr "Lista kontakata"
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:364
 #, fuzzy
 msgid "Start"
 msgstr "Počinje"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:365
 #, fuzzy
 msgid "End"
 msgstr "Završava"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "percent Done"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:398
-msgid "Url"
-msgstr ""
+#: ../plugins/save-calendar/csv-format.c:369
+#, fuzzy
+msgid "URL"
+msgstr "_URL:"
 
-#: ../plugins/save-calendar/csv-format.c:399
+#: ../plugins/save-calendar/csv-format.c:370
 #, fuzzy
 msgid "Attendees List"
 msgstr "Učesnik"
 
-#: ../plugins/save-calendar/csv-format.c:401
+#: ../plugins/save-calendar/csv-format.c:372
 #, fuzzy
 msgid "Modified"
 msgstr "Model"
 
-#: ../plugins/save-calendar/csv-format.c:552
-msgid "Advanced options for the CSV format"
+#: ../plugins/save-calendar/csv-format.c:523
+msgid "A_dvanced options for the CSV format"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:559
-msgid "Prepend a header"
+#: ../plugins/save-calendar/csv-format.c:530
+msgid "Prepend a _header"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:568
-msgid "Value delimiter:"
+#: ../plugins/save-calendar/csv-format.c:539
+msgid "_Value delimiter:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:574
-msgid "Record delimiter:"
+#: ../plugins/save-calendar/csv-format.c:546
+msgid "_Record delimiter:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:580
-msgid "Encapsulate values with:"
+#: ../plugins/save-calendar/csv-format.c:553
+msgid "_Encapsulate values with:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:602
+#: ../plugins/save-calendar/csv-format.c:575
 msgid "Comma separated value format (.csv)"
 msgstr ""
 
-#: ../plugins/save-calendar/ical-format.c:137
-#, fuzzy
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar datoteke (.ics)"
-
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 #, fuzzy
 msgid "Save Selected"
 msgstr "Izabrano"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-#, fuzzy
-msgid "Save to _Disk"
-msgstr "Snimi zadatak"
+msgid "Save a calendar or task list to disk."
+msgstr ""
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-msgid "Saves selected calendar or tasks list to disk."
-msgstr ""
+#, fuzzy
+msgid "_Save to Disk"
+msgstr "Snimi zadatak"
 
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:158
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr ""
 
-#: ../plugins/save-calendar/rdf-format.c:396
+#: ../plugins/save-calendar/rdf-format.c:372
 msgid "RDF format (.rdf)"
 msgstr ""
 
-#: ../plugins/save-calendar/save-calendar.c:171
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:104
+#, fuzzy
+msgid "_Format:"
+msgstr "Format"
+
+#: ../plugins/save-calendar/save-calendar.c:165
 #, fuzzy
 msgid "Select destination file"
 msgstr "Izaberite odredište"
 
-#: ../plugins/save-calendar/save-calendar.c:216
-#, c-format
-msgid ""
-"The suggested filename extension of this filetype (%s) is unused in the "
-"chosen filename. Do you want to continue?"
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
+msgid "Quickly select a single calendar or task list for viewing."
 msgstr ""
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
 #, fuzzy
-msgid "Select one source"
+msgid "Select One Source"
 msgstr "Mod izbora"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr ""
-
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 #, fuzzy
-msgid "_Show only this Calendar"
+msgid "Show _only this Calendar"
 msgstr "_Proslijedi kao iCalendar "
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "_Show only this Task List"
-msgstr ""
+#, fuzzy
+msgid "Show _only this Memo List"
+msgstr "_Proslijedi kao iCalendar "
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
+#, fuzzy
+msgid "Show _only this Task List"
+msgstr "_Proslijedi kao iCalendar "
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "Startup wizard"
+msgid "Guides you through your initial account setup."
 msgstr ""
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
+#, fuzzy
+msgid "Setup Assistant"
+msgstr "Pomoćnik"
+
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr ""
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr ""
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -16398,25 +19453,35 @@ msgid ""
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:145
+#: ../plugins/startup-wizard/startup-wizard.c:115
+#, fuzzy
+msgid "Importing files"
+msgstr "Migriranje..."
+
+#: ../plugins/startup-wizard/startup-wizard.c:117
+#: ../shell/e-shell-importer.c:138
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: ../plugins/startup-wizard/startup-wizard.c:154
-#: ../shell/e-shell-importer.c:398
+#: ../plugins/startup-wizard/startup-wizard.c:132
+#: ../shell/e-shell-importer.c:419
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:509
-#, fuzzy
+#: ../plugins/startup-wizard/startup-wizard.c:203
+#: ../shell/e-shell-importer.c:548
+#, fuzzy, c-format
 msgid "Importing data."
 msgstr "Uvezi..."
 
+#: ../plugins/startup-wizard/startup-wizard.c:205
+#: ../shell/e-shell-importer.c:562
+msgid "Please wait"
+msgstr ""
+
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Indicates if threading of messages should fall back to subject."
+msgid "Sort mail message threads by subject."
 msgstr ""
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
@@ -16428,8 +19493,101 @@ msgid "Thread messages by subject"
 msgstr ""
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
-msgid "Fall back to threading messages by sub_ject"
+#: ../plugins/subject-thread/subject-thread.c:56
+msgid "F_all back to threading messages by subject"
+msgstr ""
+
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+
+#: ../plugins/templates/templates.c:601
+#, fuzzy
+msgid "No title"
+msgstr "Poslovna titula"
+
+#: ../plugins/templates/templates.c:709
+#, fuzzy
+msgid "Save as _Template"
+msgstr "Snimi kao VCard..."
+
+#: ../plugins/templates/templates.c:711
+#, fuzzy
+msgid "Save as Template"
+msgstr "Snimi kao VCard..."
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr ""
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr ""
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "TNEF Decoder"
+msgstr ""
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+#, fuzzy
+msgid "Inline vCards"
+msgstr "Višestruke VCards"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr ""
+
+#: ../plugins/vcard-inline/vcard-inline.c:159
+#: ../plugins/vcard-inline/vcard-inline.c:243
+#, fuzzy
+msgid "Show Full vCard"
+msgstr "Prikaži potpun VCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:162
+#, fuzzy
+msgid "Show Compact vCard"
+msgstr "Prikaži sažetu VCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:222
+#, fuzzy
+msgid "There is one other contact."
+msgstr "i još jedan kontakt."
+
+#: ../plugins/vcard-inline/vcard-inline.c:231
+#, fuzzy, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "i još jedan kontakt."
+msgstr[1] "i još %d kontakta."
+msgstr[2] "i još             ."
+
+#: ../plugins/vcard-inline/vcard-inline.c:252
+#, fuzzy
+msgid "Save in Address Book"
+msgstr "Snimi u adresar"
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "Add WebDAV contacts to Evolution."
+msgstr ""
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+#, fuzzy
+msgid "WebDAV contacts"
+msgstr "Nema kontakata"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
+msgid "WebDAV"
+msgstr ""
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
+#, fuzzy
+msgid "URL:"
+msgstr "_URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr ""
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -16440,117 +19598,278 @@ msgstr ""
 msgid "Evolution Shell Config factory"
 msgstr ""
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr ""
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:1
-msgid "A GNOME Print description of the current printer settings"
+#: ../shell/apps_evolution_shell.schemas.in.h:1
+msgid "Authenticate proxy server connections"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:2
+msgid "Automatic proxy configuration URL"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 #, fuzzy
 msgid "Default sidebar width"
 msgstr "Uobičajeni prioritet:"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+#, fuzzy
+msgid "Default window state"
+msgstr "Jedinice uobičajenog podsjetnika"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+#, fuzzy
+msgid "HTTP proxy password"
+msgstr "Upišite šifru"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy username"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:14
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:15
+#, fuzzy
+msgid "Initial attachment view"
+msgstr "Snimi sastanak"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid "Initial file chooser folder"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Last upgraded configuration version"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "Non-proxy hosts"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Proxy configuration mode"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "SOCKS proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
+msgid "SOCKS proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
+msgid "Secure HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+msgid "Secure HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:28
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 #, fuzzy
-msgid "Printer settings"
-msgstr "Podešavanja pilota..."
+msgid "Sidebar is visible"
+msgstr "Izvor papira:"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Skip development warning dialog"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:468
+#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:489
 msgid "Start in offline mode"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:32
+msgid "Statusbar is visible"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid ""
-"The configuration version of Evolution, with major/minor/configuration level"
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default height for the main window, in pixels."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The default width for the main window, in pixels."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The default width for the sidebar, in pixels."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+msgid "The machine name to proxy HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid "The machine name to proxy secure HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
+msgid "The machine name to proxy socks through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Toolbar is visible"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "URL that provides proxy configuration values."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
+msgid "Use HTTP proxy"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:49
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:51
+msgid "Whether or not the window should be maximized."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:52
+msgid "Whether the sidebar should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:53
+msgid "Whether the status bar should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the toolbar should be visible."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr ""
 
@@ -16566,29 +19885,21 @@ msgstr ""
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 
-#: ../shell/e-shell-folder-title-bar.c:586
-#: ../shell/e-shell-folder-title-bar.c:587
-msgid "(Untitled)"
-msgstr ""
-
-#: ../shell/e-shell-importer.c:133
+#: ../shell/e-shell-importer.c:128
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:136
+#: ../shell/e-shell-importer.c:131
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+"of file it is from the list."
 msgstr ""
 
-#: ../shell/e-shell-importer.c:142
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the destination for this import"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:148
+#: ../shell/e-shell-importer.c:141
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -16596,149 +19907,149 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:283
+#: ../shell/e-shell-importer.c:295
 msgid "F_ilename:"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:309
 msgid "File _type:"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:336
+#: ../shell/e-shell-importer.c:357
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:339
+#: ../shell/e-shell-importer.c:360
 msgid "Import a _single file"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:698
+#: ../shell/e-shell-importer.c:743
 msgid "_Import"
 msgstr ""
 
-#: ../shell/e-shell-settings-dialog.c:318
-msgid "Evolution Settings"
-msgstr ""
-
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr ""
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr ""
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr ""
+#: ../shell/e-shell-settings-dialog.c:312
+#, fuzzy
+msgid "Evolution Preferences"
+msgstr "pojave"
 
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
+#. To translators: This is the window title and %s is the
+#. component name. Most translators will want to keep it as is.
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
+#, c-format
+msgid "%s - Evolution"
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:70
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
 #: ../shell/e-shell-window-commands.c:78
-#, c-format
-msgid "Error executing %s."
+#, fuzzy, c-format
+msgid "Error executing %s. (%s)"
 msgstr ""
+"Greška na %s:\n"
+" %s"
 
-#: ../shell/e-shell-window-commands.c:127
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy is not installed."
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:135
+#: ../shell/e-shell-window-commands.c:138
 msgid "Bug buddy could not be run."
 msgstr ""
 
 #. The translator-credits string is for translators to list
-#. * per language credits for translation, displayed in the
-#. * about box
-#: ../shell/e-shell-window-commands.c:532
+#. * per-language credits for translation, displayed in the
+#. * about dialog.
+#: ../shell/e-shell-window-commands.c:938
 msgid "translator-credits"
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:546
-msgid "Groupware Suite"
-msgstr ""
+#: ../shell/e-shell-window-commands.c:949
+#, fuzzy
+msgid "Evolution Website"
+msgstr "Evolution iCalendar uvoznik"
 
-#: ../shell/e-shell-window-commands.c:774
+#: ../shell/e-shell-window-commands.c:1163
 msgid "_Work Online"
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
+#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:800
+#: ../shell/e-shell-window-commands.c:1189
 msgid "Work Offline"
 msgstr ""
 
-#: ../shell/e-shell-window.c:343
-msgid "Evolution is currently online.  Click on this button to work offline."
+#: ../shell/e-shell-window.c:372
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
 
-#: ../shell/e-shell-window.c:351
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: ../shell/e-shell-window.c:358
-msgid "Evolution is currently offline.  Click on this button to work online."
+#: ../shell/e-shell-window.c:386
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
 
-#: ../shell/e-shell-window.c:724
+#: ../shell/e-shell-window.c:778
 #, c-format
 msgid "Switch to %s"
 msgstr ""
 
-#: ../shell/e-shell.c:623
-msgid "Uknown system error."
-msgstr ""
+#: ../shell/e-shell.c:634
+#, fuzzy
+msgid "Unknown system error."
+msgstr "(Nepoznata greška)"
 
-#: ../shell/e-shell.c:825 ../shell/e-shell.c:826
+#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
 #, c-format
 msgid "%ld KB"
 msgstr ""
 
-#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
 msgid "OK"
 msgstr "U redu"
 
-#: ../shell/e-shell.c:1259
+#: ../shell/e-shell.c:1253
 msgid "Invalid arguments"
 msgstr ""
 
-#: ../shell/e-shell.c:1261
+#: ../shell/e-shell.c:1255
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1257
 msgid "Configuration Database not found"
 msgstr ""
 
-#: ../shell/e-user-creatable-items-handler.c:685
+#: ../shell/e-user-creatable-items-handler.c:674
+#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:689
 msgid "New"
 msgstr ""
 
-#: ../shell/evolution-test-component.c:140
+#: ../shell/test/evolution-test-component.c:103
 msgid "New Test"
 msgstr ""
 
-#: ../shell/evolution-test-component.c:141
+#: ../shell/test/evolution-test-component.c:104
+#, fuzzy
+msgctxt "New"
 msgid "_Test"
-msgstr ""
+msgstr "_Uto"
 
-#: ../shell/evolution-test-component.c:142
+#: ../shell/test/evolution-test-component.c:105
 msgid "Create a new test item"
 msgstr ""
 
@@ -16763,8 +20074,9 @@ msgid "Importer Type"
 msgstr ""
 
 #: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr ""
+#, fuzzy
+msgid "Select Information to Import"
+msgstr "<b>Informacije o serveru</b>"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -16778,7 +20090,7 @@ msgid ""
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16790,7 +20102,7 @@ msgid ""
 "If you want a stable version of Evolution, we urge you to uninstall\n"
 "this version, and install version %s instead.\n"
 "\n"
-"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
@@ -16798,41 +20110,50 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: ../shell/main.c:254
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: ../shell/main.c:261
-msgid "Don't tell me again"
-msgstr ""
+#: ../shell/main.c:257
+#, fuzzy
+msgid "Do not tell me again"
+msgstr "Ne pitaj me ponovno."
 
-#: ../shell/main.c:466
+#: ../shell/main.c:487
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: ../shell/main.c:470
+#: ../shell/main.c:491
 msgid "Start in online mode"
 msgstr ""
 
-#: ../shell/main.c:473
+#: ../shell/main.c:494
 msgid "Forcibly shut down all Evolution components"
 msgstr ""
 
-#: ../shell/main.c:477
+#: ../shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: ../shell/main.c:480
+#: ../shell/main.c:501
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: ../shell/main.c:482
+#: ../shell/main.c:503
 msgid "Disable loading of any plugins."
 msgstr ""
 
-#: ../shell/main.c:513
+#: ../shell/main.c:505
+msgid "Disable preview pane of Mail, Contacts and Tasks."
+msgstr ""
+
+#: ../shell/main.c:614
+msgid "- The Evolution PIM and Email Client"
+msgstr ""
+
+#: ../shell/main.c:642
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16845,34 +20166,39 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Sigurni ste da želite obrisati ovih {0} zadatka?"
 
 #: ../shell/shell.error.xml.h:2
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Ne mogao pokrenuti evolution-data-server"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:6
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed. "
+"reprompted next time they are needed."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory is about to be be "
+"The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
 "\n"
 "It is suggested you manually verify that all of your mail, contact, and "
@@ -16883,37 +20209,37 @@ msgid ""
 "without manual intervention.\n"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:15
+#: ../shell/shell.error.xml.h:16
 msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+"The previous version of Evolution stored its data in a different location.\n"
 "\n"
 "If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently.  If you choose to "
-"keep this data, then you may manually remove the contents of &quot;"
+"evolution&quot; directory will be removed permanently. If you choose to keep "
+"this data, then you may manually remove the contents of &quot;"
 "evolution&quot; at your convenience.\n"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:21
 msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
+"Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
 "\n"
 "You will need to make more space available in your home directory before you "
 "can continue."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
 "Click help for details"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -16922,20 +20248,20 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 #, fuzzy
 msgid "_Forget"
 msgstr "_Port:"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
@@ -16943,7 +20269,7 @@ msgid ""
 "data.\n"
 msgstr ""
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -16951,88 +20277,105 @@ msgid ""
 "Edit trust settings:"
 msgstr ""
 
-#: ../smime/gui/cert-trust-dialog.c:145
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 msgstr ""
 
-#: ../smime/gui/cert-trust-dialog.c:149
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:134
-#: ../smime/gui/certificate-manager.c:142
-#: ../smime/gui/certificate-manager.c:377
-#: ../smime/gui/certificate-manager.c:385
-#: ../smime/gui/certificate-manager.c:597
-#: ../smime/gui/certificate-manager.c:605
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:611
 msgid "Select a certificate to import..."
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:265
-#: ../smime/gui/certificate-manager.c:474
-#: ../smime/gui/certificate-manager.c:692
+#: ../smime/gui/certificate-manager.c:145
+msgid "All PKCS12 files"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:398
+#: ../smime/gui/certificate-manager.c:625
+#, fuzzy
+msgid "All files"
+msgstr "Dopusti nove linije"
+
+#: ../smime/gui/certificate-manager.c:275
+#: ../smime/gui/certificate-manager.c:488
+#: ../smime/gui/certificate-manager.c:713
 msgid "Certificate Name"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:492
+#: ../smime/gui/certificate-manager.c:284
+#: ../smime/gui/certificate-manager.c:506
 msgid "Purposes"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:569
+#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:291
+#: ../smime/gui/certificate-manager.c:301
 msgid "Expires"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:483
+#: ../smime/gui/certificate-manager.c:392
+msgid "All email certificate files"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:497
 msgid "E-Mail Address"
 msgstr ""
 
-#: ../smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-manager.c:620
+#, fuzzy
+msgid "All CA certificate files"
+msgstr "Certifikati"
+
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 
-#: ../smime/gui/component.c:45
+#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr ""
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:68
+#: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
 msgstr ""
 
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr ""
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: ../smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr ""
 
@@ -17090,7 +20433,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr ""
 
@@ -17167,11 +20510,11 @@ msgstr ""
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -17217,249 +20560,185 @@ msgid "_Edit CA Trust"
 msgstr ""
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:651
+#: ../smime/lib/e-cert-db.c:652
 msgid "Certificate already exists"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr ""
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:424
+#: ../smime/lib/e-cert.c:407
 msgid "Sign"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:408
 msgid "Encrypt"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:513
 msgid "Version"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:528
 msgid "Version 1"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:642
-msgid "C"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:645
-msgid "CN"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:648
-msgid "OU"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:651
-msgid "O"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:654
-msgid "L"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:657
-msgid "DN"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:660
-msgid "DC"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:663
-msgid "ST"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:678
-msgid "UID"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: ../smime/lib/e-cert.c:687
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:738
+#: ../smime/lib/e-cert.c:720
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:746
+#: ../smime/lib/e-cert.c:728
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:768
+#: ../smime/lib/e-cert.c:750
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:755
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:788
+#: ../smime/lib/e-cert.c:770
 msgid "Subject's Public Key"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
 msgid "Error: Unable to process extension"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:834
+#: ../smime/lib/e-cert.c:816
 msgid "SSL Certificate Authority"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:838
+#: ../smime/lib/e-cert.c:820
 msgid "Email Certificate Authority"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:848
 msgid "Signing"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:852
 msgid "Non-repudiation"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:856
 msgid "Key Encipherment"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:860
 msgid "Data Encipherment"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:864
 msgid "Key Agreement"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:868
 msgid "Certificate Signer"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:872
 msgid "CRL Signer"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:938
+#: ../smime/lib/e-cert.c:920
 msgid "Critical"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:964
+#: ../smime/lib/e-cert.c:946
 msgid "Extensions"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1035
+#: ../smime/lib/e-cert.c:1017
 #, c-format
 msgid "%s = %s"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1081
 msgid "Issuer"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1135
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1173
+#: ../smime/lib/e-cert.c:1154
 msgid "Subject Unique ID"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1216
+#: ../smime/lib/e-cert.c:1197
 msgid "Certificate Signature Value"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
 msgstr ""
 
-#: ../tools/evolution-launch-composer.c:324
-msgid "An attachment to add."
-msgstr ""
-
-#: ../tools/evolution-launch-composer.c:325
-msgid "Content type of the attachment."
-msgstr ""
-
-#: ../tools/evolution-launch-composer.c:326
-msgid "The filename to display in the mail."
-msgstr ""
-
-#: ../tools/evolution-launch-composer.c:327
-msgid "Description of the attachment."
-msgstr ""
-
-#: ../tools/evolution-launch-composer.c:328
-msgid "Mark attachment to be shown inline by default."
-msgstr ""
-
-#: ../tools/evolution-launch-composer.c:329
-msgid "Default subject for the message."
-msgstr ""
-
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
@@ -17473,108 +20752,232 @@ msgstr ""
 msgid "Shutting down %s (%s)\n"
 msgstr ""
 
+#: ../ui/evolution-addressbook.xml.h:1
+#, fuzzy
+msgid "Address _Book Properties"
+msgstr "Postavke adresara"
+
 #: ../ui/evolution-addressbook.xml.h:3
-msgid "Copy Selected Contacts to Another Folder..."
+msgid "Change the properties of the selected folder"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:4
+#, fuzzy
+msgid "Co_py All Contacts To..."
+msgstr "Kopiraj kontakte u "
+
+#: ../ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Contact _Preview"
+msgstr "Testiranje štampe kontakata"
+
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopiraj"
+
+#: ../ui/evolution-addressbook.xml.h:7
+msgid "Copy selected contacts to another folder"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:8
+msgid "Copy the contacts of the selected folder into another folder"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:5
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "Create a new address book folder"
+msgstr "Napravi novi adresar"
+
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Izreži"
+
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Del_ete Address Book"
+msgstr "Novi adresar"
+
+#: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:11
-msgid "Move Selected Contacts to Another Folder..."
+#: ../ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Delete the selected folder"
+msgstr "Brišem odabrane objekte"
+
+#: ../ui/evolution-addressbook.xml.h:18
+msgid "Forward Contact"
+msgstr "Prosljedi kontakt"
+
+#: ../ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Mo_ve All Contacts To..."
+msgstr "Premjesti kontakte u"
+
+#: ../ui/evolution-addressbook.xml.h:20
+msgid "Move selected contacts to another folder"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:21
+msgid "Move the contacts of the selected folder into another folder"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Umetni"
+
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:18
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:20
-msgid "Save selected contacts as a VCard."
+#: ../ui/evolution-addressbook.xml.h:29
+msgid "Rename the selected folder"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:30
+#, fuzzy
+msgid "S_ave Address Book As VCard"
+msgstr "Novi adresar"
+
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "Snimi kao VCard..."
+
+#: ../ui/evolution-addressbook.xml.h:32
+msgid "Save selected contacts as a VCard"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:33
+msgid "Save the contacts of the selected folder as VCard"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:21 ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
 msgid "Select All"
 msgstr "Izaberi sve"
 
-#: ../ui/evolution-addressbook.xml.h:22
-msgid "Select all contacts"
+#: ../ui/evolution-addressbook.xml.h:35
+msgid "Select _All"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:23
-msgid "Send a message to the selected contacts."
+#: ../ui/evolution-addressbook.xml.h:36
+msgid "Select all contacts"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:37
+#, fuzzy
+msgid "Send a message to the selected contacts"
+msgstr "Pošalji poruku kontaktu"
+
+#: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:25
-msgid "Send selected contacts to another person."
+#: ../ui/evolution-addressbook.xml.h:39
+msgid "Send selected contacts to another person"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:41
+#, fuzzy
+msgid "St_op"
+msgstr "_Kopiraj"
+
+#: ../ui/evolution-addressbook.xml.h:42
 msgid "Stop"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:43
 msgid "Stop Loading"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:44
 msgid "View the current contact"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-addressbook.xml.h:47
+#, fuzzy
+msgid "_Copy Contact to..."
+msgstr "Kopiraj kontakt u "
+
+#: ../ui/evolution-addressbook.xml.h:48
+#, fuzzy
+msgid "_Copy Folder Contacts To"
+msgstr "Idi u direktorij..."
+
+#: ../ui/evolution-addressbook.xml.h:50
+#, fuzzy
+msgid "_Delete Contact"
+msgstr "_Kontakt"
+
+#: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "_Preview Pane"
-msgstr ""
+#: ../ui/evolution-addressbook.xml.h:53
+#, fuzzy
+msgid "_Move Contact to..."
+msgstr "Premjesti kontakt u"
 
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard..."
+#: ../ui/evolution-addressbook.xml.h:54
+#, fuzzy
+msgid "_Move Folder Contacts To"
+msgstr "Idi u direktorij..."
+
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
+msgid "_New"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "_Select All"
+#: ../ui/evolution-addressbook.xml.h:60
+#, fuzzy
+msgid "_Rename"
+msgstr "_Puno ime:"
+
+#: ../ui/evolution-addressbook.xml.h:61
+#, fuzzy
+msgid "_Save Contact as VCard..."
+msgstr "Snimi kao VCard..."
+
+#: ../ui/evolution-addressbook.xml.h:62
+msgid "_Save Folder Contacts As VCard"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
 msgstr ""
 
@@ -17583,59 +20986,59 @@ msgid "Day"
 msgstr ""
 
 #: ../ui/evolution-calendar.xml.h:6
-msgid "Delete All Occurrences"
-msgstr ""
+#, fuzzy
+msgid "Delete _all Occurrences"
+msgstr "Obriši _sve pojave"
 
 #: ../ui/evolution-calendar.xml.h:7
-msgid "Delete the appointment"
-msgstr ""
+#, fuzzy
+msgid "Delete all occurrences"
+msgstr "Obriši _sve pojave"
 
 #: ../ui/evolution-calendar.xml.h:8
-msgid "Delete this Occurrence"
+msgid "Delete the appointment"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:9
+#: ../ui/evolution-calendar.xml.h:10
 msgid "Delete this occurrence"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:10
+#: ../ui/evolution-calendar.xml.h:11
 msgid "Go To"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:13
 msgid "Go forward"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:14
 msgid "List"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
+#: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
+#: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:21
-msgid "Print this calendar"
-msgstr ""
-
 #: ../ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy information for this calendar"
+msgid "Print this calendar"
 msgstr ""
 
 #: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
@@ -17650,6 +21053,10 @@ msgstr ""
 msgid "Select _Date"
 msgstr ""
 
+#: ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
+msgstr "Izaberi _današnji dan"
+
 #: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr ""
@@ -17682,44 +21089,25 @@ msgstr ""
 msgid "View the current appointment"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:36
-msgid "Week"
+#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
 msgstr ""
 
 #: ../ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr ""
-
-#: ../ui/evolution-calendar.xml.h:42
-msgid "_Open Appointment"
-msgstr ""
-
-#: ../ui/evolution-composer-entries.xml.h:1
-msgid "Copy selected text to the clipboard"
-msgstr ""
-
-#: ../ui/evolution-composer-entries.xml.h:2
-msgid "Cu_t"
-msgstr ""
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Cut selected text to the clipboard"
-msgstr ""
-
-#: ../ui/evolution-composer-entries.xml.h:4
-msgid "Paste text from the clipboard"
+msgid "Week"
 msgstr ""
 
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
-msgid "Select _All"
+#: ../ui/evolution-calendar.xml.h:38
+msgid "Work Week"
 msgstr ""
 
-#: ../ui/evolution-composer-entries.xml.h:6
-msgid "Select all text"
-msgstr ""
+#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Debug Logs"
+msgstr "Web dnevnik:"
 
-#: ../ui/evolution-executive-summary.xml.h:1
-msgid "Customize My Evolution"
+#: ../ui/evolution-calendar.xml.h:45
+msgid "_Open Appointment"
 msgstr ""
 
 #: ../ui/evolution-mail-global.xml.h:2
@@ -17743,68 +21131,98 @@ msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
 #: ../ui/evolution-mail-global.xml.h:7
+msgid "Download messages of accounts/folders marked for offline"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr ""
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
-#: ../ui/evolution-subscribe.xml.h:2
+#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
 msgid "F_older"
 msgstr ""
 
-#: ../ui/evolution-mail-global.xml.h:9
-#, fuzzy
-msgid "Message F_ilters"
-msgstr "Poruka"
-
 #: ../ui/evolution-mail-global.xml.h:10
-#, fuzzy
-msgid "Message _Preview"
-msgstr "Poruka"
-
-#: ../ui/evolution-mail-global.xml.h:11
 msgid "Move the selected folder into another folder"
 msgstr ""
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:13
 #, fuzzy
 msgid "Search F_olders"
 msgstr "_Pretrage"
 
+#: ../ui/evolution-mail-global.xml.h:14
+#, fuzzy
+msgid "Show Message _Preview"
+msgstr "Poruka"
+
 #: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview window"
+msgid "Show message preview below the message list"
 msgstr ""
 
 #: ../ui/evolution-mail-global.xml.h:16
-msgid "Subscribe or unsubscribe to folders on remote servers"
+msgid "Show message preview side-by-side with the message list"
 msgstr ""
 
 #: ../ui/evolution-mail-global.xml.h:17
+msgid "Show message preview window"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:18
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:20
+#, fuzzy
+msgid "_Classic View"
+msgstr "Pogled karte"
+
+#: ../ui/evolution-mail-global.xml.h:21
 #, fuzzy
 msgid "_Copy Folder To..."
 msgstr "Idi u direktorij..."
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:23
+msgid "_Download Messages for Offline Usage"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:25
+#, fuzzy
+msgid "_Message Filters"
+msgstr "Poruka"
+
+#: ../ui/evolution-mail-global.xml.h:26
 #, fuzzy
 msgid "_Move Folder To..."
 msgstr "Idi u direktorij..."
 
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:27
 msgid "_New..."
 msgstr ""
 
+#: ../ui/evolution-mail-global.xml.h:28
+#, fuzzy
+msgid "_Preview"
+msgstr "Pregled:"
+
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:32
 #, fuzzy
-msgid "_Subscriptions"
+msgid "_Subscriptions..."
 msgstr "_Opis:"
 
+#: ../ui/evolution-mail-global.xml.h:33
+#, fuzzy
+msgid "_Vertical View"
+msgstr "Uspravna mreža za crtanje"
+
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr ""
@@ -17813,103 +21231,139 @@ msgstr ""
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Collapse All _Threads"
+msgstr "Grupiši po ovom polju"
+
+#: ../ui/evolution-mail-list.xml.h:4
+#, fuzzy
+msgid "Collapse all message threads"
+msgstr "Poruka servera:"
+
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
 msgstr ""
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Cut selected message(s) to the clipboard"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:8
+msgid "E_xpand All Threads"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:8
-#, fuzzy
-msgid "Group By _Threads"
-msgstr "Grupiši po ovom polju"
+#: ../ui/evolution-mail-list.xml.h:10
+msgid "Expand all message threads"
+msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:12
 #, fuzzy
 msgid "Hide S_elected Messages"
 msgstr "Poruka servera:"
 
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:13
 msgid "Hide _Deleted Messages"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-list.xml.h:14
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "Poruka servera:"
 
-#: ../ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:15
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Mark Me_ssages as Read"
+#: ../ui/evolution-mail-list.xml.h:16
+msgid "Mar_k All Messages as Read"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-list.xml.h:17
+msgid "Mark all messages in the folder as read"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Permanently remove this folder"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Refresh the folder"
+msgstr "Nacrtaj granice"
+
+#: ../ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Select Message S_ubthread"
+msgstr "Poruka servera:"
+
+#: ../ui/evolution-mail-list.xml.h:24
 #, fuzzy
 msgid "Select Message _Thread"
 msgstr "Poruka servera:"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:25
 #, fuzzy
 msgid "Select _All Messages"
 msgstr "Izaberi sve"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:27
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:28
+msgid "Select all replies to the currently selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Select all visible messages"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:30
 #, fuzzy
-msgid "Sh_ow Hidden Messages"
+msgid "Show Hidde_n Messages"
 msgstr "Poruka"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:32
 msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:33
 msgid "Temporarily hide the selected messages"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-list.xml.h:36
+#, fuzzy
+msgid "_Group By Threads"
+msgstr "Grupiši po ovom polju"
+
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 #, fuzzy
 msgid "_Message"
@@ -17956,81 +21410,94 @@ msgstr ""
 msgid "Compose a reply to the sender of the selected message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:13
+msgid "Copy selected messages to the clipboard"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:15
 #, fuzzy
 msgid "Create a Search Folder for these recipients"
 msgstr "Napravi novu listu kontakata"
 
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:16
 #, fuzzy
 msgid "Create a Search Folder for this mailing list"
 msgstr "Napravi novu listu kontakata"
 
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:17
 #, fuzzy
 msgid "Create a Search Folder for this sender"
 msgstr "Napravi novu listu kontakata"
 
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:18
 #, fuzzy
 msgid "Create a Search Folder for this subject"
 msgstr "Napravi novu listu kontakata"
 
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:23
+msgid "Cut selected messages to the clipboard"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
 msgstr ""
 
+#: ../ui/evolution-mail-message.xml.h:28
+msgid "Display the next thread"
+msgstr ""
+
 #: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:30
-msgid "Display the next unread thread"
+msgid "Display the previous important message"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:31
-msgid "Display the previous important message"
+msgid "Display the previous message"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:32
-msgid "Display the previous message"
+msgid "Display the previous unread message"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:33
-msgid "Display the previous unread message"
-msgstr ""
+#, fuzzy
+msgid "F_orward As..."
+msgstr "_Snimi kao..."
 
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
@@ -18053,7 +21520,7 @@ msgid "Filter the selected messages for junk status"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected message(s) for follow-up"
+msgid "Flag selected messages for follow-up"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:40
@@ -18089,538 +21556,329 @@ msgid "Mar_k as"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected message(s) as having been read"
+msgid "Mark the selected messages as having been read"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected message(s) as important"
-msgstr ""
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "_Obilježi odabrane zadatke kao izvršene "
 
 #: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected message(s) as junk"
+msgid "Mark the selected messages as junk"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected message(s) as not being junk"
+msgid "Mark the selected messages as not being junk"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected message(s) as not having been read"
+msgid "Mark the selected messages as not having been read"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected message(s) as unimportant"
-msgstr ""
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "_Obilježi odabrane zadatke kao izvršene "
 
 #: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:57
-#, fuzzy
-msgid "Message Source"
-msgstr "Poruka"
-
-#: ../ui/evolution-mail-message.xml.h:58
-msgid "Move"
+msgid "Move selected messages to another folder"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:59
-msgid "Move selected message(s) to another folder"
-msgstr ""
-
-#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Important Message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:66
-msgid "Open the selected message in a new window"
+#: ../ui/evolution-mail-message.xml.h:64
+msgid "Open the selected messages in a new window"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:67
-msgid "Open the selected message in the composer for editing"
+#: ../ui/evolution-mail-message.xml.h:65
+msgid "Open the selected messages in the composer for editing"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:70
-#, fuzzy
-msgid "Pos_t New Message to Folder"
-msgstr "Pošalji poruku kontaktu"
-
-#: ../ui/evolution-mail-message.xml.h:71
-msgid "Post a Repl_y"
-msgstr ""
-
-#: ../ui/evolution-mail-message.xml.h:72
-msgid "Post a message to a Public folder"
-msgstr ""
-
-#: ../ui/evolution-mail-message.xml.h:73
-msgid "Post a reply to a message in a Public folder"
+#: ../ui/evolution-mail-message.xml.h:67
+msgid "Paste messages from the clipboard"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "Pr_evious Important Message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Print this message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Re_direct"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Save the message as a text file"
+#: ../ui/evolution-mail-message.xml.h:81
+msgid "Save the selected messages as a text file"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Search Folder from Mailing _List..."
 msgstr "Napravi novu listu kontakata"
 
-#: ../ui/evolution-mail-message.xml.h:88
-msgid "Search Folder from Recipients..."
-msgstr ""
+#: ../ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "Search Folder from Recipien_ts..."
+msgstr "_Pretrage"
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search Folder from S_ubject..."
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Search Folder from Sen_der..."
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "Select _All Text"
 msgstr "Izaberi sve"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Select all the text in a message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "Show message in the normal style"
-msgstr ""
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "Show message with all email headers"
+#: ../ui/evolution-mail-message.xml.h:91
+msgid "Show messages with all email headers"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:99
-msgid "Un-delete the selected messages"
-msgstr ""
+#: ../ui/evolution-mail-message.xml.h:93
+#, fuzzy
+msgid "Undelete the selected messages"
+msgstr "Poruka servera:"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Uni_mportant"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:96
+#, fuzzy
+msgid "_Attached"
+msgstr "Snimi sastanak"
+
+#: ../ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "_Caret Mode"
 msgstr "Model teksta"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Clear Flag"
+msgstr "_Očisti"
+
+#: ../ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Delete Message"
 msgstr "Poruka servera:"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "_Find in Message..."
 msgstr "Potpisujem poruku"
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:104
+#, fuzzy
+msgid "_Flag Completed"
+msgstr "Završeno"
+
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Important"
 msgstr "Uvezi..."
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:108
+msgid "_Inline"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Junk"
 msgstr "_Ned"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Load Images"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:112
+#, fuzzy
+msgid "_Message Source"
+msgstr "Poruka"
+
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:115
 #, fuzzy
 msgid "_Normal Size"
 msgstr "Obično"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:120
+#, fuzzy
+msgid "_Quoted"
+msgstr "I_zreži"
+
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:122
+#, fuzzy
+msgid "_Read"
+msgstr "_Sri"
+
+#: ../ui/evolution-mail-message.xml.h:124
 #, fuzzy
 msgid "_Save Message..."
 msgstr "_Snimi kao..."
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:125
 #, fuzzy
 msgid "_Undelete Message"
 msgstr "Neispravna poruka o sastanku"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Unread"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:127
+#, fuzzy
+msgid "_Zoom"
+msgstr "Soba"
+
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Zoom In"
 msgstr ""
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
 #: ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:7
 msgid "Close"
 msgstr ""
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr ""
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr ""
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr ""
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
-msgid "_File"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:3
-msgid "Check to get delivery notification when your message is read"
-msgstr ""
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:5
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Delete all but signature"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with PGP"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:8
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:9
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Open a file"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:13
-msgid "PGP Encrypt"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "PGP Sign"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:15
+#: ../ui/evolution-memos.xml.h:3
 #, fuzzy
-msgid "Request read receipt"
-msgstr "Obavezan učesnik"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "S/MIME Encrypt"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "S/MIME Sign"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "Save As"
-msgstr ""
+msgid "Copy selected memo"
+msgstr "Završeno "
 
-#: ../ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-memos.xml.h:5
 #, fuzzy
-msgid "Save Draft"
-msgstr "Nacrtaj fokus"
+msgid "Cut selected memo"
+msgstr ", %d izabrani"
 
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "Save _As..."
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "Save _Draft"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-memos.xml.h:7
 #, fuzzy
-msgid "Save as draft"
-msgstr "Snimi kao VCard..."
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "Save in folder..."
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:25
-msgid "Save the current file"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save the current file with a different name"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save the message in a specified folder"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:29
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Send the mail in HTML format"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Send this message"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Sign this message with your PGP key"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Toggles whether the BCC field is displayed"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Toggles whether the CC field is displayed"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Toggles whether the From chooser is displayed"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:36
-msgid "Toggles whether the Post-To field is displayed"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Toggles whether the To field is displayed"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "_Attachment..."
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "_Bcc Field"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "_Cc Field"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "_Delete all"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "_From Field"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
-msgid "_Insert"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Open..."
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Post-To Field"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:50
-msgid "_Reply-To Field"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:52
-msgid "_Security"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:53
-msgid "_To Field"
-msgstr ""
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr ""
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr ""
-
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "Save and Close"
-msgstr ""
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:20
-msgid "Save and _Close"
-msgstr ""
-
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save the current file and close the window"
-msgstr ""
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr ""
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr ""
+msgid "Delete selected memos"
+msgstr "_Izbriši odabrane zadatke"
 
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
+#: ../ui/evolution-memos.xml.h:9
+msgid "Paste memo from the clipboard"
 msgstr ""
 
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
+#: ../ui/evolution-memos.xml.h:10
+msgid "Previews the list of memos to be printed"
 msgstr ""
 
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr ""
+#: ../ui/evolution-memos.xml.h:13
+#, fuzzy
+msgid "Print the list of memos"
+msgstr "Ne mogu otvoriti poruku"
 
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
+#: ../ui/evolution-memos.xml.h:14
+msgid "View the selected memo"
 msgstr ""
 
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr ""
+#: ../ui/evolution-memos.xml.h:18
+#, fuzzy
+msgid "_Open Memo"
+msgstr "_Otvori"
 
 #: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
-msgstr ""
+#, fuzzy
+msgid "Copy selected tasks"
+msgstr "_Sakrij ispunjene zadatke nakon "
 
 #: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
-msgstr ""
+#, fuzzy
+msgid "Cut selected tasks"
+msgstr "_Izbriši odabrane zadatke"
 
 #: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
@@ -18639,7 +21897,7 @@ msgid "Mark selected tasks as complete"
 msgstr ""
 
 #: ../ui/evolution-tasks.xml.h:12
-msgid "Paste task from the clipboard"
+msgid "Paste tasks from the clipboard"
 msgstr ""
 
 #: ../ui/evolution-tasks.xml.h:13
@@ -18651,10 +21909,20 @@ msgid "Print the list of tasks"
 msgstr ""
 
 #: ../ui/evolution-tasks.xml.h:18
+#, fuzzy
+msgid "Show task preview window"
+msgstr "Po_kaži podsjetnik"
+
+#: ../ui/evolution-tasks.xml.h:19
+#, fuzzy
+msgid "Task _Preview"
+msgstr "Poruka"
+
+#: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
 msgstr ""
 
-#: ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution-tasks.xml.h:27
 msgid "_Open Task"
 msgstr ""
 
@@ -18691,11 +21959,12 @@ msgid "Display window buttons with text only"
 msgstr ""
 
 #: ../ui/evolution.xml.h:10
-msgid "Exit the program"
-msgstr ""
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution adresar"
 
 #: ../ui/evolution.xml.h:11
-msgid "Forget _Passwords"
+msgid "Exit the program"
 msgstr ""
 
 #: ../ui/evolution.xml.h:12
@@ -18707,121 +21976,157 @@ msgid "Hide window buttons"
 msgstr ""
 
 #: ../ui/evolution.xml.h:14
-msgid "Icons _and text"
-msgstr ""
+#, fuzzy
+msgid "I_mport..."
+msgstr "Migriranje..."
 
 #: ../ui/evolution.xml.h:15
+msgid "Icons _and Text"
+msgstr ""
+
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr ""
 
 #: ../ui/evolution.xml.h:17
+msgid "Lay_out"
+msgstr ""
+
+#: ../ui/evolution.xml.h:19
 msgid "New _Window"
 msgstr ""
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:20
+msgid "Open the Frequently Asked Questions webpage"
+msgstr ""
+
+#: ../ui/evolution.xml.h:21
+#, fuzzy
+msgid "Page Set_up..."
+msgstr "Podešavanje strane:"
+
+#: ../ui/evolution.xml.h:22
 #, fuzzy
 msgid "Prefere_nces"
 msgstr "pojave"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr ""
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:24
+#, fuzzy
+msgid "Send / _Receive"
+msgstr "Pošalji obavještenje"
+
+#: ../ui/evolution.xml.h:25
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:26
 msgid "Set up Pilot configuration"
 msgstr ""
 
-#: ../ui/evolution.xml.h:22
-msgid "Show information about Evolution"
-msgstr ""
-
-#: ../ui/evolution.xml.h:23
-msgid "Submit Bug Report"
-msgstr ""
-
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
 #: ../ui/evolution.xml.h:28
-msgid "Submit _Bug Report"
-msgstr ""
+#, fuzzy
+msgid "Show Side _Bar"
+msgstr "Po_kaži podsjetnik"
 
 #: ../ui/evolution.xml.h:29
-msgid "Submit a bug report using Bug Buddy"
+msgid "Show _Status Bar"
 msgstr ""
 
 #: ../ui/evolution.xml.h:30
-msgid "Toggle whether we are working offline."
+msgid "Show _Toolbar"
 msgstr ""
 
 #: ../ui/evolution.xml.h:31
-msgid "Tool_bar"
+msgid "Show information about Evolution"
 msgstr ""
 
 #: ../ui/evolution.xml.h:32
-msgid "Tool_bar style"
+msgid "Submit Bug Report"
 msgstr ""
 
 #: ../ui/evolution.xml.h:33
-msgid "_About Evolution..."
+msgid "Submit _Bug Report"
 msgstr ""
 
 #: ../ui/evolution.xml.h:34
-msgid "_Close Window"
+msgid "Submit a bug report using Bug Buddy"
+msgstr ""
+
+#: ../ui/evolution.xml.h:35
+msgid "Toggle whether we are working offline."
+msgstr ""
+
+#: ../ui/evolution.xml.h:36
+msgid "Tool_bar Style"
 msgstr ""
 
 #: ../ui/evolution.xml.h:37
-msgid "_Help"
+msgid "View/Hide the Side Bar"
 msgstr ""
 
 #: ../ui/evolution.xml.h:38
-msgid "_Hide buttons"
+msgid "View/Hide the Status Bar"
 msgstr ""
 
 #: ../ui/evolution.xml.h:39
-msgid "_Icons only"
-msgstr ""
+#, fuzzy
+msgid "Work _Offline"
+msgstr "Izvor papira:"
 
 #: ../ui/evolution.xml.h:40
-msgid "_Import..."
-msgstr ""
+#, fuzzy
+msgid "_About"
+msgstr "_Ime računa:"
 
 #: ../ui/evolution.xml.h:41
-msgid "_New"
+msgid "_Close Window"
 msgstr ""
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Forget Passwords"
+msgstr "Upišite šifru"
+
+#: ../ui/evolution.xml.h:45
+msgid "_Frequently Asked Questions"
+msgstr ""
+
+#: ../ui/evolution.xml.h:47
+#, fuzzy
+msgid "_Hide Buttons"
+msgstr "Nacrtaj dugme"
+
+#: ../ui/evolution.xml.h:48
+msgid "_Icons Only"
+msgstr ""
+
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr ""
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:51
 #, fuzzy
 msgid "_Quit"
 msgstr "I_zreži"
 
-#: ../ui/evolution.xml.h:44
-msgid "_Send / Receive"
-msgstr ""
-
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr ""
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr ""
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:54
 #, fuzzy
-msgid "_Text only"
+msgid "_Text Only"
 msgstr "Model teksta"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:56
 #, fuzzy
 msgid "_Window"
 msgstr "_Traži sad"
@@ -18834,8 +22139,8 @@ msgstr ""
 msgid "_Address Cards"
 msgstr ""
 
-#: ../views/addressbook/galview.xml.h:3
-msgid "_Phone List"
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+msgid "_List View"
 msgstr ""
 
 #: ../views/calendar/galview.xml.h:1
@@ -18846,10 +22151,6 @@ msgstr ""
 msgid "_Day View"
 msgstr ""
 
-#: ../views/calendar/galview.xml.h:3
-msgid "_List View"
-msgstr ""
-
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr ""
@@ -18859,29 +22160,43 @@ msgid "_Work Week View"
 msgstr ""
 
 #: ../views/mail/galview.xml.h:1
-msgid "As _Sent Folder"
+msgid "As Sent Folder for Wi_de View"
 msgstr ""
 
 #: ../views/mail/galview.xml.h:2
-msgid "By S_tatus"
+msgid "As _Sent Folder"
 msgstr ""
 
 #: ../views/mail/galview.xml.h:3
-msgid "By Se_nder"
+msgid "By S_tatus"
 msgstr ""
 
 #: ../views/mail/galview.xml.h:4
-msgid "By Su_bject"
+msgid "By Se_nder"
 msgstr ""
 
 #: ../views/mail/galview.xml.h:5
-msgid "By _Follow Up Flag"
+msgid "By Su_bject"
 msgstr ""
 
 #: ../views/mail/galview.xml.h:6
+msgid "By _Follow Up Flag"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:7
+#, fuzzy
+msgid "For _Wide View"
+msgstr "Pregled radne sedmice"
+
+#: ../views/mail/galview.xml.h:8
 msgid "_Messages"
 msgstr ""
 
+#: ../views/memos/galview.xml.h:1
+#, fuzzy
+msgid "_Memos"
+msgstr "Članovi"
+
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr ""
@@ -18890,48 +22205,52 @@ msgstr ""
 msgid "With _Status"
 msgstr ""
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
 msgid "UTC"
 msgstr ""
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "<b>Time Zones</b>"
 msgstr ""
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>_Selection</b>"
 msgstr ""
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "Select a Time Zone"
 msgstr ""
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
-msgid "TimeZone Combobox"
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+msgid "Timezone drop-down combination box"
 msgstr ""
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
-#: ../widgets/menus/gal-define-views-model.c:188
+#: ../widgets/menus/gal-define-views-dialog.c:74
+#: ../widgets/menus/gal-define-views-model.c:185
 #, fuzzy
 msgid "Collection"
 msgstr "Lokacija"
 
-#: ../widgets/menus/gal-define-views-dialog.c:325
+#: ../widgets/menus/gal-define-views-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, fuzzy, no-c-format
 msgid "Define Views for %s"
 msgstr "Definiši preglede..."
 
-#: ../widgets/menus/gal-define-views-dialog.c:333
-#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:364
+#: ../widgets/menus/gal-define-views-dialog.c:366
 #, fuzzy
 msgid "Define Views"
 msgstr "Definiši preglede..."
@@ -18941,157 +22260,320 @@ msgstr "Definiši preglede..."
 msgid "Define Views for \"%s\""
 msgstr "Definiši preglede..."
 
-#: ../widgets/menus/gal-define-views.glade.h:5
-#, fuzzy
-msgid "_Edit..."
-msgstr "_Izmijeni"
-
-#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1845
-#: ../widgets/table/e-table-scrolled.c:224
-#: ../widgets/table/e-table-scrolled.c:225
+#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/table/e-table-scrolled.c:215
+#: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "Tabela"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
 #, fuzzy
 msgid "Instance"
 msgstr "Sve pojave"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
 #, fuzzy
 msgid "Save Current View"
 msgstr "Trenutni pogled"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 #, fuzzy
 msgid "_Create new view"
 msgstr "Napravi novi zadatak"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Replace existing view"
 msgstr ""
 
-#: ../widgets/menus/gal-view-menus.c:291
-msgid "_Current View"
+#. bonobo displays this string so it must be in locale
+#: ../widgets/menus/gal-view-instance.c:580
+#: ../widgets/menus/gal-view-menus.c:365
+msgid "Custom View"
+msgstr "Vlastiti pogled"
+
+#: ../widgets/menus/gal-view-instance.c:581
+msgid "Save Custom View"
+msgstr "Snimi vlastiti pogled"
+
+#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:388
+msgid "Define Views..."
+msgstr "Definiši preglede..."
+
+#: ../widgets/menus/gal-view-menus.c:304
+#, fuzzy
+msgid "C_urrent View"
+msgstr "Trenutni pogled"
+
+#: ../widgets/menus/gal-view-menus.c:327
+#, fuzzy, c-format
+msgid "Select View: %s"
+msgstr "Sedmični pregled"
+
+#: ../widgets/menus/gal-view-menus.c:370
+msgid "Current view is a customized view"
 msgstr ""
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:374
 msgid "Save Custom View..."
 msgstr ""
 
-#: ../widgets/menus/gal-view-new-dialog.c:80
+#: ../widgets/menus/gal-view-menus.c:379
+#, fuzzy
+msgid "Save current custom view"
+msgstr "Trenutni pogled"
+
+#: ../widgets/menus/gal-view-menus.c:393
+#, fuzzy
+msgid "Create or edit views"
+msgstr "Napravi novi zadatak"
+
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "Tvornica"
 
-#: ../widgets/menus/gal-view-new-dialog.c:115
+#: ../widgets/menus/gal-view-new-dialog.c:103
 msgid "Define New View"
 msgstr "Definiši novi pogled"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
 msgid "Name of new view:"
 msgstr ""
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
 #, fuzzy
 msgid "Type of View"
 msgstr "Dnevni pregled"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:4
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of view:"
 msgstr ""
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:415
-msgid "MTWTFSS"
+#: ../widgets/misc/e-attachment.c:990
+msgid "Attached message"
 msgstr ""
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1097
-msgid "%B %Y"
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
+#: ../widgets/misc/e-attachment-store.c:636
+#, fuzzy
+msgid "attachment.dat"
+msgstr "Dodaj kolonu..."
+
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
+msgid "A load operation is already in progress"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
+msgid "A save operation is already in progress"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:1923
+#, fuzzy, c-format
+msgid "Could not load '%s'"
+msgstr "Ne mogu učitati adresar"
+
+#: ../widgets/misc/e-attachment.c:1926
+#, fuzzy, c-format
+msgid "Could not load the attachment"
+msgstr "Ne mogu učitati %s: %s"
+
+#: ../widgets/misc/e-attachment.c:2190
+#, fuzzy, c-format
+msgid "Could not open '%s'"
+msgstr "Ne mogu otvoriti izvor"
+
+#: ../widgets/misc/e-attachment.c:2193
+#, fuzzy, c-format
+msgid "Could not open the attachment"
+msgstr "Ne mogu otvoriti odredište"
+
+#: ../widgets/misc/e-attachment.c:2635
+msgid "Attachment contents not loaded"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:2712
+#, fuzzy, c-format
+msgid "Could not save '%s'"
+msgstr "Ne mogu otkazati"
+
+#: ../widgets/misc/e-attachment.c:2715
+#, fuzzy, c-format
+msgid "Could not save the attachment"
+msgstr "Snimi kao..."
+
+#: ../widgets/misc/e-attachment-dialog.c:305
+msgid "Attachment Properties"
 msgstr ""
 
-#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
-msgid "Previous Button"
+#: ../widgets/misc/e-attachment-dialog.c:328
+#, fuzzy
+msgid "_Filename:"
+msgstr "_Puno ime:"
+
+#: ../widgets/misc/e-attachment-dialog.c:363
+#, fuzzy
+msgid "MIME Type:"
+msgstr "Vrsta"
+
+#: ../widgets/misc/e-attachment-handler-image.c:95
+#, fuzzy
+msgid "Could not set as background"
+msgstr "Ne mogu otvoriti izvor"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#, fuzzy
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "Ne mogu otvoriti izvor"
+msgstr[1] "Ne mogu otvoriti izvor"
+msgstr[2] "Ne mogu otvoriti izvor"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#, fuzzy
+msgid "_Send To..."
+msgstr "Za:"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+msgid "Send the selected attachments somewhere"
 msgstr ""
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-attachment-icon-view.c:480
+#: ../widgets/misc/e-attachment-tree-view.c:517
+#, fuzzy
+msgid "Loading"
+msgstr "Sjenčanje"
+
+#: ../widgets/misc/e-attachment-icon-view.c:492
+#: ../widgets/misc/e-attachment-tree-view.c:529
+#, fuzzy
+msgid "Saving"
+msgstr "Sjenčanje"
+
+#: ../widgets/misc/e-attachment-paned.c:87
+#, fuzzy
+msgid "Hide _Attachment Bar"
+msgstr "Dodaj kolonu..."
+
+#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:626
+#, fuzzy
+msgid "Show _Attachment Bar"
+msgstr "Snimi sastanak"
+
+#: ../widgets/misc/e-attachment-store.c:541
+#, fuzzy
+msgid "Add Attachment"
+msgstr "Dodaj kolonu..."
+
+#: ../widgets/misc/e-attachment-store.c:544
+msgid "A_ttach"
+msgstr ""
+
+#: ../widgets/misc/e-attachment-store.c:607
+#, fuzzy
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "Snimi sastanak"
+msgstr[1] "Snimi sastanak"
+msgstr[2] "Snimi sastanak"
+
+#: ../widgets/misc/e-attachment-view.c:300
+#, fuzzy
+msgid "S_ave All"
+msgstr "Ukloni sve"
+
+#: ../widgets/misc/e-attachment-view.c:326
+#, fuzzy
+msgid "A_dd Attachment..."
+msgstr "Dodaj kolonu..."
+
+#: ../widgets/misc/e-attachment-view.c:643
+#, fuzzy, c-format
+msgid "Open with \"%s\""
+msgstr "Otvaram %s"
+
+#: ../widgets/misc/e-attachment-view.c:646
+#, fuzzy, c-format
+msgid "Open this attachment in %s"
+msgstr "Snimi sastanak"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../widgets/misc/e-calendar-item.c:1253
+msgid "%B %Y"
+msgstr ""
+
+#: ../widgets/misc/e-calendar.c:217
 #, fuzzy
 msgid "Month Calendar"
 msgstr "Učitavam kalendar"
 
-#: ../widgets/misc/e-canvas-background.c:456
-#: ../widgets/misc/e-canvas-background.c:457 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3540
-#: ../widgets/text/e-text.c:3541
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
 msgid "Fill color"
 msgstr "Oboji"
 
-#: ../widgets/misc/e-canvas-background.c:463
-#: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:470
-#: ../widgets/misc/e-canvas-background.c:471 ../widgets/text/e-entry.c:1291
-#: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3547
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3555
-#: ../widgets/text/e-text.c:3556
+#: ../widgets/misc/e-canvas-background.c:461
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
+#: ../widgets/text/e-text.c:3647
 msgid "GDK fill color"
 msgstr "Boja ispunjavanja za GDK"
 
-#: ../widgets/misc/e-canvas-background.c:477
-#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3562
-#: ../widgets/text/e-text.c:3563
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "Popuni tačkama"
 
-#: ../widgets/misc/e-canvas-background.c:484
-#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
 #, fuzzy
 msgid "X1"
 msgstr "1"
 
-#: ../widgets/misc/e-canvas-background.c:491
-#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
 msgid "X2"
 msgstr ""
 
-#: ../widgets/misc/e-canvas-background.c:498
-#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
 #, fuzzy
 msgid "Y1"
 msgstr "1"
 
-#: ../widgets/misc/e-canvas-background.c:505
-#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
 msgid "Y2"
 msgstr ""
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:978
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3005
+#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:649
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "Minimalna širina"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
-#: ../widgets/table/e-table-group-container.c:979
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3006
+#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
+#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-leaf.c:650
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "Minimalna širina"
 
-#: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "Razmak"
 
-#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
+#: ../widgets/misc/e-cell-date-edit.c:296
 msgid "Now"
 msgstr ""
 
-#: ../widgets/misc/e-cell-date-edit.c:801
+#: ../widgets/misc/e-cell-date-edit.c:846
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -19100,308 +22582,312 @@ msgstr ""
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:57
+msgid "Arabic"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Thai"
+msgstr "Tajland"
+
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
-#: ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr ""
 
+#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
 #: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:171
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:216
-#: ../widgets/misc/e-charset-picker.c:479
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:231
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:338
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr ""
 
-#: ../widgets/misc/e-clipped-label.c:111
-msgid "..."
+#: ../widgets/misc/e-charset-picker.c:599
+msgid "Ch_aracter Encoding"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:295
 #, fuzzy
-msgid "Date and Time Entry"
+msgid "Date and Time"
 msgstr "<b>Datum i vrijeme</b>"
 
-#: ../widgets/misc/e-dateedit.c:335
+#: ../widgets/misc/e-dateedit.c:315
 msgid "Text entry to input date"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:336
-msgid "Text Date Entry"
-msgstr ""
-
-#: ../widgets/misc/e-dateedit.c:353
+#: ../widgets/misc/e-dateedit.c:337
 msgid "Click this button to show a calendar"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:354
-#, fuzzy
-msgid "Date Button"
-msgstr "Nacrtaj dugme"
-
-#: ../widgets/misc/e-dateedit.c:374
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:379
+msgid "Drop-down combination box to select time"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:375
-msgid "Time Combo Box"
-msgstr ""
-
-#: ../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 "Tekst oznake razgranika"
-
-#: ../widgets/misc/e-expander.c:197
-msgid "Use underline"
-msgstr "Koristi podvlačenje"
-
-#: ../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 ""
-"Ukoliko je postavljeno, podvlačenje označava da se sljedeći znak koristi kao "
-"kratica"
-
-#: ../widgets/misc/e-expander.c:206
-msgid "Space to put between the label and the child"
-msgstr "Razmak koji se stavlja između oznake i sadržanog elementa"
-
-#: ../widgets/misc/e-expander.c:215
-msgid "Label widget"
-msgstr "Element oznake"
+#: ../widgets/misc/e-dateedit.c:455
+#, fuzzy
+msgid "No_w"
+msgstr "Ne"
 
-#: ../widgets/misc/e-expander.c:216
-msgid "A widget to display in place of the usual expander label"
-msgstr "Element koji se prikazuje umjesto uobičajene oznake graničnika"
+#: ../widgets/misc/e-dateedit.c:461
+#, fuzzy
+msgid "_Today"
+msgstr "Ponedjeljak"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3318
-msgid "Expander Size"
-msgstr "Veličina razgranika"
+#: ../widgets/misc/e-dateedit.c:1583
+#, fuzzy
+msgid "Invalid Date Value"
+msgstr "pogrešno vrijeme"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3319
-msgid "Size of the expander arrow"
-msgstr "Veličina strjelice razgranika"
+#: ../widgets/misc/e-dateedit.c:1613
+#, fuzzy
+msgid "Invalid Time Value"
+msgstr "pogrešno vrijeme"
 
-#: ../widgets/misc/e-expander.c:231
-msgid "Indicator Spacing"
-msgstr "Razmak pokazivača"
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:123 ../widgets/misc/e-filter-bar.c:178
+#: ../widgets/misc/e-filter-bar.c:306 ../widgets/misc/e-filter-bar.c:737
+msgid "Advanced Search"
+msgstr "Napredna pretraga"
 
-#: ../widgets/misc/e-expander.c:232
-msgid "Spacing around expander arrow"
-msgstr "Razmaci oko strjelica za grananje"
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:229
+msgid "Save Search"
+msgstr "Snimi pretragu"
 
-#: ../widgets/misc/e-filter-bar.c:195
+#: ../widgets/misc/e-filter-bar.c:266
 msgid "_Searches"
 msgstr "_Pretrage"
 
-#: ../widgets/misc/e-filter-bar.c:197
-msgid "Search Editor"
-msgstr "Editor pretrage"
-
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:220
-msgid "Save Search"
-msgstr "Snimi pretragu"
+#: ../widgets/misc/e-filter-bar.c:268
+#, fuzzy
+msgid "Searches"
+msgstr "_Pretrage"
 
-#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "_Snimi pretragu..."
 
-#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "_Izmijeni snimljene pretrage... "
 
-#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
 #, fuzzy
 msgid "_Advanced Search..."
 msgstr "Napredna pretraga"
 
-#: ../widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "All Accounts"
+msgstr "Dodaj IM račun"
+
+#: ../widgets/misc/e-filter-bar.h:104
+#, fuzzy
+msgid "Current Account"
+msgstr "Isključi"
+
+#: ../widgets/misc/e-filter-bar.h:105
+#, fuzzy
+msgid "Current Folder"
+msgstr "Trenutni pogled"
+
+#: ../widgets/misc/e-image-chooser.c:168
 msgid "Choose Image"
 msgstr "Izaberi sliku"
 
-#: ../widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr ""
 
-#: ../widgets/misc/e-map.c:649
+#: ../widgets/misc/e-map.c:607
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+
+#: ../widgets/misc/e-online-button.c:106
+#, fuzzy
+msgid "Online"
+msgstr "Jedan"
+
+#: ../widgets/misc/e-online-button.c:107
+msgid "The button state is online"
 msgstr ""
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "Sinhroniziraj sa:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:107
 msgid "Sync Private Records:"
 msgstr "Sinhroniziram osobne unose:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:116
 msgid "Sync Categories:"
 msgstr "Sinhroniziram kategorije:"
 
-#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
+#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
 #, fuzzy
 msgid "Empty message"
 msgstr "Šifrujem poruku"
 
-#: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
 #, fuzzy
 msgid "Reflow model"
 msgstr "Proba preispunjavanja"
 
-#: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 #, fuzzy
 msgid "Column width"
 msgstr "Širina kolone"
 
-#. To translators: This is the accessibility name of
-#. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:345
+#: ../widgets/misc/e-search-bar.c:92 ../widgets/misc/e-search-bar.c:359
+#: ../widgets/misc/e-search-bar.c:503 ../widgets/misc/e-search-bar.c:505
+#: ../widgets/misc/e-search-bar.c:1021
 #, fuzzy
-msgid "Search Text Entry"
-msgstr "Editor pretrage"
+msgid "Search"
+msgstr "_Traži"
 
-#: ../widgets/misc/e-search-bar.c:549
+#: ../widgets/misc/e-search-bar.c:359 ../widgets/misc/e-search-bar.c:503
+#: ../widgets/misc/e-search-bar.c:505
+#, fuzzy
+msgid "Click here to change the search type"
+msgstr "Kliknite ovdje za dodavanje učesnika"
+
+#: ../widgets/misc/e-search-bar.c:637
 msgid "_Search"
 msgstr "_Traži"
 
-#: ../widgets/misc/e-search-bar.c:555
+#: ../widgets/misc/e-search-bar.c:643
 msgid "_Find Now"
 msgstr "_Traži sad"
 
-#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
+#: ../widgets/misc/e-search-bar.c:644
 msgid "_Clear"
 msgstr "_Očisti"
 
-#: ../widgets/misc/e-search-bar.c:647
-#, fuzzy
-msgid "Search Type"
-msgstr "Ops_eg pretrage:"
-
-#: ../widgets/misc/e-search-bar.c:851
+#: ../widgets/misc/e-search-bar.c:899
 msgid "Item ID"
 msgstr "ID stavke"
 
-#: ../widgets/misc/e-search-bar.c:858
-msgid "Subitem ID"
-msgstr "ID podstavke"
-
-#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
-#: ../widgets/text/e-text.c:3463
+#: ../widgets/misc/e-search-bar.c:906 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3556
 msgid "Text"
 msgstr "Tekst"
 
-#: ../widgets/misc/e-search-bar.c:945
-msgid "Find _Now"
-msgstr "_Traži sad"
+#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
+#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
+#: ../widgets/misc/e-search-bar.c:1053
+msgid "Sho_w: "
+msgstr ""
+
+#: ../widgets/misc/e-search-bar.c:1072
+#, fuzzy
+msgid "Sear_ch: "
+msgstr "_Traži"
+
+#. To Translators: The " in " label is part of the Quick Search Bar, example:
+#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
+#: ../widgets/misc/e-search-bar.c:1088
+#, fuzzy
+msgid " i_n "
+msgstr " i"
 
-#: ../widgets/misc/e-selection-model-array.c:546
-#: ../widgets/table/e-tree-selection-model.c:811
+#: ../widgets/misc/e-selection-model-array.c:593
+#: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
 msgstr "Red kursora"
 
-#: ../widgets/misc/e-selection-model-array.c:553
-#: ../widgets/table/e-tree-selection-model.c:818
+#: ../widgets/misc/e-selection-model-array.c:600
+#: ../widgets/table/e-tree-selection-model.c:810
 msgid "Cursor Column"
 msgstr "Kolona kursora"
 
-#: ../widgets/misc/e-selection-model.c:214
+#: ../widgets/misc/e-selection-model.c:208
 msgid "Sorter"
 msgstr "Sortiraj"
 
-#: ../widgets/misc/e-selection-model.c:221
+#: ../widgets/misc/e-selection-model.c:215
 msgid "Selection Mode"
 msgstr "Mod izbora"
 
-#: ../widgets/misc/e-selection-model.c:229
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Cursor Mode"
 msgstr "Mod za kursor"
 
-#: ../widgets/misc/e-send-options.c:521
+#: ../widgets/misc/e-send-options.c:519
 msgid "When de_leted:"
 msgstr ""
 
@@ -19430,45 +22916,43 @@ msgid "A_uto-delete sent item"
 msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:6
-#, fuzzy
-msgid "C_lassification"
-msgstr "Kla_sifikacija:"
-
-#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Deli_vered and opened"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:8
 #, fuzzy
 msgid "Gene_ral Options"
 msgstr "Općenito"
 
-#: ../widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid ""
 "None\n"
 "Mail Receipt"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:11
 msgid ""
-"Public\n"
-"Private\n"
+"Normal\n"
+"Proprietary\n"
 "Confidential\n"
+"Secret\n"
+"Top Secret\n"
+"For Your Eyes Only"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:16
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "R_eply requested"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Sta_tus Tracking"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid ""
 "Undefined\n"
 "High\n"
@@ -19476,11 +22960,6 @@ msgid ""
 "Low"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:23
-#, fuzzy
-msgid "W_ithin"
-msgstr "Na čekanju"
-
 #: ../widgets/misc/e-send-options.glade.h:24
 #, fuzzy
 msgid "When acce_pted:"
@@ -19498,256 +22977,228 @@ msgstr "Odbijeno"
 
 #: ../widgets/misc/e-send-options.glade.h:27
 #, fuzzy
+msgid "Wi_thin"
+msgstr "Na čekanju"
+
+#: ../widgets/misc/e-send-options.glade.h:28
+#, fuzzy
 msgid "_After:"
 msgstr "nakon"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:29
 #, fuzzy
 msgid "_All information"
 msgstr "Informacija o zadatku"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:30
+#, fuzzy
+msgid "_Classification:"
+msgstr "Kla_sifikacija:"
+
+#. To translators: This means Delay the message delivery for some time
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:33
 #, fuzzy
 msgid "_Delivered"
 msgstr "_Izbriši"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:36
 #, fuzzy
 msgid "_Until:"
 msgstr "do"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:38
 #, fuzzy
 msgid "_When opened:"
 msgstr "_Datum završetka:"
 
-#: ../widgets/misc/e-task-widget.c:208
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
+#: ../widgets/misc/e-task-widget.c:251
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: ../widgets/misc/e-task-widget.c:213
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
+#. %d is a number between 0 and 100, describing the percentage of operation complete
+#: ../widgets/misc/e-task-widget.c:257
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% dovršeno)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:103
 #, fuzzy
-msgid "click here to go to url"
+msgid "Click here to go to URL"
 msgstr "* Kliknite ovdje da dodate kategoriju *"
 
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Edit Master Category List..."
-msgstr ""
-
-#: ../widgets/misc/gal-categories.glade.h:3
-#, fuzzy
-msgid "Item(s) belong to these _categories:"
-msgstr "Ovaj kontakt pripada sljedećim kategorijama:"
-
-#: ../widgets/misc/gal-categories.glade.h:4
-#, fuzzy
-msgid "_Available Categories:"
-msgstr "_Kategorije"
-
-#: ../widgets/misc/gal-categories.glade.h:5
-#, fuzzy
-msgid "categories"
-msgstr "Kategorije"
-
-#: ../widgets/table/e-cell-combo.c:177
+#: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr ""
 
-#: ../widgets/table/e-cell-date.c:64
-msgid "%l:%M %p"
-msgstr "%H:%M"
-
-#: ../widgets/table/e-cell-pixbuf.c:397
+#: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Izabrana kolona"
 
-#: ../widgets/table/e-cell-pixbuf.c:404
+#: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
 msgstr "Kolona u fokusu"
 
-#: ../widgets/table/e-cell-pixbuf.c:411
+#: ../widgets/table/e-cell-pixbuf.c:374
 msgid "Unselected Column"
 msgstr "Neizabrana kolona"
 
-#: ../widgets/table/e-cell-text.c:1740
+#: ../widgets/table/e-cell-text.c:1788
 msgid "Strikeout Column"
 msgstr "Istakni kolonu"
 
-#: ../widgets/table/e-cell-text.c:1747
+#: ../widgets/table/e-cell-text.c:1795
 msgid "Underline Column"
 msgstr "Podvuci kolonu"
 
-#: ../widgets/table/e-cell-text.c:1754
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Bold Column"
 msgstr "Masna kolona"
 
-#: ../widgets/table/e-cell-text.c:1761
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Color Column"
 msgstr "Obojena kolona"
 
-#: ../widgets/table/e-cell-text.c:1775
+#: ../widgets/table/e-cell-text.c:1823
 msgid "BG Color Column"
 msgstr "Kolona za boju pozadine"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:1
+#: ../widgets/table/e-table-config.c:152
+msgid "State"
+msgstr "Stanje"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Ascending)"
+msgstr "(Rastuće)"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Descending)"
+msgstr "(Opadajuće)"
+
+#: ../widgets/table/e-table-config.c:392
+msgid "Not sorted"
+msgstr "Nije sortirano"
+
+#: ../widgets/table/e-table-config.c:433
+msgid "No grouping"
+msgstr "Nema grupisanja"
+
+#: ../widgets/table/e-table-config.c:642
+#: ../widgets/table/e-table-config.glade.h:11
 #, fuzzy
-msgid "<- _Remove"
-msgstr "_Ukloni"
+msgid "Show Fields"
+msgstr "Polje"
+
+#: ../widgets/table/e-table-config.c:663
+#, fuzzy
+msgid "Available Fields"
+msgstr "Polja za upis"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:2
 #: ../widgets/table/e-table-config.glade.h:1
 #, fuzzy
 msgid "A_vailable Fields:"
 msgstr "Polja za upis"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Ascending"
 msgstr "Rastuće"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:4
 #: ../widgets/table/e-table-config.glade.h:3
 #, fuzzy
 msgid "Clear All"
 msgstr "_Očisti"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.glade.h:4
+#, fuzzy
+msgid "Clear _All"
+msgstr "_Očisti"
+
+#: ../widgets/table/e-table-config.glade.h:5
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Descending"
 msgstr "Padajuće"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:8
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../widgets/table/e-table-config.glade.h:8
 #, fuzzy
 msgid "Group Items By"
 msgstr "_Grupiši po..."
 
-#: ../widgets/table/e-table-config-no-group.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
 msgstr ""
 
-#: ../widgets/table/e-table-config-no-group.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.glade.h:10
 msgid "Move _Up"
 msgstr ""
 
-#: ../widgets/table/e-table-config-no-group.glade.h:11
-msgid "Sh_ow these fields in order:"
-msgstr ""
+#: ../widgets/table/e-table-config.glade.h:12
+#, fuzzy
+msgid "Show _field in View"
+msgstr "Polje"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:563
-#: ../widgets/table/e-table-config.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:13
 #, fuzzy
-msgid "Show Fields"
+msgid "Show field i_n View"
 msgstr "Polje"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:11
-msgid "Show field in View"
-msgstr ""
+#: ../widgets/table/e-table-config.glade.h:14
+#, fuzzy
+msgid "Show field in _View"
+msgstr "Polje"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.glade.h:15
 #, fuzzy
 msgid "Sort"
 msgstr "Sortiraj"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:15
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:16
 #, fuzzy
 msgid "Sort Items By"
 msgstr "Sortiraj"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:16
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:17
 msgid "Then By"
 msgstr "Zatim po"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:17
-#, fuzzy
-msgid "_Add ->"
-msgstr "_Dodaj adresu"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:18
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:19
 msgid "_Fields Shown..."
 msgstr ""
 
-#: ../widgets/table/e-table-config-no-group.glade.h:19
 #: ../widgets/table/e-table-config.glade.h:20
 #, fuzzy
-msgid "_Sort..."
-msgstr "_Font..."
-
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "Stanje"
-
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
-msgid "(Ascending)"
-msgstr "(Rastuće)"
-
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
-msgid "(Descending)"
-msgstr "(Opadajuće)"
-
-#: ../widgets/table/e-table-config.c:314
-msgid "Not sorted"
-msgstr "Nije sortirano"
-
-#: ../widgets/table/e-table-config.c:355
-msgid "No grouping"
-msgstr "Nema grupisanja"
-
-#: ../widgets/table/e-table-config.c:584
-#, fuzzy
-msgid "Available Fields"
-msgstr "Polja za upis"
-
-#: ../widgets/table/e-table-config.glade.h:17
-#, fuzzy
 msgid "_Group By..."
 msgstr "_Grupiši po..."
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:22
+#, fuzzy
+msgid "_Show field in View"
+msgstr "Polje"
+
+#: ../widgets/table/e-table-config.glade.h:23
 msgid "_Show these fields in order:"
 msgstr ""
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:646
-#: ../widgets/table/e-table-field-chooser.c:79
-#: ../widgets/table/e-table-header-item.c:1810
-msgid "DnD code"
-msgstr "DnD kod"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:653
-#: ../widgets/table/e-table-field-chooser.c:86
-#: ../widgets/table/e-table-header-item.c:1824
-msgid "Full Header"
-msgstr "Puno zaglavlje"
+#: ../widgets/table/e-table-config.glade.h:24
+#, fuzzy
+msgid "_Sort..."
+msgstr "_Font..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:126
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
 msgstr "Dodaj kolonu..."
 
@@ -19762,347 +23213,1866 @@ msgid ""
 "the location in which you want it to appear."
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:341
 #, c-format
 msgid "%s : %s (%d item)"
-msgstr ""
-
-#: ../widgets/table/e-table-group-container.c:351
-#, c-format
-msgid "%s : %s (%d items)"
-msgstr ""
+msgid_plural "%s : %s (%d items)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../widgets/table/e-table-group-container.c:356
+#: ../widgets/table/e-table-group-container.c:347
 #, fuzzy, c-format
 msgid "%s (%d item)"
-msgstr "%s (%d%% dovršeno)"
-
-#: ../widgets/table/e-table-group-container.c:357
-#, fuzzy, c-format
-msgid "%s (%d items)"
-msgstr "%s (%d%% dovršeno)"
-
-#: ../widgets/table/e-table-group-container.c:901
-#: ../widgets/table/e-table-group-container.c:902
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2963 ../widgets/table/e-table-item.c:2964
+msgid_plural "%s (%d items)"
+msgstr[0] "%s (%d%% dovršeno)"
+msgstr[1] "%s (%d%% dovršeno)"
+msgstr[2] "%s (%d%% dovršeno)"
+
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-leaf.c:586
+#: ../widgets/table/e-table-group-leaf.c:587
+#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "Naizmjenične boje redova"
 
-#: ../widgets/table/e-table-group-container.c:908
-#: ../widgets/table/e-table-group-container.c:909
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2970 ../widgets/table/e-table-item.c:2971
-#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-leaf.c:593
+#: ../widgets/table/e-table-group-leaf.c:594
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
 msgid "Horizontal Draw Grid"
 msgstr "Vodoravna mreža za crtanje"
 
-#: ../widgets/table/e-table-group-container.c:915
-#: ../widgets/table/e-table-group-container.c:916
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2977 ../widgets/table/e-table-item.c:2978
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-leaf.c:600
+#: ../widgets/table/e-table-group-leaf.c:601
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
 msgid "Vertical Draw Grid"
 msgstr "Uspravna mreža za crtanje"
 
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2984 ../widgets/table/e-table-item.c:2985
-#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-leaf.c:607
+#: ../widgets/table/e-table-group-leaf.c:608
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
 msgid "Draw focus"
 msgstr "Nacrtaj fokus"
 
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:2991 ../widgets/table/e-table-item.c:2992
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-leaf.c:614
+#: ../widgets/table/e-table-group-leaf.c:615
+#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "Mod kursora"
 
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2956 ../widgets/table/e-table-item.c:2957
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-leaf.c:628
+#: ../widgets/table/e-table-group-leaf.c:629
+#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "Model izbora"
 
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:2998 ../widgets/table/e-table-item.c:2999
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3265
-#: ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-leaf.c:621
+#: ../widgets/table/e-table-group-leaf.c:622
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Length Threshold"
 msgstr "Prag dužine"
 
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3297
-#: ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-leaf.c:663
+#: ../widgets/table/e-table-group-leaf.c:664
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
+#: ../widgets/table/e-tree.c:3366
 msgid "Uniform row height"
 msgstr "Ravnomjerna visina redova"
 
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-leaf.c:656
+#: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "Zamrznuto"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1449
 msgid "Customize Current View"
 msgstr "Podesi trenutni pregled"
 
-#: ../widgets/table/e-table-header-item.c:1492
-msgid "Sort Ascending"
+#: ../widgets/table/e-table-header-item.c:1469
+#, fuzzy
+msgid "Sort _Ascending"
 msgstr "Sortiraj od manjeg ka većem"
 
-#: ../widgets/table/e-table-header-item.c:1493
-msgid "Sort Descending"
+#: ../widgets/table/e-table-header-item.c:1470
+#, fuzzy
+msgid "Sort _Descending"
 msgstr "Sortiraj od većeg ka manjem"
 
-#: ../widgets/table/e-table-header-item.c:1494
-msgid "Unsort"
+#: ../widgets/table/e-table-header-item.c:1471
+#, fuzzy
+msgid "_Unsort"
 msgstr "Poništi sortiranje"
 
-#: ../widgets/table/e-table-header-item.c:1496
-msgid "Group By This Field"
+#: ../widgets/table/e-table-header-item.c:1473
+#, fuzzy
+msgid "Group By This _Field"
 msgstr "Grupiši po ovom polju"
 
-#: ../widgets/table/e-table-header-item.c:1497
-msgid "Group By Box"
+#: ../widgets/table/e-table-header-item.c:1474
+#, fuzzy
+msgid "Group By _Box"
 msgstr "Grupiši po prozorima"
 
-#: ../widgets/table/e-table-header-item.c:1499
-msgid "Remove This Column"
+#: ../widgets/table/e-table-header-item.c:1476
+#, fuzzy
+msgid "Remove This _Column"
 msgstr "Ukloni ovu kolonu"
 
-#: ../widgets/table/e-table-header-item.c:1500
-msgid "Add a Column..."
+#: ../widgets/table/e-table-header-item.c:1477
+#, fuzzy
+msgid "Add a C_olumn..."
 msgstr "Dodaj kolonu..."
 
-#: ../widgets/table/e-table-header-item.c:1502
-msgid "Alignment"
+#: ../widgets/table/e-table-header-item.c:1479
+#, fuzzy
+msgid "A_lignment"
 msgstr "Poravnavanje"
 
-#: ../widgets/table/e-table-header-item.c:1503
-msgid "Best Fit"
+#: ../widgets/table/e-table-header-item.c:1480
+#, fuzzy
+msgid "B_est Fit"
 msgstr "Najbolje uklapanje"
 
-#: ../widgets/table/e-table-header-item.c:1504
-msgid "Format Columns..."
+#: ../widgets/table/e-table-header-item.c:1481
+#, fuzzy
+msgid "Format Column_s..."
 msgstr "Formatiraj kolone..."
 
-#: ../widgets/table/e-table-header-item.c:1506
-msgid "Customize Current View..."
+#: ../widgets/table/e-table-header-item.c:1483
+#, fuzzy
+msgid "Custo_mize Current View..."
 msgstr "Podesi trenutni pregled..."
 
-#: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
-#: ../widgets/text/e-entry.c:1264
-msgid "Fontset"
-msgstr "Skup fontova"
-
-#: ../widgets/table/e-table-header-item.c:1838
-#: ../widgets/table/e-table-sorter.c:175
-msgid "Sort Info"
-msgstr "Informacije o sortiranju"
+#: ../widgets/table/e-table-header-item.c:1539
+#, fuzzy
+msgid "_Sort By"
+msgstr "Sortiraj"
 
-#: ../widgets/table/e-table-header-item.c:1852
-#: ../widgets/table/e-tree-scrolled.c:223
-#: ../widgets/table/e-tree-scrolled.c:224
-msgid "Tree"
-msgstr "Stablo"
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1557
+#, fuzzy
+msgid "_Custom"
+msgstr "Vlastiti pogled"
 
-#: ../widgets/table/e-table-item.c:2942 ../widgets/table/e-table-item.c:2943
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 #, fuzzy
 msgid "Table header"
 msgstr "Adapter za ETree tabelu"
 
-#: ../widgets/table/e-table-item.c:2949 ../widgets/table/e-table-item.c:2950
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 #, fuzzy
 msgid "Table model"
 msgstr "Model teksta"
 
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 #, fuzzy
 msgid "Cursor row"
 msgstr "Red kursora"
 
-#: ../widgets/table/e-table.c:3330
-msgid "Always Search"
+#: ../widgets/table/e-table-sorter.c:172
+msgid "Sort Info"
+msgstr "Informacije o sortiranju"
+
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-tree.c:3373
+msgid "Always search"
 msgstr "Uvijek traži"
 
 #: ../widgets/table/e-table.c:3337
 msgid "Use click to add"
 msgstr "Dodaj klikanjem"
 
-#: ../widgets/table/e-tree.c:3290 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "Stablo"
+
+#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "Adapter za ETree tabelu"
 
-#: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
-msgid "Always search"
-msgstr "Uvijek traži"
-
-#: ../widgets/table/e-tree.c:3311
+#: ../widgets/table/e-tree.c:3379
 msgid "Retro Look"
 msgstr "Starinski izgled"
 
-#: ../widgets/table/e-tree.c:3312
+#: ../widgets/table/e-tree.c:3380
 msgid "Draw lines and +/- expanders."
 msgstr "Iscrtaj linije i +/- proširivače."
 
-#: ../widgets/text/e-entry-test.c:49
-msgid "Minicard Test"
-msgstr ""
+#: ../widgets/table/e-tree.c:3386
+msgid "Expander Size"
+msgstr "Veličina razgranika"
 
-#: ../widgets/text/e-entry-test.c:50
-#, fuzzy
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Autorska prava (C) 2000, Ximian, Inc."
+#: ../widgets/table/e-tree.c:3387
+msgid "Size of the expander arrow"
+msgstr "Veličina strjelice razgranika"
 
-#: ../widgets/text/e-entry-test.c:52
-#, fuzzy
-msgid "This should test the minicard canvas item"
-msgstr "Ovo bi trebalo isprobati preispunjavanje polja"
+#: ../widgets/text/e-text.c:2731
+msgid "Input Methods"
+msgstr "Metode unosa"
 
-#: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 msgid "Event Processor"
 msgstr "Procesor događaja"
 
-#: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
-#, fuzzy
-msgid "Font"
-msgstr "Fontovi"
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
+msgid "Bold"
+msgstr "Masno"
 
-#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
-#, fuzzy
-msgid "GDKFont"
-msgstr "Fontovi"
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
+msgid "Strikeout"
+msgstr "Precrtano"
 
-#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3491 ../widgets/text/e-text.c:3492
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
+msgid "Anchor"
+msgstr "Sidro"
+
+#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "Poravnavanje"
 
-#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3591 ../widgets/text/e-text.c:3592
+#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
+msgid "Clip Width"
+msgstr "Širina izrezanog"
+
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
+msgid "Clip Height"
+msgstr "Visina izrezanog"
+
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
+msgid "Clip"
+msgstr "Izrezano"
+
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
+msgid "Fill clip rectangle"
+msgstr "Ispuni izrezani pravougaonik"
+
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
+msgid "X Offset"
+msgstr "X-razmak"
+
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
+msgid "Y Offset"
+msgstr "Y-razmak"
+
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+msgid "Text width"
+msgstr "Širina teksta"
+
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
+msgid "Text height"
+msgstr "Visina teksta"
+
+#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "Koristi elipsu"
 
-#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3598 ../widgets/text/e-text.c:3599
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "Elipsa"
 
-#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3605 ../widgets/text/e-text.c:3606
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "Lomljenje linije"
 
-#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3612 ../widgets/text/e-text.c:3613
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "Prelomi znakove"
 
-#: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "Maksimalno linija"
 
-#: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3648 ../widgets/text/e-text.c:3649
-msgid "Allow newlines"
-msgstr "Dopusti nove linije"
-
-#: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3641 ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "Nacrtaj granice"
 
-#: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3655 ../widgets/text/e-text.c:3656
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+msgid "Allow newlines"
+msgstr "Dopusti nove linije"
+
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "Nacrtaj pozadinu"
 
-#: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "Nacrtaj dugme"
 
-#: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Cursor position"
 msgstr "Pozicija kursora"
 
-#: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
-msgid "Emulate label resize"
-msgstr ""
+#. Translators: Input Method Context
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
+msgid "IM Context"
+msgstr "IM kontekst"
 
-#: ../widgets/text/e-text.c:2696
-msgid "Input Methods"
-msgstr "Metode unosa"
+#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
+msgid "Handle Popup"
+msgstr "Upravljanje popup-ovima"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Bold"
-msgstr "Masno"
+#~ msgid "Properties..."
+#~ msgstr "Postavke..."
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Strikeout"
-msgstr "Precrtano"
+#~ msgid "*"
+#~ msgstr "*"
 
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Anchor"
-msgstr "Sidro"
+#~ msgid "3268"
+#~ msgstr "3268"
 
-#: ../widgets/text/e-text.c:3498 ../widgets/text/e-text.c:3499
-msgid "Clip Width"
-msgstr "Širina izrezanog"
+#~ msgid "389"
+#~ msgstr "389"
 
-#: ../widgets/text/e-text.c:3505 ../widgets/text/e-text.c:3506
-msgid "Clip Height"
-msgstr "Visina izrezanog"
+#~ msgid "636"
+#~ msgstr "636"
 
-#: ../widgets/text/e-text.c:3512 ../widgets/text/e-text.c:3513
-msgid "Clip"
-msgstr "Izrezano"
+#~ msgid "<b>Display</b>"
+#~ msgstr "<b>Prikaz</b>"
 
-#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
-msgid "Fill clip rectangle"
-msgstr "Ispuni izrezani pravougaonik"
+#~ msgid "<b>Server Information</b>"
+#~ msgstr "<b>Informacije o serveru</b>"
 
-#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
-msgid "X Offset"
-msgstr "X-razmak"
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>Vrsta:</b>"
 
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
-msgid "Y Offset"
-msgstr "Y-razmak"
+#~ msgid "Add Address Book"
+#~ msgstr "Dodaj adresar"
 
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
-msgid "Text width"
-msgstr "Širina teksta"
+#~ msgid "Anonymously"
+#~ msgstr "Anonimno"
 
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
-msgid "Text height"
-msgstr "Visina teksta"
+#~ msgid "Basic"
+#~ msgstr "Osnovno"
 
-#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
-msgid "IM Context"
-msgstr "IM kontekst"
+#~ msgid "Distinguished name"
+#~ msgstr "Posebno ime"
 
-#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
-msgid "Handle Popup"
-msgstr "Upravljanje popup-ovima"
+#~ msgid "Email address"
+#~ msgstr "Email adresa"
+
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "Nađi dostupne osnove za pretragu"
+
+#~ msgid ""
+#~ "Selecting this option means that Evolution will only try to use SSL/TLS "
+#~ "if you are in a insecure environment. For example, if you and your LDAP "
+#~ "server are behind a firewall at work, then Evolution doesn't need to use "
+#~ "SSL/TLS because your connection is already secure."
+#~ msgstr ""
+#~ "Izbor ove opcije znači da će Evolution pokušati da koristi samo SSL/TLS "
+#~ "ako okruženje nije sigurno. Naprimjer, ako je vaš LDAP server iza "
+#~ "firewalla na poslu,\n"
+#~ "onda nema potrebe da Evolution koristi SSL/TLS jer je vaša veza već\n"
+#~ "sigurna."
+
+#~ msgid "Sub"
+#~ msgstr "Pod"
+
+#~ msgid "Using email address"
+#~ msgstr "Koristim email adresu"
+
+#~ msgid "Whenever Possible"
+#~ msgstr "Kada je moguće"
+
+#~ msgid "MSN Messenger"
+#~ msgstr "MSN Messenger"
+
+#~ msgid "Novell Groupwise"
+#~ msgstr "Novell Groupwise"
+
+#, fuzzy
+#~ msgid "_Notes:"
+#~ msgstr "Bilješke:"
+
+#~ msgid "United States"
+#~ msgstr "Sjedinjene Američke Države"
+
+#~ msgid "Afghanistan"
+#~ msgstr "Afganistan"
+
+#~ msgid "Albania"
+#~ msgstr "Albanija"
+
+#~ msgid "Algeria"
+#~ msgstr "Alžir"
+
+#~ msgid "American Samoa"
+#~ msgstr "Američki Samoa"
+
+#~ msgid "Andorra"
+#~ msgstr "Andora"
+
+#~ msgid "Angola"
+#~ msgstr "Angola"
+
+#~ msgid "Anguilla"
+#~ msgstr "Anguilla"
+
+#~ msgid "Antarctica"
+#~ msgstr "Antartika"
+
+#~ msgid "Antigua And Barbuda"
+#~ msgstr "Antigua i Barbuda"
+
+#~ msgid "Argentina"
+#~ msgstr "Argentina"
+
+#~ msgid "Armenia"
+#~ msgstr "Armenija"
+
+#~ msgid "Aruba"
+#~ msgstr "Aruba"
+
+#~ msgid "Australia"
+#~ msgstr "Australija"
+
+#~ msgid "Austria"
+#~ msgstr "Austrija"
+
+#~ msgid "Azerbaijan"
+#~ msgstr "Azerbedžan"
+
+#~ msgid "Bahamas"
+#~ msgstr "Bahami"
+
+#~ msgid "Bahrain"
+#~ msgstr "Bahrain"
+
+#~ msgid "Bangladesh"
+#~ msgstr "Bangladeš"
+
+#~ msgid "Barbados"
+#~ msgstr "Barbados"
+
+#~ msgid "Belarus"
+#~ msgstr "Bjelorusija"
+
+#~ msgid "Belgium"
+#~ msgstr "Belgija"
+
+#~ msgid "Benin"
+#~ msgstr "Benin"
+
+#~ msgid "Bermuda"
+#~ msgstr "Bermuda"
+
+#~ msgid "Bhutan"
+#~ msgstr "Butan"
+
+#~ msgid "Bolivia"
+#~ msgstr "Bolivija"
+
+#~ msgid "Bosnia And Herzegowina"
+#~ msgstr "Bosna i Hercegovina"
+
+#~ msgid "Botswana"
+#~ msgstr "Bocvana"
+
+#~ msgid "Bouvet Island"
+#~ msgstr "Bouvet Otok"
+
+#~ msgid "Brazil"
+#~ msgstr "Brazil"
+
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "Teritorij Britanskog Indijskog Okeana"
+
+#~ msgid "Brunei Darussalam"
+#~ msgstr "Brunei Darussalam"
+
+#~ msgid "Bulgaria"
+#~ msgstr "Bugarska"
+
+#~ msgid "Burkina Faso"
+#~ msgstr "Burkina Faso"
+
+#~ msgid "Burundi"
+#~ msgstr "Burundi"
+
+#~ msgid "Cambodia"
+#~ msgstr "Kambodža"
+
+#~ msgid "Cameroon"
+#~ msgstr "Kamerun"
+
+#~ msgid "Canada"
+#~ msgstr "Kanada"
+
+#~ msgid "Cape Verde"
+#~ msgstr "Cape Verde"
+
+#~ msgid "Cayman Islands"
+#~ msgstr "Kajmanska ostrva"
+
+#~ msgid "Central African Republic"
+#~ msgstr "Centralna Afrička Republika"
+
+#~ msgid "Chad"
+#~ msgstr "Čad"
+
+#~ msgid "Chile"
+#~ msgstr "Čile"
+
+#~ msgid "China"
+#~ msgstr "Kina"
+
+#~ msgid "Christmas Island"
+#~ msgstr "Božićno ostvro"
+
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "Cocos (Keeling) ostrva"
+
+#~ msgid "Colombia"
+#~ msgstr "Kolumbija"
+
+#~ msgid "Comoros"
+#~ msgstr "Komori"
+
+#~ msgid "Congo"
+#~ msgstr "Kongo"
+
+#~ msgid "Congo, The Democratic Republic Of The"
+#~ msgstr "Congo, Demokratska Republika"
+
+#~ msgid "Cook Islands"
+#~ msgstr "Cook Ostrva"
+
+#~ msgid "Costa Rica"
+#~ msgstr "Kostarika"
+
+#~ msgid "Cote d'Ivoire"
+#~ msgstr "Obala Slonovače"
+
+#~ msgid "Croatia"
+#~ msgstr "Hrvatska"
+
+#~ msgid "Cuba"
+#~ msgstr "Kuba"
+
+#~ msgid "Cyprus"
+#~ msgstr "Kipar"
+
+#~ msgid "Czech Republic"
+#~ msgstr "Češka Republika"
+
+#~ msgid "Denmark"
+#~ msgstr "Danska"
+
+#~ msgid "Djibouti"
+#~ msgstr "Đibuti"
+
+#~ msgid "Dominica"
+#~ msgstr "Dominica"
+
+#~ msgid "Dominican Republic"
+#~ msgstr "Dominikanska Republika"
+
+#~ msgid "Ecuador"
+#~ msgstr "Evkador"
+
+#~ msgid "Egypt"
+#~ msgstr "Egipat"
+
+#~ msgid "El Salvador"
+#~ msgstr "El Salvador"
+
+#~ msgid "Equatorial Guinea"
+#~ msgstr "Ekvatorijalna Gvineja"
+
+#~ msgid "Eritrea"
+#~ msgstr "Eritreja"
+
+#~ msgid "Estonia"
+#~ msgstr "Estonija"
+
+#~ msgid "Ethiopia"
+#~ msgstr "Etiopija"
+
+#~ msgid "Falkland Islands"
+#~ msgstr "Foklandski otoci"
+
+#~ msgid "Faroe Islands"
+#~ msgstr "Faroe ostrva"
+
+#~ msgid "Fiji"
+#~ msgstr "Fiđi"
+
+#~ msgid "Finland"
+#~ msgstr "Finska"
+
+#~ msgid "French Guiana"
+#~ msgstr "Francuska Gvineja"
+
+#~ msgid "French Polynesia"
+#~ msgstr "Francuska Polinezija"
+
+#~ msgid "French Southern Territories"
+#~ msgstr "Francuski južni teritoriji"
+
+#~ msgid "Gabon"
+#~ msgstr "Gabon"
+
+#~ msgid "Gambia"
+#~ msgstr "Gambija"
+
+#~ msgid "Georgia"
+#~ msgstr "Gruzija"
+
+#~ msgid "Germany"
+#~ msgstr "Njemačka"
+
+#~ msgid "Ghana"
+#~ msgstr "Gana"
+
+#~ msgid "Gibraltar"
+#~ msgstr "Gibraltar"
+
+#~ msgid "Greece"
+#~ msgstr "Grčka"
+
+#~ msgid "Greenland"
+#~ msgstr "Grenland"
+
+#~ msgid "Grenada"
+#~ msgstr "Grenada"
+
+#~ msgid "Guadeloupe"
+#~ msgstr "Guadalupe"
+
+#~ msgid "Guam"
+#~ msgstr "Guam"
+
+#~ msgid "Guatemala"
+#~ msgstr "Gvatemala"
+
+#~ msgid "Guernsey"
+#~ msgstr "Guernsey"
+
+#~ msgid "Guinea"
+#~ msgstr "Gvineja"
+
+#~ msgid "Guinea-bissau"
+#~ msgstr "Guinea-bissau"
+
+#~ msgid "Guyana"
+#~ msgstr "Gvajana"
+
+#~ msgid "Haiti"
+#~ msgstr "Haiti"
+
+#~ msgid "Heard And McDonald Islands"
+#~ msgstr "Heard And McDonald Islands"
+
+#~ msgid "Holy See"
+#~ msgstr "Holy See"
+
+#~ msgid "Honduras"
+#~ msgstr "Honduras"
+
+#~ msgid "Hong Kong"
+#~ msgstr "Hong Kong"
+
+#~ msgid "Hungary"
+#~ msgstr "Mađarska"
+
+#~ msgid "Iceland"
+#~ msgstr "Island"
+
+#~ msgid "India"
+#~ msgstr "Indija"
+
+#~ msgid "Indonesia"
+#~ msgstr "Indonezija"
+
+#~ msgid "Iran"
+#~ msgstr "Iran"
+
+#~ msgid "Iraq"
+#~ msgstr "Irak"
+
+#~ msgid "Ireland"
+#~ msgstr "Irska"
+
+#~ msgid "Isle of Man"
+#~ msgstr "Isle of Man"
+
+#~ msgid "Israel"
+#~ msgstr "Izrael"
+
+#~ msgid "Italy"
+#~ msgstr "Italija"
+
+#~ msgid "Jamaica"
+#~ msgstr "Jamajka"
+
+#~ msgid "Japan"
+#~ msgstr "Japan"
+
+#~ msgid "Jersey"
+#~ msgstr "Jersey"
+
+#~ msgid "Jordan"
+#~ msgstr "Jordan"
+
+#~ msgid "Kazakhstan"
+#~ msgstr "Kazakhstan"
+
+#~ msgid "Kiribati"
+#~ msgstr "Kiribati"
+
+#~ msgid "Korea, Democratic People's Republic Of"
+#~ msgstr "Korea, Demokratska Narodna Republika"
+
+#~ msgid "Korea, Republic Of"
+#~ msgstr "Korea, Republika"
+
+#~ msgid "Kuwait"
+#~ msgstr "Kuvajt"
+
+#~ msgid "Kyrgyzstan"
+#~ msgstr "Kyrgyzstan"
+
+#~ msgid "Latvia"
+#~ msgstr "Latvija"
+
+#~ msgid "Lebanon"
+#~ msgstr "Libanon"
+
+#~ msgid "Lesotho"
+#~ msgstr "Lesoto"
+
+#~ msgid "Liberia"
+#~ msgstr "Liberija"
+
+#~ msgid "Libya"
+#~ msgstr "Libija"
+
+#~ msgid "Liechtenstein"
+#~ msgstr "Linhenštajn"
+
+#~ msgid "Lithuania"
+#~ msgstr "Litva"
+
+#~ msgid "Luxembourg"
+#~ msgstr "Luksemburg"
+
+#~ msgid "Macao"
+#~ msgstr "Ožujak"
+
+#~ msgid "Macedonia"
+#~ msgstr "Makedonija"
+
+#~ msgid "Madagascar"
+#~ msgstr "Madagaskar"
+
+#~ msgid "Malawi"
+#~ msgstr "Malawi"
+
+#~ msgid "Malaysia"
+#~ msgstr "Malezija"
+
+#~ msgid "Maldives"
+#~ msgstr "Maldivi"
+
+#~ msgid "Mali"
+#~ msgstr "Mali"
+
+#~ msgid "Malta"
+#~ msgstr "Malta"
+
+#~ msgid "Marshall Islands"
+#~ msgstr "Marshall Islands"
+
+#~ msgid "Martinique"
+#~ msgstr "Martinique"
+
+#~ msgid "Mauritania"
+#~ msgstr "Mauritania"
+
+#~ msgid "Mauritius"
+#~ msgstr "Mauricijus"
+
+#~ msgid "Mayotte"
+#~ msgstr "Mayotte"
+
+#~ msgid "Mexico"
+#~ msgstr "Meksiko"
+
+#~ msgid "Micronesia"
+#~ msgstr "Micronesia"
+
+#~ msgid "Moldova, Republic Of"
+#~ msgstr "Republika Moldavija"
+
+#~ msgid "Monaco"
+#~ msgstr "Monako"
+
+#~ msgid "Mongolia"
+#~ msgstr "Mongolija"
+
+#~ msgid "Montserrat"
+#~ msgstr "Montserrat"
+
+#~ msgid "Morocco"
+#~ msgstr "Maroko"
+
+#~ msgid "Mozambique"
+#~ msgstr "Mozambique"
+
+#~ msgid "Myanmar"
+#~ msgstr "Mianmar"
+
+#~ msgid "Namibia"
+#~ msgstr "Namibija"
+
+#~ msgid "Nauru"
+#~ msgstr "Nauru"
+
+#~ msgid "Nepal"
+#~ msgstr "Nepal"
+
+#~ msgid "Netherlands"
+#~ msgstr "Nizozemska"
+
+#~ msgid "Netherlands Antilles"
+#~ msgstr "Netherlands Antilles"
+
+#~ msgid "New Caledonia"
+#~ msgstr "Nova Kaledonia"
+
+#~ msgid "Nicaragua"
+#~ msgstr "Nikaragva"
+
+#~ msgid "Niger"
+#~ msgstr "Niger"
+
+#~ msgid "Nigeria"
+#~ msgstr "Nigerija"
+
+#~ msgid "Niue"
+#~ msgstr "Niue"
+
+#~ msgid "Norfolk Island"
+#~ msgstr "Norfolk Island"
+
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "Northern Mariana Islands"
+
+#~ msgid "Norway"
+#~ msgstr "Norveška"
+
+#~ msgid "Oman"
+#~ msgstr "Oman"
+
+#~ msgid "Pakistan"
+#~ msgstr "Pakistan"
+
+#~ msgid "Palestinian Territory"
+#~ msgstr "Palestinski teritorij"
+
+#~ msgid "Panama"
+#~ msgstr "Panama"
+
+#~ msgid "Papua New Guinea"
+#~ msgstr "Papua Nova Gvineja"
+
+#~ msgid "Paraguay"
+#~ msgstr "Paragvaj"
+
+#~ msgid "Peru"
+#~ msgstr "Peru"
+
+#~ msgid "Philippines"
+#~ msgstr "Filipini"
+
+#~ msgid "Pitcairn"
+#~ msgstr "Pitcairn"
+
+#~ msgid "Poland"
+#~ msgstr "Poljska"
+
+#~ msgid "Portugal"
+#~ msgstr "Portugal"
+
+#~ msgid "Puerto Rico"
+#~ msgstr "Puerto Rico"
+
+#~ msgid "Qatar"
+#~ msgstr "Kvatar"
+
+#~ msgid "Reunion"
+#~ msgstr "Reunion"
+
+#~ msgid "Romania"
+#~ msgstr "Rumunjska"
+
+#~ msgid "Russian Federation"
+#~ msgstr "Ruska Federacija"
+
+#~ msgid "Rwanda"
+#~ msgstr "Ruanda"
+
+#~ msgid "Saint Kitts And Nevis"
+#~ msgstr "Sveti Kitts i Nevis"
+
+#~ msgid "Saint Lucia"
+#~ msgstr "Sveta Lucija"
+
+#, fuzzy
+#~ msgid "Saint Vincent And The Grenadines"
+#~ msgstr "Saint Vincent i Grena-dines"
+
+#~ msgid "Samoa"
+#~ msgstr "Samoa"
+
+#~ msgid "San Marino"
+#~ msgstr "San Marino"
+
+#~ msgid "Sao Tome And Principe"
+#~ msgstr "Sao Tome and Principe"
+
+#~ msgid "Saudi Arabia"
+#~ msgstr "Saudijska Arabija"
+
+#~ msgid "Senegal"
+#~ msgstr "Senegal"
+
+#~ msgid "Serbia And Montenegro"
+#~ msgstr "Srbija i Crna Gora"
+
+#~ msgid "Seychelles"
+#~ msgstr "Sejšeli"
+
+#~ msgid "Sierra Leone"
+#~ msgstr "Sierra Leone"
+
+#~ msgid "Singapore"
+#~ msgstr "Singapur"
+
+#~ msgid "Slovakia"
+#~ msgstr "Slovačka"
+
+#~ msgid "Slovenia"
+#~ msgstr "Slovenija"
+
+#~ msgid "Solomon Islands"
+#~ msgstr "Solomonska ostrva"
+
+#~ msgid "Somalia"
+#~ msgstr "Somalija"
+
+#~ msgid "South Africa"
+#~ msgstr "Južna Afrika"
+
+#~ msgid "South Georgia And The South Sandwich Islands"
+#~ msgstr "Južna Georgia i Južni Sandwich Islands"
+
+#~ msgid "Spain"
+#~ msgstr "Španjolska"
+
+#~ msgid "Sri Lanka"
+#~ msgstr "Šri Lanka"
+
+#~ msgid "St. Helena"
+#~ msgstr "Sv. Helena"
+
+#~ msgid "St. Pierre And Miquelon"
+#~ msgstr "St. Pierre And Miquelon"
+
+#~ msgid "Sudan"
+#~ msgstr "Sudan"
+
+#~ msgid "Suriname"
+#~ msgstr "Surinam"
+
+#~ msgid "Svalbard And Jan Mayen Islands"
+#~ msgstr "Svalbard And Jan Mayen Islands"
+
+#~ msgid "Swaziland"
+#~ msgstr "Svazilend"
+
+#~ msgid "Sweden"
+#~ msgstr "Švedska"
+
+#~ msgid "Switzerland"
+#~ msgstr "Švicarska"
+
+#~ msgid "Syria"
+#~ msgstr "Sirija"
+
+#~ msgid "Taiwan"
+#~ msgstr "Tajvan"
+
+#~ msgid "Tajikistan"
+#~ msgstr "Tajikistan"
+
+#~ msgid "Tanzania, United Republic Of"
+#~ msgstr "Tanzania, Ujedinjena Republika"
+
+#~ msgid "Timor-Leste"
+#~ msgstr "Timor-Leste"
+
+#~ msgid "Tokelau"
+#~ msgstr "Tokelau"
+
+#~ msgid "Tonga"
+#~ msgstr "Tonga"
+
+#~ msgid "Trinidad And Tobago"
+#~ msgstr "Trinidad i Tobago"
+
+#~ msgid "Tunisia"
+#~ msgstr "Tunis"
+
+#~ msgid "Turkey"
+#~ msgstr "Turska"
+
+#~ msgid "Turkmenistan"
+#~ msgstr "Turkmenistan"
+
+#~ msgid "Turks And Caicos Islands"
+#~ msgstr "Turks i Caicos otočje"
+
+#~ msgid "Tuvalu"
+#~ msgstr "Tuvalu"
+
+#~ msgid "Uganda"
+#~ msgstr "Uganda"
+
+#~ msgid "Ukraine"
+#~ msgstr "Ukrajina"
+
+#~ msgid "United Arab Emirates"
+#~ msgstr "Ujedinjeni Arapski Emirati"
+
+#~ msgid "United Kingdom"
+#~ msgstr "Ujedinjeno Kraljevstvo"
+
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "United States Minor Outlying Islands"
+
+#~ msgid "Uruguay"
+#~ msgstr "Urugvaj"
+
+#~ msgid "Uzbekistan"
+#~ msgstr "Uzbekistan"
+
+#~ msgid "Vanuatu"
+#~ msgstr "Vanuatu"
+
+#~ msgid "Venezuela"
+#~ msgstr "Venecuela"
+
+#~ msgid "Viet Nam"
+#~ msgstr "Viet Nam"
+
+#~ msgid "Virgin Islands, British"
+#~ msgstr "Britanska Djevičanska ostrva"
+
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "Američka Djevičanska ostrva"
+
+#~ msgid "Wallis And Futuna Islands"
+#~ msgstr "Ostrva Wallis And Futuna"
+
+#~ msgid "Western Sahara"
+#~ msgstr "Zapadna Sahara"
+
+#~ msgid "Yemen"
+#~ msgstr "Jemen"
+
+#~ msgid "Zambia"
+#~ msgstr "Zambija"
+
+#~ msgid "Zimbabwe"
+#~ msgstr "Zimbabve"
+
+#~ msgid "AOL Instant Messenger"
+#~ msgstr "AOL Instant Messenger"
+
+#~ msgid "Yahoo Messenger"
+#~ msgstr "Yahoo Messenger"
+
+#~ msgid "Username"
+#~ msgstr "Korisničko ime"
+
+#~ msgid "E-_mail:"
+#~ msgstr "E-_mail:"
+
+#~ msgid "Address _2:"
+#~ msgstr "_Adresa 2:"
+
+#~ msgid "Ci_ty:"
+#~ msgstr "_Grad:"
+
+#~ msgid "Countr_y:"
+#~ msgstr "_Država:"
+
+#~ msgid "Full Address"
+#~ msgstr "Puna adresa"
+
+#~ msgid "_ZIP Code:"
+#~ msgstr "_Poštanski broj:"
+
+#~ msgid "Dr."
+#~ msgstr "Dr."
+
+#~ msgid "Esq."
+#~ msgstr "Esq."
+
+#~ msgid "I"
+#~ msgstr "I"
+
+#~ msgid "II"
+#~ msgstr "II"
+
+#~ msgid "III"
+#~ msgstr "III"
+
+#~ msgid "Jr."
+#~ msgstr "Mlađi"
+
+#~ msgid "Mr."
+#~ msgstr "Gdin."
+
+#~ msgid "Mrs."
+#~ msgstr "Gđa."
+
+#~ msgid "Ms."
+#~ msgstr "Gđica."
+
+#~ msgid "Sr."
+#~ msgstr "St."
+
+#~ msgid "_IM Service:"
+#~ msgstr "Servis _IM:"
+
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid "Add an email to the List"
+#~ msgstr "Dodaj email listi"
+
+#, fuzzy
+#~ msgid "Insert email addresses from Address Book"
+#~ msgstr "Ubacite email adrese iz adresara"
+
+#, fuzzy
+#~ msgid "_Select"
+#~ msgstr "Izaberi"
+
+#~ msgid ""
+#~ "The changed email or name of this contact already\n"
+#~ "exists in this folder.  Would you like to add it anyway?"
+#~ msgstr ""
+#~ "Promijenjena email adresa ili ime ovog kontakta već\n"
+#~ "postoji u ovom direktoriju. Želite li je svejedno dodati?"
+
+#~ msgid "Advanced..."
+#~ msgstr "Napredno..."
+
+#, fuzzy
+#~ msgid "Print cards"
+#~ msgstr "Štampaj zadatke"
+
+#~ msgid "Organization"
+#~ msgstr "Organizacija"
+
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
+#~ msgid "Video Conferencing"
+#~ msgstr "Video konferencije"
+
+#~ msgid "work"
+#~ msgstr "posao"
+
+#~ msgid "WWW"
+#~ msgstr "WWW"
+
+#~ msgid "personal"
+#~ msgstr "osobno"
+
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either means you have "
+#~ "entered an incorrect URI, or the LDAP server is unreachable."
+#~ msgstr ""
+#~ "Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni "
+#~ "URI ili je LDAP server nedostupan."
+
+#~ msgid "Select target addressbook."
+#~ msgstr "Izaberite odredišni adresar."
+
+#~ msgid "(none)"
+#~ msgstr "(nijedan) "
+
+#~ msgid "Select an Action"
+#~ msgstr "Izaberi akciju"
+
+#~ msgid "Create a new contact \"%s\""
+#~ msgstr "Napravi novi kontakt \"%s\""
+
+#~ msgid "Add address to existing contact \"%s\""
+#~ msgstr "Dodaj adresu postojećim kontaktima \"%s\""
+
+#~ msgid "Merge E-Mail Address"
+#~ msgstr "Spoji email adrese"
+
+#~ msgid "GTK Tree View"
+#~ msgstr "Pogled GTK stabla"
+
+#~ msgid "Print envelope"
+#~ msgstr "Štampa koverte "
+
+#~ msgid "Print contacts"
+#~ msgstr "Štampaj kontakte"
+
+#~ msgid "Print contact"
+#~ msgstr "Štampaj kontakt"
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
+
+#~ msgid "Blank forms at end:"
+#~ msgstr "Prazni obrasci na kraju:"
+
+#~ msgid "Body"
+#~ msgstr "Tijelo"
+
+#~ msgid "Bottom:"
+#~ msgstr "Dno:"
+
+#~ msgid "Dimensions:"
+#~ msgstr "Dimenzije:"
+
+#~ msgid "F_ont..."
+#~ msgstr "_Font..."
+
+#~ msgid "Fonts"
+#~ msgstr "Fontovi"
+
+#~ msgid "Footer:"
+#~ msgstr "Podnožje:"
+
+#~ msgid "Header/Footer"
+#~ msgstr "Zaglavlje/podnožje"
+
+#~ msgid "Headings"
+#~ msgstr "Naslovi"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "Naslov za svako slovo"
+
+#~ msgid "Height:"
+#~ msgstr "Visina:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "Odmah slijede jedna drugu"
+
+#~ msgid "Include:"
+#~ msgstr "Uključi:"
+
+#~ msgid "Landscape"
+#~ msgstr "Položeno"
+
+#~ msgid "Left:"
+#~ msgstr "Lijevo:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "Kartice za slovima sa strane"
+
+#~ msgid "Margins"
+#~ msgstr "Margine"
+
+#~ msgid "Number of columns:"
+#~ msgstr "Broj kolona:"
+
+#~ msgid "Orientation"
+#~ msgstr "Orijentacija"
+
+#~ msgid "Page"
+#~ msgstr "Stranica"
+
+#~ msgid "Paper"
+#~ msgstr "Papir"
+
+#~ msgid "Paper source:"
+#~ msgstr "Izvor papira:"
+
+#~ msgid "Portrait"
+#~ msgstr "Portret"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "Štampaj korištenjem sivog sjenčanja"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "Obrnuto na parnim stranicama"
+
+#~ msgid "Right:"
+#~ msgstr "Desno:"
+
+#~ msgid "Sections:"
+#~ msgstr "Odjeljci:"
+
+#~ msgid "Start on a new page"
+#~ msgstr "Započinju na novoj stranici"
+
+#~ msgid "Style name:"
+#~ msgstr "Naziv stila:"
+
+#~ msgid "Width:"
+#~ msgstr "Širina:"
+
+#~ msgid "_Font..."
+#~ msgstr "_Font..."
+
+#~ msgid "Contact Print Style Editor Test"
+#~ msgstr "Testiranje editora za štampu stila kontakta"
+
+#~ msgid "Copyright (C) 2000, Ximian, Inc."
+#~ msgstr "Autorska prava (C) 2000, Ximian, Inc."
+
+#~ msgid "This should test the contact print style editor widget"
+#~ msgstr "Ovo testira element editora stila za štampanje kontakta"
+
+#~ msgid "This should test the contact print code"
+#~ msgstr "Ovo isprobava kod za štampu kontakata"
+
+#~ msgid "Input File"
+#~ msgstr "Ulazna datoteka"
+
+#~ msgid ""
+#~ "All information in these journal entries will be deleted and can not be "
+#~ "restored."
+#~ msgstr ""
+#~ "Sve ifnormacije u ovim unosima u dnevniku će biti uklonjene i neće se "
+#~ "moći vratiti."
+
+#~ msgid ""
+#~ "All information on this journal entry will be deleted and can not be "
+#~ "restored."
+#~ msgstr ""
+#~ "Sve informacije o ovom unosu u dnevniku će biti uklonjene i neće se moći "
+#~ "vratiti."
+
+#~ msgid "Are you sure you want to delete these {0} journal entries?"
+#~ msgstr "Sigurno želite izbrisati ovih {0} unosa u dnevniku?"
+
+#~ msgid "Are you sure you want to delete this journal entry?"
+#~ msgstr "Sigurno želite izbrisati ovaj unos u dnevniku?"
+
+#~ msgid ""
+#~ "If you don't send a cancellation notice, the other participants may not "
+#~ "know the journal has been deleted."
+#~ msgstr ""
+#~ "Ukoliko ne pošaljete obavještenje o otkazivanju, ostali učesnici možda "
+#~ "neće znati da je ovaj dnevnik izbrisan."
+
+#, fuzzy
+#~ msgid "description of appointment"
+#~ msgstr "početak sastanka"
+
+#~ msgid ""
+#~ "Alarm on %s\n"
+#~ "%s\n"
+#~ "Starting at %s\n"
+#~ "Ending at %s"
+#~ msgstr ""
+#~ "Alarm za %s\n"
+#~ "%s\n"
+#~ "Počinje u %s\n"
+#~ "Završava u %s"
+
+#~ msgid "day(s)"
+#~ msgstr "dan(a)"
+
+#~ msgid "end of appointment"
+#~ msgstr "kraj sastanka"
+
+#~ msgid "hour(s)"
+#~ msgstr "sat(i)"
+
+#~ msgid "minute(s)"
+#~ msgstr "minuta(e)"
+
+#~ msgid "Remove"
+#~ msgstr "Ukloni"
+
+#~ msgid "Enable"
+#~ msgstr "Uključi"
+
+#~ msgid "05 minutes"
+#~ msgstr "05 minuta"
+
+#~ msgid "10 minutes"
+#~ msgstr "10 minuta"
+
+#~ msgid "15 minutes"
+#~ msgstr "15 minuta"
+
+#~ msgid "30 minutes"
+#~ msgstr "30 minuta"
+
+#~ msgid "60 minutes"
+#~ msgstr "60 minuta"
+
+#, fuzzy
+#~ msgid "<b>Default Free/Busy Server</b>"
+#~ msgstr "<b>Kalendari za slobodno/zauzeto</b>"
+
+#, fuzzy
+#~ msgid "<b>Publishing</b>"
+#~ msgstr "<b>Učestalost objavljivanja</b>"
+
+#~ msgid "<b>Task List</b>"
+#~ msgstr "<b>Lista zadataka</b>"
+
+#~ msgid "<b>Time</b>"
+#~ msgstr "<b>Vrijeme</b> "
+
+#~ msgid "<b>Work Week</b>"
+#~ msgstr "<b>Radna sedmica</b> "
+
+#~ msgid "Calendar and Tasks Settings"
+#~ msgstr "Postave kalendara i zadataka"
+
+#~ msgid "Color for overdue tasks"
+#~ msgstr "Boja zakašnjelih zadataka"
+
+#~ msgid "Color for tasks due today"
+#~ msgstr "Boja zadataka kojima danas ističe rok"
+
+#~ msgid "Days"
+#~ msgstr "dani"
+
+#~ msgid "Hours"
+#~ msgstr "Sati"
+
+#~ msgid "Minutes"
+#~ msgstr "Minuta"
+
+#~ msgid "_Add URL"
+#~ msgstr "_Dodaj adresu"
+
+#~ msgid "Add Calendar"
+#~ msgstr "Dodaj kalendar"
+
+#~ msgid "Add Task List"
+#~ msgstr "Dodaj listu zadataka"
+
+#~ msgid "_Add Calendar"
+#~ msgstr "Dodaj _kalendar"
+
+#~ msgid "_Add Task List"
+#~ msgstr "Dodaj listu zadataka"
+
+#~ msgid "This journal entry has been deleted."
+#~ msgstr "Ovaj unos u dnevnik je obrisan."
+
+#~ msgid "This journal entry has been changed."
+#~ msgstr "Ovaj unos u dnevnik je mijenjan."
+
+#~ msgid "The journal entry could not be deleted due to a corba error"
+#~ msgstr "Unos u dnevniku nije mogao biti obrisan zbog 'corba' greške"
+
+#~ msgid "The journal entry could not be deleted because permission was denied"
+#~ msgstr "Unos u dnevniku nije mogao biti obrisan zbog nemogućnosti pristupa"
+
+#~ msgid "The journal entry could not be deleted due to an error"
+#~ msgstr "Zbog greške je nemoguće obrisati stavku dnevnika"
+
+#~ msgid "Scheduling"
+#~ msgstr "Raspored"
+
+#~ msgid "Invitations"
+#~ msgstr "Pozivnice"
+
+#~ msgid "1 day before appointment"
+#~ msgstr "1 dan prije sastanka"
+
+#~ msgid "1 hour before appointment"
+#~ msgstr "1 sat prije sastanka"
+
+#~ msgid "15 minutes before appointment"
+#~ msgstr "15 minuta prije sastanka"
+
+#~ msgid "<b>Basics</b>"
+#~ msgstr "<b>Osnove</b>"
+
+#~ msgid "<b>Date and Time</b>"
+#~ msgstr "<b>Datum i vrijeme</b>"
+
+#~ msgid "A_ll day event"
+#~ msgstr "Cje_lodnevni događaj"
+
+#~ msgid "Cale_ndar:"
+#~ msgstr "Kale_ndar:"
+
+#~ msgid "Locat_ion:"
+#~ msgstr "Lo_kacija:"
+
+#~ msgid "This appointment has customized alarms"
+#~ msgstr "Ovaj sastanak ima proizvoljne alarme"
+
+#, fuzzy
+#~ msgid "<b>From:</b>"
+#~ msgstr "<b>Početak</b>"
+
+#~ msgid "_Delegate To..."
+#~ msgstr "_Delegiraj za..."
+
+#~ msgid "C_hange Organizer"
+#~ msgstr "Pro_mijeni organizatora"
+
+#~ msgid "<b>Calendar options</b>"
+#~ msgstr "<b>Opcije kalendara</b>"
+
+#~ msgid "Add New Calendar"
+#~ msgstr "Dodaj novi kalendar"
+
+#~ msgid "Calendar Group"
+#~ msgstr "Grupa kalendara"
+
+#~ msgid "Calendar Location"
+#~ msgstr "Lokacija kalendara"
+
+#~ msgid "Calendar Name"
+#~ msgstr "Naziv kalendara"
+
+#~ msgid "Add New Task List"
+#~ msgstr "Dodaj novu listu zadataka"
+
+#~ msgid "Task List Group"
+#~ msgstr "Grupa listi zadataka"
+
+#~ msgid "Task List Name"
+#~ msgstr "Naziv liste zadataka"
+
+#~ msgid ""
+#~ "You are modifying a recurring journal entry, what would you like to "
+#~ "modify?"
+#~ msgstr "Mijenjate povratni unos u dnevnik, šta želite promijeniti?"
+
+#~ msgid "for"
+#~ msgstr "za"
+
+#~ msgid "forever"
+#~ msgstr "uvijek"
+
+#~ msgid "month(s)"
+#~ msgstr "mjesec(a/i)"
+
+#~ msgid "week(s)"
+#~ msgstr "sedmicu(e/a)"
+
+#~ msgid "year(s)"
+#~ msgstr "godinu(e/a)"
+
+#~ msgid "Assignment"
+#~ msgstr "Zadatak"
+
+#~ msgid "D_escription:"
+#~ msgstr "_Opis:"
+
+#~ msgid "<b>Free/Busy C_alendars</b>"
+#~ msgstr "<b>Kalendari za slobodno/zauzeto</b>"
+
+#, fuzzy
+#~ msgid "Free/Busy Publishing Settings"
+#~ msgstr "Objava stanja slobodan/zauzet"
+
+#~ msgid "_Daily"
+#~ msgstr "_Dnevno"
+
+#~ msgid "_Manual"
+#~ msgstr "_Ručno"
+
+#~ msgid "_Weekly"
+#~ msgstr "_Sedmično"
+
+#, fuzzy
+#~ msgid "Task Table"
+#~ msgstr "Ažuriranje zadatka"
+
+#~ msgid "Task sort"
+#~ msgstr "Razvrstani zadaci"
+
+#~ msgid "_Publish Free/Busy Information"
+#~ msgstr "_Objavi informaciju za slobodan/zauzet"
+
+#~ msgid "Removal Complete"
+#~ msgstr "Uklanjanje završeno"
+
+#~ msgid "%P %%"
+#~ msgstr "%P %%"
+
+#~ msgid "date-end"
+#~ msgstr "krajnji-datum"
+
+#~ msgid "date-start"
+#~ msgstr "početni-datum"
+
+#, fuzzy
+#~ msgid "Timezone Button"
+#~ msgstr "Vremenska _zona:"
+
+#~ msgid "Updating query"
+#~ msgstr "Osvježavam upit"
+
+#~ msgid "April"
+#~ msgstr "April"
+
+#~ msgid "August"
+#~ msgstr "Avgust"
+
+#~ msgid "December"
+#~ msgstr "Decembar"
+
+#~ msgid "February"
+#~ msgstr "Februar"
+
+#~ msgid "January"
+#~ msgstr "Januar"
+
+#~ msgid "July"
+#~ msgstr "Juli"
+
+#~ msgid "June"
+#~ msgstr "Juni"
+
+#~ msgid "March"
+#~ msgstr "Mart"
+
+#~ msgid "May"
+#~ msgstr "Maj"
+
+#~ msgid "November"
+#~ msgstr "Novembar"
+
+#~ msgid "October"
+#~ msgstr "Oktobar"
+
+#~ msgid "September"
+#~ msgstr "Septembar"
+
+#~ msgid "Selected day (%a %b %d %Y)"
+#~ msgstr "Odabrani dan (%a %b %d %Y)"
+
+#~ msgid "%a %b %d"
+#~ msgstr "%a %b %d"
+
+#~ msgid "%a %d %Y"
+#~ msgstr "%a %d %Y"
+
+#~ msgid "%a %b %d %Y"
+#~ msgstr "%a %b %d %Y"
+
+#~ msgid "Selected week (%s - %s)"
+#~ msgstr "Odabrana sedmica (%s - %s)"
+
+#~ msgid "Selected month (%b %Y)"
+#~ msgstr "Odabran mjesec (%b %Y)"
+
+#~ msgid "Selected year (%Y)"
+#~ msgstr "Odabrana godina (%Y)"
+
+#~ msgid "Print Preview"
+#~ msgstr "Pogled prije štampe"
+
+#~ msgid "SMTWTFS"
+#~ msgstr "SMTWTFS"
+
+#, fuzzy
+#~ msgid "Cannot open file &quot;{0}&quot;."
+#~ msgstr "Ne mogu otvoriti \"{0}\"."
+
+#, fuzzy
+#~ msgid "If"
+#~ msgstr "I"
+
+#, fuzzy
+#~ msgid "Mail Accounts Table"
+#~ msgstr "_Ime računa:"
+
+#, fuzzy
+#~ msgid "Save Selected..."
+#~ msgstr "Izabrano"
+
+#, fuzzy
+#~ msgid "Se_lect..."
+#~ msgstr "Izaberi"
+
+#, fuzzy
+#~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
+#~ msgstr "<span weight=\"bold\">Osnove</span>"
+
+#, fuzzy
+#~ msgid "HTTP Calendars"
+#~ msgstr "Kalendari"
+
+#, fuzzy
+#~ msgid "_Contacts..."
+#~ msgstr "Kontakti..."
+
+#~ msgid "dialog1"
+#~ msgstr "dialog1"
+
+#, fuzzy
+#~ msgid "Meetings and Tasks"
+#~ msgstr "Kalendar i zadaci"
+
+#, fuzzy
+#~ msgid "<span weight=\"bold\">Conflict Search</span>"
+#~ msgstr "<span weight=\"bold\">Status</span>"
+
+#, fuzzy
+#~ msgid "System error: %s"
+#~ msgstr "Greška pri provjeri: %s"
+
+#, fuzzy
+#~ msgid "No store available"
+#~ msgstr "Opis ne postoji."
+
+#, fuzzy
+#~ msgid "Mail to meeting"
+#~ msgstr "Novi sastanak"
+
+#, fuzzy
+#~ msgid "Id"
+#~ msgstr "I"
+
+#, fuzzy
+#~ msgid "Path"
+#~ msgstr "Umetni"
+
+#, fuzzy
+#~ msgid "Save Attachments ..."
+#~ msgstr "Snimi kao..."
+
+#, fuzzy
+#~ msgid "Printer settings"
+#~ msgstr "Podešavanja pilota..."
+
+#~ msgid "E"
+#~ msgstr "E"
+
+#, fuzzy
+#~ msgid "Pos_t New Message to Folder"
+#~ msgstr "Pošalji poruku kontaktu"
+
+#, fuzzy
+#~ msgid "_Edit..."
+#~ msgstr "_Izmijeni"
+
+#~ msgid "Text of the expander's label"
+#~ msgstr "Tekst oznake razgranika"
+
+#~ msgid "Use underline"
+#~ msgstr "Koristi podvlačenje"
+
+#~ msgid ""
+#~ "If set, an underline in the text indicates the next character should be "
+#~ "used for the mnemonic accelerator key"
+#~ msgstr ""
+#~ "Ukoliko je postavljeno, podvlačenje označava da se sljedeći znak koristi "
+#~ "kao kratica"
+
+#~ msgid "Space to put between the label and the child"
+#~ msgstr "Razmak koji se stavlja između oznake i sadržanog elementa"
+
+#~ msgid "Label widget"
+#~ msgstr "Element oznake"
+
+#~ msgid "A widget to display in place of the usual expander label"
+#~ msgstr "Element koji se prikazuje umjesto uobičajene oznake graničnika"
+
+#~ msgid "Indicator Spacing"
+#~ msgstr "Razmak pokazivača"
+
+#~ msgid "Spacing around expander arrow"
+#~ msgstr "Razmaci oko strjelica za grananje"
+
+#, fuzzy
+#~ msgid "Search Text Entry"
+#~ msgstr "Editor pretrage"
+
+#, fuzzy
+#~ msgid "Search Type"
+#~ msgstr "Ops_eg pretrage:"
+
+#~ msgid "Subitem ID"
+#~ msgstr "ID podstavke"
+
+#~ msgid "Find _Now"
+#~ msgstr "_Traži sad"
+
+#, fuzzy
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "Ovaj kontakt pripada sljedećim kategorijama:"
+
+#, fuzzy
+#~ msgid "_Available Categories:"
+#~ msgstr "_Kategorije"
+
+#, fuzzy
+#~ msgid "categories"
+#~ msgstr "Kategorije"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%H:%M"
+
+#, fuzzy
+#~ msgid "<- _Remove"
+#~ msgstr "_Ukloni"
+
+#~ msgid "DnD code"
+#~ msgstr "DnD kod"
+
+#~ msgid "Fontset"
+#~ msgstr "Skup fontova"
+
+#~ msgid "Always Search"
+#~ msgstr "Uvijek traži"
+
+#, fuzzy
+#~ msgid "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "Autorska prava (C) 2000, Ximian, Inc."
+
+#, fuzzy
+#~ msgid "This should test the minicard canvas item"
+#~ msgstr "Ovo bi trebalo isprobati preispunjavanje polja"
+
+#, fuzzy
+#~ msgid "Font"
+#~ msgstr "Fontovi"
+
+#, fuzzy
+#~ msgid "GDKFont"
+#~ msgstr "Fontovi"
author	Andre Klapper <a9016009@gmx.de>	2009-08-11 02:32:04 +0800
committer	Matthew Barnes <mbarnes@redhat.com>	2009-08-12 06:15:01 +0800
commit	36bbdb81c671cf55a334af6dc97be44a0c41bbdb (patch)
tree	211afbe177ec87f1cffc5b60a29f4159dff67f13 /po
parent	32fae4047923ca8153e432b9b14704e901b77b82 (diff)
download	gsoc2013-evolution-36bbdb81c671cf55a334af6dc97be44a0c41bbdb.tar gsoc2013-evolution-36bbdb81c671cf55a334af6dc97be44a0c41bbdb.tar.gz gsoc2013-evolution-36bbdb81c671cf55a334af6dc97be44a0c41bbdb.tar.bz2 gsoc2013-evolution-36bbdb81c671cf55a334af6dc97be44a0c41bbdb.tar.lz gsoc2013-evolution-36bbdb81c671cf55a334af6dc97be44a0c41bbdb.tar.xz gsoc2013-evolution-36bbdb81c671cf55a334af6dc97be44a0c41bbdb.tar.zst gsoc2013-evolution-36bbdb81c671cf55a334af6dc97be44a0c41bbdb.zip