diff --git a/po/et.po b/po/et.po
index c310547a..c5947d6c 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-calendar master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-calendar/issues\n"
-"POT-Creation-Date: 2018-01-22 12:26+0000\n"
-"PO-Revision-Date: 2018-02-23 20:48+0200\n"
+"POT-Creation-Date: 2018-05-02 02:05+0000\n"
+"PO-Revision-Date: 2018-06-04 17:35+0300\n"
+"Last-Translator: Liivia Lilleväli <liivia.l10n@gmail.com>\n"
 "Language-Team: Estonian <gnome-et-list@gnome.org>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Last-Translator: Liivia Lilleväli <liivia.l10n@gmail.com>\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.7\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:187 src/gcal-application.c:540
+#: data/ui/window.ui:187 src/gcal-application.c:640 src/main.c:36
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -32,7 +32,7 @@ msgstr "Kalender GNOME’ile"
 msgid ""
 "GNOME Calendar is a simple and beautiful calendar application designed to "
 "perfectly fit the GNOME desktop. By reusing the components which the GNOME "
-"desktop is build on, Calendar nicely integrates with the GNOME ecosystem."
+"desktop is built on, Calendar nicely integrates with the GNOME ecosystem."
 msgstr ""
 "GNOME Kalender on lihtne ja kena kalendrirakendus, mis sobitub ideaalselt "
 "GNOME töölauaga. Kuna Kalender kasutab samu komponente, millele on üles "
@@ -76,43 +76,43 @@ msgstr "org.gnome.Calendar"
 msgid "Calendar;Event;Reminder;"
 msgstr "Calendar;Event;Reminder;Kalender;Sündmused;Meeldetuletused;Päevakava;"
 
-#: data/org.gnome.calendar.gschema.xml:6
+#: data/org.gnome.calendar.gschema.xml.in:6
 msgid "Window maximized"
 msgstr "Akna maksimeeritus"
 
-#: data/org.gnome.calendar.gschema.xml:7
+#: data/org.gnome.calendar.gschema.xml.in:7
 msgid "Window maximized state"
 msgstr "Akna maksimeerituse olek"
 
-#: data/org.gnome.calendar.gschema.xml:11
+#: data/org.gnome.calendar.gschema.xml.in:11
 msgid "Window size"
 msgstr "Akna suurus"
 
-#: data/org.gnome.calendar.gschema.xml:12
+#: data/org.gnome.calendar.gschema.xml.in:12
 msgid "Window size (width and height)."
 msgstr "Akna suurus (laius ja kõrgus)."
 
-#: data/org.gnome.calendar.gschema.xml:16
+#: data/org.gnome.calendar.gschema.xml.in:16
 msgid "Window position"
 msgstr "Akna asukoht"
 
-#: data/org.gnome.calendar.gschema.xml:17
+#: data/org.gnome.calendar.gschema.xml.in:17
 msgid "Window position (x and y)."
 msgstr "Akna asukoht (x ja y)."
 
-#: data/org.gnome.calendar.gschema.xml:21
+#: data/org.gnome.calendar.gschema.xml.in:21
 msgid "Type of the active view"
 msgstr "Aktiivse vaate tüüp"
 
-#: data/org.gnome.calendar.gschema.xml:22
+#: data/org.gnome.calendar.gschema.xml.in:22
 msgid "Type of the active window view, default value is: monthly view"
 msgstr "Aktiivse akna vaate tüüp, vaikeväärtuseks on kuuvaade"
 
-#: data/org.gnome.calendar.gschema.xml:26
+#: data/org.gnome.calendar.gschema.xml.in:26
 msgid "Weather Service Configuration"
 msgstr "Ilmateenistuse seadistamine"
 
-#: data/org.gnome.calendar.gschema.xml:27
+#: data/org.gnome.calendar.gschema.xml.in:27
 msgid ""
 "Whether weather reports are shown, automatic locations are used and a "
 "location-name"
@@ -136,7 +136,7 @@ msgstr "Loobu"
 msgid "Click to select the calendar"
 msgstr "Kalendri valimiseks klõpsa siia"
 
-#: data/ui/edit-dialog.ui:108 src/gcal-edit-dialog.c:275
+#: data/ui/edit-dialog.ui:108 src/gcal-edit-dialog.c:277
 msgid "Done"
 msgstr "Valmis"
 
@@ -373,15 +373,15 @@ msgstr "Muuda üksikasju…"
 msgid "Add"
 msgstr "Lisa"
 
-#: data/ui/search-view.ui:76
+#: data/ui/search-popover.ui:76
 msgid "No results found"
 msgstr "Tulemusi ei leitud"
 
-#: data/ui/search-view.ui:92
+#: data/ui/search-popover.ui:92
 msgid "Try a different search"
 msgstr "Proovi mõnda muud otsingusõna"
 
-#: data/ui/source-dialog.ui:53 src/gcal-window.c:1272 src/gcal-window.c:1276
+#: data/ui/source-dialog.ui:53 src/gcal-window.c:1039 src/gcal-window.c:1043
 msgid "Undo"
 msgstr "Võta tagasi"
 
@@ -490,8 +490,8 @@ msgstr "Sisselogimisandmete sisestamine"
 msgid "Connect"
 msgstr "Ühenda"
 
-#: data/ui/time-selector.ui:9 src/views/gcal-week-grid.c:758
-#: src/views/gcal-week-view.c:287
+#: data/ui/time-selector.ui:9 src/views/gcal-week-grid.c:753
+#: src/views/gcal-week-view.c:278
 msgid "00:00"
 msgstr "00:00"
 
@@ -499,14 +499,26 @@ 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:432
 msgid "AM"
 msgstr "e. l."
 
-#: 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:432
 msgid "PM"
 msgstr "p. l."
 
+#: data/ui/weather-settings.ui:12 data/ui/window.ui:407
+msgid "_Weather"
+msgstr "_Ilm"
+
+#: data/ui/weather-settings.ui:30
+msgid "Show Weather"
+msgstr "Ilmaandmete kuvamine"
+
+#: data/ui/weather-settings.ui:53
+msgid "Automatic Location"
+msgstr "Automaatne asukoht"
+
 #: data/ui/window.ui:67
 msgid "Week"
 msgstr "Nädal"
@@ -519,8 +531,8 @@ msgstr "Kuu"
 msgid "Year"
 msgstr "Aasta"
 
-#: data/ui/window.ui:190 data/ui/year-view.ui:88 src/views/gcal-year-view.c:285
-#: src/views/gcal-year-view.c:520
+#: data/ui/window.ui:190 data/ui/year-view.ui:88 src/views/gcal-year-view.c:279
+#: src/views/gcal-year-view.c:514
 msgid "Today"
 msgstr "Täna"
 
@@ -541,18 +553,6 @@ msgstr "Lisa sü_ndmus"
 msgid "_Synchronize"
 msgstr "_Sünkroniseerimine"
 
-#: data/ui/window.ui:407 data/ui/window.ui:428
-msgid "_Weather"
-msgstr "_Ilm"
-
-#: data/ui/window.ui:446
-msgid "Show Weather"
-msgstr "Ilmaandmete kuvamine"
-
-#: data/ui/window.ui:469
-msgid "Automatic Location"
-msgstr "Automaatne asukoht"
-
 #: data/ui/year-view.ui:133
 msgid "No events"
 msgstr "Sündmuseid pole"
@@ -561,73 +561,73 @@ msgstr "Sündmuseid pole"
 msgid "Add Event…"
 msgstr "Lisa sündmus…"
 
-#: src/gcal-application.c:90
+#: src/gcal-application.c:88
 msgid "Quit GNOME Calendar"
 msgstr "Sulge GNOME Kalender"
 
-#: src/gcal-application.c:95
+#: src/gcal-application.c:93
 msgid "Display version number"
 msgstr "Versiooninumbri kuvamine"
 
-#: src/gcal-application.c:100
+#: src/gcal-application.c:98
 msgid "Enable debug messages"
 msgstr "Silumisteadete lubamine"
 
-#: src/gcal-application.c:105
+#: src/gcal-application.c:103
 msgid "Open calendar on the passed date"
 msgstr "Kalendri avamine sisestatud kuupäeva kuvamisega"
 
-#: src/gcal-application.c:110
+#: src/gcal-application.c:108
 msgid "Open calendar showing the passed event"
 msgstr "Kalendri avamine sisestatud sündmuse kuvamisega"
 
-#: src/gcal-application.c:497
+#: src/gcal-application.c:595
 #, c-format
 msgid "Copyright © 2012–%d The Calendar authors"
 msgstr "Autoriõigused © 2012–%d Calendari autorid"
 
-#: src/gcal-application.c:546
+#: src/gcal-application.c:646
 msgid "translator-credits"
 msgstr "Liivia Lilleväli <liivia.l10n@gmail.com>, 2018"
 
-#: src/gcal-edit-dialog.c:275
+#: src/gcal-edit-dialog.c:277
 msgid "Save"
 msgstr "Salvesta"
 
-#: src/gcal-edit-dialog.c:1019
+#: src/gcal-edit-dialog.c:1037
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
 msgstr[0] "%d minut enne"
 msgstr[1] "%d minutit enne"
 
-#: src/gcal-edit-dialog.c:1027
+#: src/gcal-edit-dialog.c:1045
 #, c-format
 msgid "%d hour before"
 msgid_plural "%d hours before"
 msgstr[0] "%d tund enne"
 msgstr[1] "%d tundi enne"
 
-#: src/gcal-edit-dialog.c:1035
+#: src/gcal-edit-dialog.c:1053
 #, c-format
 msgid "%d day before"
 msgid_plural "%d days before"
 msgstr[0] "%d päev enne"
 msgstr[1] "%d päeva enne"
 
-#: src/gcal-edit-dialog.c:1043
+#: src/gcal-edit-dialog.c:1061
 #, c-format
 msgid "%d week before"
 msgid_plural "%d weeks before"
 msgstr[0] "%d nädal enne"
 msgstr[1] "%d nädalat enne"
 
-#: src/gcal-edit-dialog.c:1347 src/gcal-quick-add-popover.c:680
+#: src/gcal-edit-dialog.c:1367 src/gcal-quick-add-popover.c:682
 msgid "Unnamed event"
 msgstr "Nimetu sündmus"
 
 #. Translators: %s is the location of the event (e.g. "Downtown, 3rd Avenue")
-#: src/gcal-event-widget.c:420
+#: src/gcal-event-widget.c:422
 #, c-format
 msgid "At %s"
 msgstr "Asukohas %s"
@@ -742,14 +742,17 @@ msgid "December"
 msgstr "detsember"
 
 #: src/gcal-quick-add-popover.c:286
+#, c-format
 msgid "from Today"
 msgstr "tänasest"
 
 #: src/gcal-quick-add-popover.c:290
+#, c-format
 msgid "from Tomorrow"
 msgstr "homsest"
 
 #: src/gcal-quick-add-popover.c:294
+#, c-format
 msgid "from Yesterday"
 msgstr "eilsest"
 
@@ -763,14 +766,17 @@ msgid "from %1$s %2$s"
 msgstr "alates %2$s. %1$s"
 
 #: src/gcal-quick-add-popover.c:323
+#, c-format
 msgid "to Today"
 msgstr "tänaseni"
 
 #: src/gcal-quick-add-popover.c:327
+#, c-format
 msgid "to Tomorrow"
 msgstr "homseni"
 
 #: src/gcal-quick-add-popover.c:331
+#, c-format
 msgid "to Yesterday"
 msgstr "eilseni"
 
@@ -790,14 +796,17 @@ msgid "New Event %1$s %2$s"
 msgstr "Uus sündmus %1$s %2$s"
 
 #: src/gcal-quick-add-popover.c:373
+#, c-format
 msgid "New Event Today"
 msgstr "Uus sündmus täna"
 
 #: src/gcal-quick-add-popover.c:377
+#, c-format
 msgid "New Event Tomorrow"
 msgstr "Uus sündmus homme"
 
 #: src/gcal-quick-add-popover.c:381
+#, c-format
 msgid "New Event Yesterday"
 msgstr "Uus sündmus eile"
 
@@ -896,11 +905,11 @@ msgstr "Uus sündmus %d. detsembril"
 msgid "%1$s, %2$s – %3$s"
 msgstr "%1$s, %2$s – %3$s"
 
-#: src/gcal-search-view.c:358
+#: src/gcal-search-popover.c:303
 msgid "All day"
 msgstr "Kogu päev"
 
-#: src/gcal-search-view.c:563
+#: src/gcal-search-popover.c:563
 msgid "Use the entry above to search for events."
 msgstr "Sündmuste otsimiseks kasuta ülal asuvat tekstivälja."
 
@@ -940,58 +949,58 @@ msgstr "Lubatud"
 msgid "Expired"
 msgstr "Aegunud"
 
-#: src/gcal-time-selector.c:84
+#: src/gcal-time-selector.c:83
 #, c-format
 msgid "%s AM"
 msgstr "%s e. l."
 
-#: src/gcal-time-selector.c:86
+#: src/gcal-time-selector.c:85
 #, c-format
 msgid "%s PM"
 msgstr "%s p. l."
 
-#: src/gcal-utils.c:1090
+#: src/gcal-utils.c:1120
 msgid ""
 "The event you are trying to modify is recurring. The changes you have "
 "selected should be applied to:"
 msgstr "Püüad muuta korduvat sündmust. Valitud muudatused tuleb rakendada:"
 
-#: src/gcal-utils.c:1093
+#: src/gcal-utils.c:1123
 msgid "_Cancel"
 msgstr "_Loobu"
 
-#: src/gcal-utils.c:1095
+#: src/gcal-utils.c:1125
 msgid "_Only This Event"
 msgstr "Ainult _praegusele sündmusele"
 
-#: src/gcal-utils.c:1102
+#: src/gcal-utils.c:1132
 msgid "_Subsequent events"
 msgstr "_Järgnevatele sündmustele"
 
-#: src/gcal-utils.c:1104
+#: src/gcal-utils.c:1134
 msgid "_All events"
 msgstr "_Kõikidele sündmustele"
 
-#: src/gcal-window.c:1272
+#: src/gcal-window.c:1039
 msgid "Another event deleted"
 msgstr "Veel üks sündmus kustutati"
 
-#: src/gcal-window.c:1276
+#: src/gcal-window.c:1043
 msgid "Event deleted"
 msgstr "Sündmus kustutati"
 
-#: src/views/gcal-week-grid.c:755 src/views/gcal-week-view.c:284
+#: src/views/gcal-week-grid.c:750 src/views/gcal-week-view.c:275
 msgid "00 AM"
 msgstr "00 e. l."
 
-#: src/views/gcal-week-header.c:400
+#: src/views/gcal-week-header.c:398
 #, c-format
 msgid "Other event"
 msgid_plural "Other %d events"
 msgstr[0] "Veel üks sündmus"
 msgstr[1] "Veel %d sündmust"
 
-#: src/views/gcal-week-header.c:933
+#: src/views/gcal-week-header.c:934
 #, c-format
 msgid "week %d"
 msgstr "%d. nädal"
@@ -999,13 +1008,13 @@ msgstr "%d. nädal"
 #. 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:294
+#: src/views/gcal-year-view.c:288
 msgid "%B %d…"
 msgstr "%d. %B…"
 
 #. 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-year-view.c:300 src/views/gcal-year-view.c:523
+#: src/views/gcal-year-view.c:294 src/views/gcal-year-view.c:517
 msgid "%B %d"
 msgstr "%d. %B"