diff --git a/po/hr.po b/po/hr.po
index 54850874..591d0ec8 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: gnome-calendar\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-08-23 09:38+0000\n"
-"PO-Revision-Date: 2017-08-23 16:38+0200\n"
+"POT-Creation-Date: 2017-11-09 01:57+0000\n"
+"PO-Revision-Date: 2017-11-09 15:31+0100\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "Language: hr\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Launchpad-Export-Date: 2016-09-22 19:52+0000\n"
-"X-Generator: Poedit 2.0.3\n"
+"X-Generator: Poedit 2.0.4\n"
 
 #: data/appdata/org.gnome.Calendar.appdata.xml.in:7
 #: data/org.gnome.Calendar.desktop.in:3 data/ui/quick-add-popover.ui:187
-#: data/ui/window.ui:184 src/gcal-application.c:479
+#: data/ui/window.ui:184 src/gcal-application.c:466
 msgid "Calendar"
 msgstr "Kalendar"
 
@@ -117,124 +117,124 @@ msgstr "Uklj/Isklj zvuk alarma"
 msgid "Remove the alarm"
 msgstr "Ukloni alarm"
 
-#: data/ui/edit-dialog.ui:18 data/ui/source-dialog.ui:762
-#: data/ui/source-dialog.ui:869 src/gcal-source-dialog.c:1102
+#: data/ui/edit-dialog.ui:16 data/ui/source-dialog.ui:762
+#: data/ui/source-dialog.ui:869 src/gcal-source-dialog.c:1158
 msgid "Cancel"
 msgstr "Odustani"
 
-#: data/ui/edit-dialog.ui:38
+#: data/ui/edit-dialog.ui:36
 msgid "Click to select the calendar"
 msgstr "Klikni za odabir kalendara"
 
-#: data/ui/edit-dialog.ui:110 src/gcal-edit-dialog.c:688
+#: data/ui/edit-dialog.ui:108 src/gcal-edit-dialog.c:275
 msgid "Done"
 msgstr "Završeno"
 
-#: data/ui/edit-dialog.ui:140
+#: data/ui/edit-dialog.ui:146
 msgid "Title"
 msgstr "Naslov"
 
-#: data/ui/edit-dialog.ui:158
+#: data/ui/edit-dialog.ui:164
 msgid "Date"
 msgstr "Datum"
 
-#: data/ui/edit-dialog.ui:174
+#: data/ui/edit-dialog.ui:180
 msgid "Repeat"
 msgstr "Ponovi"
 
-#: data/ui/edit-dialog.ui:192
+#: data/ui/edit-dialog.ui:198
 msgid "Reminders"
 msgstr "Podsjetnici"
 
-#: data/ui/edit-dialog.ui:210
+#: data/ui/edit-dialog.ui:216
 msgid "Notes"
 msgstr "Bilješke"
 
-#: data/ui/edit-dialog.ui:226 data/ui/source-dialog.ui:563
+#: data/ui/edit-dialog.ui:232 data/ui/source-dialog.ui:563
 msgid "Location"
 msgstr "Lokacija"
 
-#: data/ui/edit-dialog.ui:293
+#: data/ui/edit-dialog.ui:301
 msgid "Time"
 msgstr "Vrijeme"
 
-#: data/ui/edit-dialog.ui:348
+#: data/ui/edit-dialog.ui:354
 msgid "All Day"
 msgstr "Cijeli dan"
 
-#: data/ui/edit-dialog.ui:393
+#: data/ui/edit-dialog.ui:399
 msgid "Add reminder…"
 msgstr "Dodaj podsjetnik…"
 
-#: data/ui/edit-dialog.ui:424
+#: data/ui/edit-dialog.ui:430
 msgid "No Repeat"
 msgstr "Bez ponavljanja"
 
-#: data/ui/edit-dialog.ui:425
+#: data/ui/edit-dialog.ui:431
 msgid "Daily"
 msgstr "Dnevno"
 
-#: data/ui/edit-dialog.ui:426
+#: data/ui/edit-dialog.ui:432
 msgid "Monday – Friday"
 msgstr "Ponedjeljak – Petak"
 
-#: data/ui/edit-dialog.ui:427
+#: data/ui/edit-dialog.ui:433
 msgid "Weekly"
 msgstr "Tjedno"
 
-#: data/ui/edit-dialog.ui:428
+#: data/ui/edit-dialog.ui:434
 msgid "Monthly"
 msgstr "Mjesečno"
 
-#: data/ui/edit-dialog.ui:429
+#: data/ui/edit-dialog.ui:435
 msgid "Yearly"
 msgstr "Godišnje"
 
-#: data/ui/edit-dialog.ui:457
+#: data/ui/edit-dialog.ui:463
 msgid "Forever"
 msgstr "Zauvijek"
 
-#: data/ui/edit-dialog.ui:458
+#: data/ui/edit-dialog.ui:464
 msgid "No. of occurrences"
 msgstr "Broj pojavljivanja"
 
-#: data/ui/edit-dialog.ui:459
+#: data/ui/edit-dialog.ui:465
 msgid "Until Date"
 msgstr "Do datuma"
 
-#: data/ui/edit-dialog.ui:553
+#: data/ui/edit-dialog.ui:560
 msgid "Delete Event"
 msgstr "Obriši događaj"
 
-#: data/ui/edit-dialog.ui:590
+#: data/ui/edit-dialog.ui:599
 msgid "5 minutes"
 msgstr "5 minuta"
 
-#: data/ui/edit-dialog.ui:599
+#: data/ui/edit-dialog.ui:608
 msgid "10 minutes"
 msgstr "10 minuta"
 
-#: data/ui/edit-dialog.ui:608
+#: data/ui/edit-dialog.ui:617
 msgid "30 minutes"
 msgstr "30 minuta"
 
-#: data/ui/edit-dialog.ui:617
+#: data/ui/edit-dialog.ui:626
 msgid "1 hour"
 msgstr "1 sat"
 
-#: data/ui/edit-dialog.ui:625
+#: data/ui/edit-dialog.ui:634
 msgid "1 day"
 msgstr "1 dan"
 
-#: data/ui/edit-dialog.ui:634
+#: data/ui/edit-dialog.ui:643
 msgid "2 days"
 msgstr "2 dana"
 
-#: data/ui/edit-dialog.ui:643
+#: data/ui/edit-dialog.ui:652
 msgid "3 days"
 msgstr "3 dana"
 
-#: data/ui/edit-dialog.ui:652
+#: data/ui/edit-dialog.ui:661
 msgid "1 week"
 msgstr "1 tjedan"
 
@@ -354,6 +354,10 @@ msgstr "Novi lokalni kalendar…"
 msgid "From File…"
 msgstr "Iz datoteke…"
 
+#: data/ui/month-view.ui:199 data/ui/year-view.ui:117
+msgid "Add Event…"
+msgstr "Dodaj događaj…"
+
 #: data/ui/quick-add-popover.ui:117
 msgid "Edit Details…"
 msgstr "Uredi pojedinosti…"
@@ -371,7 +375,7 @@ msgstr "Nema pronađenih rezultata"
 msgid "Try a different search"
 msgstr "Pokušaj drugačiju pretragu"
 
-#: data/ui/source-dialog.ui:53 src/gcal-window.c:1129 src/gcal-window.c:1133
+#: data/ui/source-dialog.ui:53 src/gcal-window.c:1123 src/gcal-window.c:1127
 msgid "Undo"
 msgstr "Vrati"
 
@@ -393,8 +397,8 @@ msgid "Click to set up"
 msgstr "Klikni za postavljanje"
 
 #: data/ui/source-dialog.ui:249
-msgid "ownCloud"
-msgstr "ownCloud"
+msgid "Nextcloud"
+msgstr "Nextcloud"
 
 #: data/ui/source-dialog.ui:300
 msgid "Microsoft Exchange"
@@ -454,11 +458,16 @@ msgstr ""
 msgid "Calendar Address"
 msgstr "Adresa kalendara"
 
-#: data/ui/source-dialog.ui:729 src/gcal-source-dialog.c:2193
-#: src/gcal-source-dialog.c:2199
+#: data/ui/source-dialog.ui:729 src/gcal-source-dialog.c:2281
+#: src/gcal-source-dialog.c:2287
 msgid "Add Calendar"
 msgstr "Dodaj kalendar"
 
+#: data/ui/source-dialog.ui:745 data/ui/window.ui:334
+#: src/gcal-source-dialog.c:861 src/gcal-source-dialog.c:2310
+msgid "Calendar Settings"
+msgstr "Postavke kalendara"
+
 #: data/ui/source-dialog.ui:806
 msgid "User"
 msgstr "Korisnik"
@@ -467,12 +476,16 @@ msgstr "Korisnik"
 msgid "Password"
 msgstr "Lozinka"
 
+#: data/ui/source-dialog.ui:866
+msgid "Enter your credentials"
+msgstr "Upišite svoje vjerodajnice"
+
 #: data/ui/source-dialog.ui:878
 msgid "Connect"
 msgstr "Poveži se"
 
-#: data/ui/time-selector.ui:9 src/views/gcal-week-grid.c:763
-#: src/views/gcal-week-view.c:287
+#: data/ui/time-selector.ui:9 src/views/gcal-week-grid.c:770
+#: src/views/gcal-week-view.c:291
 msgid "00:00"
 msgstr "00:00"
 
@@ -480,11 +493,11 @@ msgstr "00:00"
 msgid ":"
 msgstr ":"
 
-#: data/ui/time-selector.ui:78 src/views/gcal-week-view.c:442
+#: data/ui/time-selector.ui:78 src/views/gcal-week-view.c:446
 msgid "AM"
 msgstr "AM"
 
-#: data/ui/time-selector.ui:79 src/views/gcal-week-view.c:442
+#: data/ui/time-selector.ui:79 src/views/gcal-week-view.c:446
 msgid "PM"
 msgstr "PM"
 
@@ -500,8 +513,8 @@ msgstr "Mjesec"
 msgid "Year"
 msgstr "Godina"
 
-#: data/ui/window.ui:187 data/ui/year-view.ui:84 src/views/gcal-year-view.c:275
-#: src/views/gcal-year-view.c:509
+#: data/ui/window.ui:187 data/ui/year-view.ui:84 src/views/gcal-year-view.c:276
+#: src/views/gcal-year-view.c:510
 msgid "Today"
 msgstr "Danas"
 
@@ -514,60 +527,47 @@ msgctxt "tooltip"
 msgid "Search for events"
 msgstr "Pretraži događaje"
 
-#: data/ui/window.ui:334 src/gcal-source-dialog.c:844
-#: src/gcal-source-dialog.c:2222
-msgid "Calendar Settings"
-msgstr "Postavke kalendara"
-
 #: data/ui/year-view.ui:95
 msgid "No events"
 msgstr "Nema događaja"
 
-#: data/ui/year-view.ui:117 src/views/gcal-month-view.c:2322
-msgid "Add Event…"
-msgstr "Dodaj događaj…"
-
-#: src/gcal-application.c:89
+#: src/gcal-application.c:85
 msgid "Display version number"
 msgstr "Prikaži broj inačice"
 
-#: src/gcal-application.c:94
+#: src/gcal-application.c:90
 msgid "Enable debug messages"
 msgstr "Omogući otklanjanje grešaka poruka"
 
-#: src/gcal-application.c:99
+#: src/gcal-application.c:95
 msgid "Open calendar on the passed date"
 msgstr "Otvori prošli datum u kalendaru"
 
-#: src/gcal-application.c:104
+#: src/gcal-application.c:100
 msgid "Open calendar showing the passed event"
 msgstr "Otvori prikaz prošlih događja u kalendaru"
 
-#: src/gcal-application.c:285
-msgid "— Calendar management"
-msgstr "— Upravljanje kalendarom"
-
-#: src/gcal-application.c:467
+#: src/gcal-application.c:454
 #, c-format
 msgid "Copyright © %d The Calendar authors"
 msgstr "Autorsko pravo © %d Autori Kalendara"
 
-#: src/gcal-application.c:473
+#: src/gcal-application.c:460
 #, c-format
 msgid "Copyright © %d–%d The Calendar authors"
 msgstr "Autorsko pravo © %d–%d Autori Kalendara"
 
-#: src/gcal-application.c:486
+#: src/gcal-application.c:473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  gogo https://launchpad.net/~trebelnik-stefina"
 
-#: src/gcal-edit-dialog.c:688
+#: src/gcal-edit-dialog.c:275
 msgid "Save"
 msgstr "Spremi"
 
-#: src/gcal-edit-dialog.c:1001
+#: src/gcal-edit-dialog.c:1000
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
@@ -575,7 +575,7 @@ msgstr[0] "Prije %d minute"
 msgstr[1] "Prije %d minute"
 msgstr[2] "Prije %d minuta"
 
-#: src/gcal-edit-dialog.c:1009
+#: src/gcal-edit-dialog.c:1008
 #, c-format
 msgid "%d hour before"
 msgid_plural "%d hours before"
@@ -583,7 +583,7 @@ msgstr[0] "Prije %d sata"
 msgstr[1] "Prije %d sata"
 msgstr[2] "Prije %d sati"
 
-#: src/gcal-edit-dialog.c:1017
+#: src/gcal-edit-dialog.c:1016
 #, c-format
 msgid "%d day before"
 msgid_plural "%d days before"
@@ -591,7 +591,7 @@ msgstr[0] "Prije %d dana"
 msgstr[1] "Prije %d dana"
 msgstr[2] "Prije %d dana"
 
-#: src/gcal-edit-dialog.c:1025
+#: src/gcal-edit-dialog.c:1024
 #, c-format
 msgid "%d week before"
 msgid_plural "%d weeks before"
@@ -604,7 +604,7 @@ msgid "Unnamed event"
 msgstr "Neimenovani događaj"
 
 #. Translators: %s is the location of the event (e.g. "Downtown, 3rd Avenue")
-#: src/gcal-event-widget.c:364
+#: src/gcal-event-widget.c:390
 #, c-format
 msgid "At %s"
 msgstr "U %s"
@@ -882,38 +882,38 @@ msgid "Use the entry above to search for events."
 msgstr "Koristi gornji unos za pretragu događaja."
 
 #. Dialog
-#: src/gcal-source-dialog.c:1099
+#: src/gcal-source-dialog.c:1155
 msgid "Select a calendar file"
 msgstr "Odaberi datoteku događaja"
 
-#: src/gcal-source-dialog.c:1103
+#: src/gcal-source-dialog.c:1159
 msgid "Open"
 msgstr "Otvori"
 
-#: src/gcal-source-dialog.c:1110
+#: src/gcal-source-dialog.c:1166
 msgid "Calendar files"
 msgstr "Datoteke događaja"
 
 #. update the source properties
-#: src/gcal-source-dialog.c:1144
+#: src/gcal-source-dialog.c:1200
 msgid "Unnamed Calendar"
 msgstr "Bezimeni kalendar"
 
 #. Update notification label
-#: src/gcal-source-dialog.c:1750
+#: src/gcal-source-dialog.c:1806
 #, c-format
 msgid "Calendar <b>%s</b> removed"
 msgstr "Kalendar <b>%s</b> uklonjen"
 
-#: src/gcal-source-dialog.c:1953 src/gcal-source-dialog.c:2010
+#: src/gcal-source-dialog.c:1855 src/gcal-source-dialog.c:1911
 msgid "Off"
 msgstr "Isključen"
 
-#: src/gcal-source-dialog.c:1953 src/gcal-source-dialog.c:2010
+#: src/gcal-source-dialog.c:1855 src/gcal-source-dialog.c:1911
 msgid "On"
 msgstr "Uključen"
 
-#: src/gcal-source-dialog.c:2009
+#: src/gcal-source-dialog.c:1910
 msgid "Expired"
 msgstr "Istekao"
 
@@ -951,28 +951,28 @@ msgstr "_Naknadni događaji"
 msgid "_All events"
 msgstr "_Svi događaji"
 
-#: src/gcal-window.c:1129
+#: src/gcal-window.c:1123
 msgid "Another event deleted"
 msgstr "Drugi događaj obrisan"
 
-#: src/gcal-window.c:1133
+#: src/gcal-window.c:1127
 msgid "Event deleted"
 msgstr "Događaj obrisan"
 
+#. Popover title
 #. Translators: This is a date format in the sidebar of the year
 #. * view when there is only one specified day selected.
 #. Translators: This is a date format in the sidebar of the year view.
-#: src/views/gcal-month-view.c:225 src/views/gcal-year-view.c:290
-#: src/views/gcal-year-view.c:512
+#: src/views/gcal-month-view.c:379 src/views/gcal-year-view.c:291
+#: src/views/gcal-year-view.c:513
 msgid "%B %d"
 msgstr "%d %B"
 
-#: src/views/gcal-month-view.c:1186
-msgid "Other events"
-msgstr "Ostali događaji"
+#: src/views/gcal-week-grid.c:767 src/views/gcal-week-view.c:288
+msgid "00 AM"
+msgstr "00 AM"
 
-#. TODO: Warning: in some languages this string can be too long and may overlap with the number
-#: src/views/gcal-month-view.c:1785 src/views/gcal-week-header.c:338
+#: src/views/gcal-week-header.c:338
 #, c-format
 msgid "Other event"
 msgid_plural "Other %d events"
@@ -980,10 +980,6 @@ msgstr[0] "Ostali %d događaj"
 msgstr[1] "Ostalih %d događaja"
 msgstr[2] "Ostalih %d događaja"
 
-#: src/views/gcal-week-grid.c:760 src/views/gcal-week-view.c:284
-msgid "00 AM"
-msgstr "00 AM"
-
 #: src/views/gcal-week-header.c:871
 #, c-format
 msgid "week %d"
@@ -992,10 +988,19 @@ msgstr "tjedan %d"
 #. Translators: This is a date format in the sidebar of the year
 #. * view when the selection starts at the specified day and the
 #. * end is unspecified.
-#: src/views/gcal-year-view.c:284
+#: src/views/gcal-year-view.c:285
 msgid "%B %d…"
 msgstr "%d %B…"
 
+#~ msgid "ownCloud"
+#~ msgstr "ownCloud"
+
+#~ msgid "— Calendar management"
+#~ msgstr "— Upravljanje kalendarom"
+
+#~ msgid "Other events"
+#~ msgstr "Ostali događaji"
+
 #~ msgid "%1$s %2$d"
 #~ msgstr "%1$s %2$d"