diff --git a/po/hr.po b/po/hr.po
index 9d6e929b..8cab9e23 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,11 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-calendar\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-09-14 16:16+0000\n"
-"PO-Revision-Date: 2016-09-22 23:01+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"calendar&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2017-03-23 02:00+0000\n"
+"PO-Revision-Date: 2017-04-10 21:40+0200\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +20,12 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Launchpad-Export-Date: 2016-09-22 19:52+0000\n"
 "X-Generator: Poedit 1.8.7.1\n"
-"Language: hr\n"
 
 #: ../data/appdata/org.gnome.Calendar.appdata.xml.in.h:1
 #: ../data/org.gnome.Calendar.desktop.in.in.h:1
 #: ../data/org.gnome.Calendar.search-provider.ini.in.in.h:1
-#: ../data/ui/quick-add-popover.ui.h:3 ../data/ui/window.ui.h:3
-#: ../src/gcal-application.c:483
+#: ../data/ui/quick-add-popover.ui.h:3 ../data/ui/window.ui.h:4
+#: ../src/gcal-application.c:469
 msgid "Calendar"
 msgstr "Kalendar"
 
@@ -45,15 +46,15 @@ msgstr ""
 #: ../data/appdata/org.gnome.Calendar.appdata.xml.in.h:4
 msgid ""
 "We aim to find the perfect balance between nicely crafted features and user-"
-"centred usability. No excess, no lacks. You'll feel comfortable using "
-"Calendar, like you've been using it for ages!"
+"centred usability. No excess, no lacks. You’ll feel comfortable using "
+"Calendar, like you’ve been using it for ages!"
 msgstr ""
 "Cilj nam je pronalazak ravnoteže između korisnih značajki i upotrebljivosti "
 "za korisnike. Bez nedostataka i manjkavosti, osjećati ćete se komforno "
 "koristeći Kalendar, kao da ga koristite godinama!"
 
 #: ../data/appdata/org.gnome.Calendar.appdata.xml.in.h:5
-#: ../data/ui/window.ui.h:6
+#: ../data/ui/window.ui.h:7
 msgid "Search for events"
 msgstr "Pretraži događaje"
 
@@ -101,51 +102,95 @@ msgstr "Vrsta aktivnog prikaza"
 msgid "Type of the active window view, default value is: monthly view"
 msgstr "Vrsta aktivnog pogleda prozora, zadana vrijednost je: mjesečni prikaz"
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:9
-msgid "List of the disabled sources"
-msgstr "Popis onemogućenih izvora"
+#: ../data/ui/alarm-row.ui.h:1
+msgid "Toggles the sound of the alarm"
+msgstr "Uklj/Isklj zvuk alarma"
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:10
-msgid "Sources disabled last time Calendar ran"
-msgstr "Onemogućeni izvori od kada je zadnji puta Kalendar pokrenut"
+#: ../data/ui/alarm-row.ui.h:2
+msgid "Remove the alarm"
+msgstr "Ukloni alarm"
 
 #: ../data/ui/edit-dialog.ui.h:1 ../data/ui/source-dialog.ui.h:23
-#: ../src/gcal-source-dialog.c:1138
+#: ../src/gcal-source-dialog.c:1148
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../data/ui/edit-dialog.ui.h:2 ../src/gcal-edit-dialog.c:430
+#: ../data/ui/edit-dialog.ui.h:2
+msgid "Click to select the calendar"
+msgstr "Klikni za odabir kalendara"
+
+#: ../data/ui/edit-dialog.ui.h:3 ../src/gcal-edit-dialog.c:583
 msgid "Done"
 msgstr "Završeno"
 
-#: ../data/ui/edit-dialog.ui.h:3
+#: ../data/ui/edit-dialog.ui.h:4
 msgid "Title"
 msgstr "Naslov"
 
-#: ../data/ui/edit-dialog.ui.h:4
-msgid "Starts"
-msgstr "Počinje"
-
 #: ../data/ui/edit-dialog.ui.h:5
-msgid "Ends"
-msgstr "Završava"
+msgid "Date"
+msgstr "Datum"
 
 #: ../data/ui/edit-dialog.ui.h:6
+msgid "Reminders"
+msgstr ""
+
+#: ../data/ui/edit-dialog.ui.h:7
 msgid "Notes"
 msgstr "Bilješke"
 
-#: ../data/ui/edit-dialog.ui.h:7 ../data/ui/source-dialog.ui.h:17
+#: ../data/ui/edit-dialog.ui.h:8 ../data/ui/source-dialog.ui.h:17
 msgid "Location"
 msgstr "Lokacija"
 
-#: ../data/ui/edit-dialog.ui.h:8 ../src/gcal-search-view.c:353
-msgid "All day"
+#: ../data/ui/edit-dialog.ui.h:9
+msgid "Time"
+msgstr "Vrijeme"
+
+#: ../data/ui/edit-dialog.ui.h:10
+msgid "All Day"
 msgstr "Cijeli dan"
 
-#: ../data/ui/edit-dialog.ui.h:9
-msgid "Delete event"
+#: ../data/ui/edit-dialog.ui.h:11
+msgid "Add reminder…"
+msgstr "Dodaj podsjetnik..."
+
+#: ../data/ui/edit-dialog.ui.h:12
+msgid "Delete Event"
 msgstr "Obriši događaj"
 
+#: ../data/ui/edit-dialog.ui.h:13
+msgid "5 minutes"
+msgstr "5 minuta"
+
+#: ../data/ui/edit-dialog.ui.h:14
+msgid "10 minutes"
+msgstr "10 minuta"
+
+#: ../data/ui/edit-dialog.ui.h:15
+msgid "30 minutes"
+msgstr "30 minuta"
+
+#: ../data/ui/edit-dialog.ui.h:16
+msgid "1 hour"
+msgstr "1 sat"
+
+#: ../data/ui/edit-dialog.ui.h:17
+msgid "1 day"
+msgstr "1 dan"
+
+#: ../data/ui/edit-dialog.ui.h:18
+msgid "2 days"
+msgstr "2 dana"
+
+#: ../data/ui/edit-dialog.ui.h:19
+msgid "3 days"
+msgstr "3 dana"
+
+#: ../data/ui/edit-dialog.ui.h:20
+msgid "1 week"
+msgstr "1 tjedan"
+
 #: ../data/ui/help-overlay.ui.h:1
 msgctxt "shortcut window"
 msgid "General"
@@ -199,7 +244,7 @@ msgstr "Prikaži danas"
 #: ../data/ui/help-overlay.ui.h:11
 msgctxt "shortcut window"
 msgid "Next view"
-msgstr "Slijedeći prikaz"
+msgstr "Sljedeći prikaz"
 
 #: ../data/ui/help-overlay.ui.h:12
 msgctxt "shortcut window"
@@ -213,10 +258,15 @@ msgstr "Prikaz"
 
 #: ../data/ui/help-overlay.ui.h:14
 msgctxt "shortcut window"
+msgid "Week view"
+msgstr "Tjedni prikaz"
+
+#: ../data/ui/help-overlay.ui.h:15
+msgctxt "shortcut window"
 msgid "Month view"
 msgstr "Mjesečni prikaz"
 
-#: ../data/ui/help-overlay.ui.h:15
+#: ../data/ui/help-overlay.ui.h:16
 msgctxt "shortcut window"
 msgid "Year view"
 msgstr "Godišnji prikaz"
@@ -230,30 +280,34 @@ msgid "_Search…"
 msgstr "_Pretraži..."
 
 #: ../data/ui/menus.ui.h:3
+msgid "_Calendars…"
+msgstr "_Kalendari..."
+
+#: ../data/ui/menus.ui.h:4
 msgid "_Keyboard Shortcuts"
 msgstr "_Prečaci tipkovnice"
 
-#: ../data/ui/menus.ui.h:3
+#: ../data/ui/menus.ui.h:5
 msgid "_About"
 msgstr "_O programu"
 
-#: ../data/ui/menus.ui.h:4
+#: ../data/ui/menus.ui.h:6
 msgid "_Quit"
 msgstr "_Zatvori"
 
-#: ../data/ui/menus.ui.h:5
+#: ../data/ui/menus.ui.h:7
 msgid "_Synchronize"
 msgstr "_Uskladi"
 
-#: ../data/ui/menus.ui.h:6
+#: ../data/ui/menus.ui.h:8
 msgid "From Web…"
-msgstr "S Interneta..."
+msgstr "Sa interneta..."
 
-#: ../data/ui/menus.ui.h:7
+#: ../data/ui/menus.ui.h:9
 msgid "New Local Calendar…"
 msgstr "Novi lokalni kalendar..."
 
-#: ../data/ui/menus.ui.h:8
+#: ../data/ui/menus.ui.h:10
 msgid "From File…"
 msgstr "Iz datoteke..."
 
@@ -273,8 +327,8 @@ msgstr "Nema pronađenih rezultata"
 msgid "Try a different search"
 msgstr "Pokušaj drugačiju pretragu"
 
-#: ../data/ui/source-dialog.ui.h:1 ../src/gcal-window.c:1102
-#: ../src/gcal-window.c:1106
+#: ../data/ui/source-dialog.ui.h:1 ../src/gcal-window.c:1060
+#: ../src/gcal-window.c:1064
 msgid "Undo"
 msgstr "Vrati"
 
@@ -356,8 +410,8 @@ msgstr ""
 msgid "Calendar Address"
 msgstr "Adresa kalendara"
 
-#: ../data/ui/source-dialog.ui.h:22 ../src/gcal-source-dialog.c:2237
-#: ../src/gcal-source-dialog.c:2243
+#: ../data/ui/source-dialog.ui.h:22 ../src/gcal-source-dialog.c:2245
+#: ../src/gcal-source-dialog.c:2251
 msgid "Add Calendar"
 msgstr "Dodaj kalendar"
 
@@ -373,7 +427,8 @@ msgstr "Lozinka"
 msgid "Connect"
 msgstr "Poveži se"
 
-#: ../data/ui/time-selector.ui.h:1
+#: ../data/ui/time-selector.ui.h:1 ../src/views/gcal-week-grid.c:788
+#: ../src/views/gcal-week-view.c:275
 msgid "00:00"
 msgstr "00:00"
 
@@ -381,33 +436,37 @@ msgstr "00:00"
 msgid ":"
 msgstr ":"
 
-#: ../data/ui/time-selector.ui.h:3 ../src/gcal-week-view.c:417
+#: ../data/ui/time-selector.ui.h:3 ../src/views/gcal-week-view.c:428
 msgid "AM"
 msgstr "AM"
 
-#: ../data/ui/time-selector.ui.h:4 ../src/gcal-week-view.c:417
+#: ../data/ui/time-selector.ui.h:4 ../src/views/gcal-week-view.c:428
 msgid "PM"
 msgstr "PM"
 
-#: ../data/ui/window.ui.h:1 ../src/gcal-date-selector.c:364
+#: ../data/ui/window.ui.h:1
+msgid "Week"
+msgstr "Tjedan"
+
+#: ../data/ui/window.ui.h:2
 msgid "Month"
 msgstr "Mjesec"
 
-#: ../data/ui/window.ui.h:2 ../src/gcal-date-selector.c:366
+#: ../data/ui/window.ui.h:3
 msgid "Year"
 msgstr "Godina"
 
-#: ../data/ui/window.ui.h:4 ../data/ui/year-view.ui.h:1
-#: ../src/gcal-year-view.c:257 ../src/gcal-year-view.c:475
+#: ../data/ui/window.ui.h:5 ../data/ui/year-view.ui.h:1
+#: ../src/views/gcal-year-view.c:267 ../src/views/gcal-year-view.c:492
 msgid "Today"
 msgstr "Danas"
 
-#: ../data/ui/window.ui.h:5
+#: ../data/ui/window.ui.h:6
 msgid "Manage your calendars"
 msgstr "Upravljajte svojim kalendarima"
 
-#: ../data/ui/window.ui.h:7 ../src/gcal-source-dialog.c:840
-#: ../src/gcal-source-dialog.c:2266
+#: ../data/ui/window.ui.h:8 ../src/gcal-source-dialog.c:849
+#: ../src/gcal-source-dialog.c:2274
 msgid "Calendar Settings"
 msgstr "Postavke kalendara"
 
@@ -415,60 +474,16 @@ msgstr "Postavke kalendara"
 msgid "No events"
 msgstr "Nema događaja"
 
-#: ../data/ui/year-view.ui.h:3 ../src/gcal-month-view.c:866
+#: ../data/ui/year-view.ui.h:3 ../src/views/gcal-month-view.c:2264
 msgid "Add Event…"
 msgstr "Dodaj događaj..."
 
-#: ../src/gcal-application.c:102
-msgid "Display version number"
-msgstr "Prikaži broj inačice"
-
-#: ../src/gcal-application.c:107
-msgid "Open calendar on the passed date"
-msgstr "Otvori prošli datum u kalendaru"
-
-#: ../src/gcal-application.c:112
-msgid "Open calendar showing the passed event"
-msgstr "Otvori prikaz prošlih događja u kalendaru"
-
-#: ../src/gcal-application.c:324
-msgid "- Calendar management"
-msgstr "- Upravljanje kalendarom"
-
-#: ../src/gcal-application.c:471
-#, c-format
-msgid "Copyright © %d The Calendar authors"
-msgstr "Autorsko pravo © %d Autori Kalendara"
-
-#: ../src/gcal-application.c:477
-#, c-format
-msgid "Copyright © %d–%d The Calendar authors"
-msgstr "Autorsko pravo © %d–%d Autori Kalendara"
-
-#: ../src/gcal-application.c:490
-msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  gogo https://launchpad.net/~trebelnik-stefina"
-
-#: ../src/gcal-date-selector.c:362
-msgid "Day"
-msgstr "Dan"
-
-#: ../src/gcal-edit-dialog.c:430
-msgid "Save"
-msgstr "Spremi"
-
-#: ../src/gcal-edit-dialog.c:640 ../src/gcal-quick-add-popover.c:422
-msgid "Unnamed event"
-msgstr "Bezimeni događaj"
-
-#: ../src/gcal-month-view.c:1094
+#: ../src/views/gcal-month-view.c:1205
 msgid "Other events"
 msgstr "Ostali događaji"
 
 #. TODO: Warning: in some languages this string can be too long and may overlap with the number
-#: ../src/gcal-month-view.c:1524
+#: ../src/views/gcal-month-view.c:1671 ../src/views/gcal-week-header.c:345
 #, c-format
 msgid "Other event"
 msgid_plural "Other %d events"
@@ -476,88 +491,194 @@ msgstr[0] "Ostali %d događaj"
 msgstr[1] "Ostalih %d događaja"
 msgstr[2] "Ostalih %d događaja"
 
-#: ../src/gcal-quick-add-popover.c:113
+#: ../src/views/gcal-week-grid.c:785 ../src/views/gcal-week-view.c:272
+msgid "00 AM"
+msgstr "00 AM"
+
+#: ../src/views/gcal-week-header.c:877
+#, c-format
+msgid "week %d"
+msgstr "tjedan %d"
+
+#: ../src/gcal-application.c:87
+msgid "Display version number"
+msgstr "Prikaži broj inačice"
+
+#: ../src/gcal-application.c:92
+msgid "Open calendar on the passed date"
+msgstr "Otvori prošli datum u kalendaru"
+
+#: ../src/gcal-application.c:97
+msgid "Open calendar showing the passed event"
+msgstr "Otvori prikaz prošlih događja u kalendaru"
+
+#: ../src/gcal-application.c:278
+msgid "— Calendar management"
+msgstr "— Upravljanje kalendarom"
+
+#: ../src/gcal-application.c:457
+#, c-format
+msgid "Copyright © %d The Calendar authors"
+msgstr "Autorsko pravo © %d Autori Kalendara"
+
+#: ../src/gcal-application.c:463
+#, c-format
+msgid "Copyright © %d–%d The Calendar authors"
+msgstr "Autorsko pravo © %d–%d Autori Kalendara"
+
+#: ../src/gcal-application.c:476
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  gogo https://launchpad.net/~trebelnik-stefina"
+
+#: ../src/gcal-edit-dialog.c:583
+msgid "Save"
+msgstr "Spremi"
+
+#: ../src/gcal-edit-dialog.c:852
+#, c-format
+msgid "%d minute before"
+msgid_plural "%d minutes before"
+msgstr[0] "Prije %d minute"
+msgstr[1] "Prije %d minute"
+msgstr[2] "Prije %d minuta"
+
+#: ../src/gcal-edit-dialog.c:860
+#, c-format
+msgid "%d hour before"
+msgid_plural "%d hours before"
+msgstr[0] "Prije %d sata"
+msgstr[1] "Prije %d sata"
+msgstr[2] "Prije %d sati"
+
+#: ../src/gcal-edit-dialog.c:868
+#, c-format
+msgid "%d day before"
+msgid_plural "%d days before"
+msgstr[0] "Prije %d dana"
+msgstr[1] "Prije %d dana"
+msgstr[2] "Prije %d dana"
+
+#: ../src/gcal-edit-dialog.c:876
+#, c-format
+msgid "%d week before"
+msgid_plural "%d weeks before"
+msgstr[0] "Prije %d tjedna"
+msgstr[1] "Prije %d tjedna"
+msgstr[2] "Prije %d tjedana"
+
+#: ../src/gcal-edit-dialog.c:1097 ../src/gcal-quick-add-popover.c:501
+msgid "Unnamed event"
+msgstr "Neimenovani događaj"
+
+#: ../src/gcal-quick-add-popover.c:119
 #, c-format
 msgid "%s (this calendar is read-only)"
 msgstr "%s (ovaj kalendar je samo za čitanje)"
 
-#: ../src/gcal-quick-add-popover.c:223 ../src/gcal-quick-add-popover.c:241
+#. Translators:
+#. * this is the format string for representing a date consisting of a month name
+#. * and a date of month.
+#.
+#: ../src/gcal-quick-add-popover.c:234 ../src/gcal-quick-add-popover.c:264
 msgctxt "event date format"
 msgid "%B %d"
-msgstr "%B %d"
+msgstr "%d %B"
 
-#: ../src/gcal-quick-add-popover.c:243
+#: ../src/gcal-quick-add-popover.c:266
 #, c-format
 msgid "New Event from %s to %s"
 msgstr "Novi događaj od %s do %s"
 
-#: ../src/gcal-quick-add-popover.c:249
+#: ../src/gcal-quick-add-popover.c:283
+#, c-format
+msgid "New Event on %s, %s – %s"
+msgstr "Novi događaj %s, %s – %s"
+
+#: ../src/gcal-quick-add-popover.c:293
 #, c-format
 msgid "New Event on %s"
 msgstr "Novi događaj %s"
 
-#: ../src/gcal-search-view.c:502
+#: ../src/gcal-search-view.c:358
+msgid "All day"
+msgstr "Cijeli dan"
+
+#: ../src/gcal-search-view.c:563
 msgid "Use the entry above to search for events."
 msgstr "Koristi gornji unos za pretragu događaja."
 
 #. Dialog
-#: ../src/gcal-source-dialog.c:1135
+#: ../src/gcal-source-dialog.c:1145
 msgid "Select a calendar file"
 msgstr "Odaberi datoteku događaja"
 
-#: ../src/gcal-source-dialog.c:1139
+#: ../src/gcal-source-dialog.c:1149
 msgid "Open"
 msgstr "Otvori"
 
-#: ../src/gcal-source-dialog.c:1146
+#: ../src/gcal-source-dialog.c:1156
 msgid "Calendar files"
 msgstr "Datoteke događaja"
 
 #. update the source properties
-#: ../src/gcal-source-dialog.c:1185
+#: ../src/gcal-source-dialog.c:1198
 msgid "Unnamed Calendar"
 msgstr "Bezimeni kalendar"
 
 #. Update notification label
-#: ../src/gcal-source-dialog.c:1785
+#: ../src/gcal-source-dialog.c:1802
 #, c-format
 msgid "Calendar <b>%s</b> removed"
 msgstr "Kalendar <b>%s</b> uklonjen"
 
-#: ../src/gcal-source-dialog.c:2007 ../src/gcal-source-dialog.c:2061
+#: ../src/gcal-source-dialog.c:2005 ../src/gcal-source-dialog.c:2061
 msgid "Off"
 msgstr "Isključen"
 
-#: ../src/gcal-source-dialog.c:2007 ../src/gcal-source-dialog.c:2061
+#: ../src/gcal-source-dialog.c:2005 ../src/gcal-source-dialog.c:2061
 msgid "On"
-msgstr "Uključeno"
+msgstr "Uključen"
 
-#: ../src/gcal-time-selector.c:82
+#: ../src/gcal-time-selector.c:84
 #, c-format
 msgid "%s AM"
 msgstr "%s AM"
 
-#: ../src/gcal-time-selector.c:84
+#: ../src/gcal-time-selector.c:86
 #, c-format
 msgid "%s PM"
 msgstr "%s PM"
 
-#: ../src/gcal-week-view.c:420 ../src/gcal-week-view.c:493
-msgid "Midnight"
-msgstr "Ponoć"
-
-#: ../src/gcal-week-view.c:422 ../src/gcal-week-view.c:496
-msgid "Noon"
-msgstr "Podne"
-
-#: ../src/gcal-week-view.c:499
-msgid "00:00 PM"
-msgstr "00:00 PM"
-
-#: ../src/gcal-window.c:1102
+#: ../src/gcal-window.c:1060
 msgid "Another event deleted"
 msgstr "Drugi događaj obrisan"
 
-#: ../src/gcal-window.c:1106
+#: ../src/gcal-window.c:1064
 msgid "Event deleted"
 msgstr "Događaj obrisan"
+
+#~ msgid "List of the disabled sources"
+#~ msgstr "Popis onemogućenih izvora"
+
+#~ msgid "Sources disabled last time Calendar ran"
+#~ msgstr "Onemogućeni izvori od kada je zadnji puta Kalendar pokrenut"
+
+#~ msgid "Starts"
+#~ msgstr "Počinje"
+
+#~ msgid "Ends"
+#~ msgstr "Završava"
+
+#~ msgid "Day"
+#~ msgstr "Dan"
+
+#~ msgid "Midnight"
+#~ msgstr "Ponoć"
+
+#~ msgid "Noon"
+#~ msgstr "Podne"
+
+#~ msgid "00:00 PM"
+#~ msgstr "00:00 PM"