diff --git a/po/pl.po b/po/pl.po
index d1c9e8fa..6e9a2466 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,16 +1,15 @@
 # Polish translation for gnome-calendar.
-# Copyright © 2012-2017 the gnome-calendar authors.
+# Copyright © 2012-2018 the gnome-calendar authors.
 # This file is distributed under the same license as the gnome-calendar package.
-# Piotr Drąg <piotrdrag@gmail.com>, 2012-2017.
-# Aviary.pl <community-poland@mozilla.org>, 2012-2017.
+# Piotr Drąg <piotrdrag@gmail.com>, 2012-2018.
+# Aviary.pl <community-poland@mozilla.org>, 2012-2018.
 #
 msgid ""
 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-09-28 11:44+0000\n"
-"PO-Revision-Date: 2017-09-28 14:45+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-calendar/issues\n"
+"POT-Creation-Date: 2018-02-01 17:48+0000\n"
+"PO-Revision-Date: 2018-02-04 22:20+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -22,7 +21,7 @@ msgstr ""
 
 #: 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:466
+#: data/ui/window.ui:187 src/gcal-application.c:640
 msgid "Calendar"
 msgstr "Kalendarz"
 
@@ -109,6 +108,18 @@ msgstr ""
 "Typ aktywnego widoku okna, domyślna wartość: „monthly view” (widok "
 "miesięczny)"
 
+#: data/org.gnome.calendar.gschema.xml:26
+msgid "Weather Service Configuration"
+msgstr "Konfiguracja usługi pogody"
+
+#: data/org.gnome.calendar.gschema.xml:27
+msgid ""
+"Whether weather reports are shown, automatic locations are used and a "
+"location-name"
+msgstr ""
+"Czy wyświetlać prognozę pogody, używać automatycznych położeń oraz nazwa "
+"położenia."
+
 #: data/ui/alarm-row.ui:34
 msgid "Toggles the sound of the alarm"
 msgstr "Przełącza dźwięk budzika"
@@ -118,7 +129,7 @@ msgid "Remove the alarm"
 msgstr "Usuwa budzik"
 
 #: data/ui/edit-dialog.ui:16 data/ui/source-dialog.ui:762
-#: data/ui/source-dialog.ui:869 src/gcal-source-dialog.c:1111
+#: data/ui/source-dialog.ui:869 src/gcal-source-dialog.c:1162
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -126,7 +137,7 @@ msgstr "Anuluj"
 msgid "Click to select the calendar"
 msgstr "Kliknięcie zaznacza kalendarz"
 
-#: 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 "Gotowe"
 
@@ -154,87 +165,87 @@ msgstr "Uwagi"
 msgid "Location"
 msgstr "Położenie"
 
-#: data/ui/edit-dialog.ui:299
+#: data/ui/edit-dialog.ui:301
 msgid "Time"
 msgstr "Czas"
 
-#: data/ui/edit-dialog.ui:352
+#: data/ui/edit-dialog.ui:354
 msgid "All Day"
 msgstr "Cały dzień"
 
-#: data/ui/edit-dialog.ui:397
+#: data/ui/edit-dialog.ui:399
 msgid "Add reminder…"
 msgstr "Dodaj przypomnienie…"
 
-#: data/ui/edit-dialog.ui:428
+#: data/ui/edit-dialog.ui:430
 msgid "No Repeat"
 msgstr "Bez powtarzania"
 
-#: data/ui/edit-dialog.ui:429
+#: data/ui/edit-dialog.ui:431
 msgid "Daily"
 msgstr "Codziennie"
 
-#: data/ui/edit-dialog.ui:430
+#: data/ui/edit-dialog.ui:432
 msgid "Monday – Friday"
 msgstr "Od poniedziałku do piątku"
 
-#: data/ui/edit-dialog.ui:431
+#: data/ui/edit-dialog.ui:433
 msgid "Weekly"
 msgstr "Co tydzień"
 
-#: data/ui/edit-dialog.ui:432
+#: data/ui/edit-dialog.ui:434
 msgid "Monthly"
 msgstr "Co miesiąc"
 
-#: data/ui/edit-dialog.ui:433
+#: data/ui/edit-dialog.ui:435
 msgid "Yearly"
 msgstr "Co rok"
 
-#: data/ui/edit-dialog.ui:461
+#: data/ui/edit-dialog.ui:463
 msgid "Forever"
 msgstr "Zawsze"
 
-#: data/ui/edit-dialog.ui:462
+#: data/ui/edit-dialog.ui:464
 msgid "No. of occurrences"
 msgstr "Liczba wystąpień"
 
-#: data/ui/edit-dialog.ui:463
+#: data/ui/edit-dialog.ui:465
 msgid "Until Date"
 msgstr "Do dnia"
 
-#: data/ui/edit-dialog.ui:557
+#: data/ui/edit-dialog.ui:560
 msgid "Delete Event"
 msgstr "Usuń wydarzenie"
 
-#: data/ui/edit-dialog.ui:596
+#: data/ui/edit-dialog.ui:599
 msgid "5 minutes"
 msgstr "5 minut"
 
-#: data/ui/edit-dialog.ui:605
+#: data/ui/edit-dialog.ui:608
 msgid "10 minutes"
 msgstr "10 minut"
 
-#: data/ui/edit-dialog.ui:614
+#: data/ui/edit-dialog.ui:617
 msgid "30 minutes"
 msgstr "30 minut"
 
-#: data/ui/edit-dialog.ui:623
+#: data/ui/edit-dialog.ui:626
 msgid "1 hour"
 msgstr "1 godzina"
 
-#: data/ui/edit-dialog.ui:631
+#: data/ui/edit-dialog.ui:634
 msgid "1 day"
 msgstr "1 dzień"
 
-#: data/ui/edit-dialog.ui:640
+#: data/ui/edit-dialog.ui:643
 msgid "2 days"
 msgstr "2 dni"
 
-#: data/ui/edit-dialog.ui:649
+#: data/ui/edit-dialog.ui:652
 msgid "3 days"
 msgstr "3 dni"
 
-#: data/ui/edit-dialog.ui:658
+#: data/ui/edit-dialog.ui:661
 msgid "1 week"
 msgstr "1 tydzień"
 
@@ -318,7 +329,7 @@ msgctxt "shortcut window"
 msgid "Year view"
 msgstr "Widok roku"
 
-#: data/ui/menus.ui:6 data/ui/menus.ui:36
+#: data/ui/menus.ui:6
 msgid "Add Eve_nt…"
 msgstr "_Dodaj wydarzenie…"
 
@@ -338,22 +349,22 @@ msgstr "_O programie"
 msgid "_Quit"
 msgstr "Za_kończ"
 
-#: data/ui/menus.ui:40
-msgid "_Synchronize"
-msgstr "_Zsynchronizuj"
-
-#: data/ui/menus.ui:49
+#: data/ui/menus.ui:36
 msgid "From Web…"
 msgstr "Z sieci…"
 
-#: data/ui/menus.ui:53
+#: data/ui/menus.ui:40
 msgid "New Local Calendar…"
 msgstr "Nowy lokalny kalendarz…"
 
-#: data/ui/menus.ui:57
+#: data/ui/menus.ui:44
 msgid "From File…"
 msgstr "Z pliku…"
 
+#: data/ui/month-popover.ui:91
+msgid "New Event…"
+msgstr "Nowe wydarzenie…"
+
 #: data/ui/quick-add-popover.ui:117
 msgid "Edit Details…"
 msgstr "Modyfikuj informacje…"
@@ -363,15 +374,15 @@ msgstr "Modyfikuj informacje…"
 msgid "Add"
 msgstr "Dodaj"
 
-#: data/ui/search-view.ui:76
+#: data/ui/search-popover.ui:76
 msgid "No results found"
 msgstr "Brak wyników"
 
-#: data/ui/search-view.ui:92
+#: data/ui/search-popover.ui:92
 msgid "Try a different search"
 msgstr "Proszę spróbować innych słów"
 
-#: data/ui/source-dialog.ui:53 src/gcal-window.c:1123 src/gcal-window.c:1127
+#: data/ui/source-dialog.ui:53 src/gcal-window.c:1039 src/gcal-window.c:1043
 msgid "Undo"
 msgstr "Cofnij"
 
@@ -454,13 +465,13 @@ msgstr ""
 msgid "Calendar Address"
 msgstr "Adres kalendarza"
 
-#: data/ui/source-dialog.ui:729 src/gcal-source-dialog.c:2234
-#: src/gcal-source-dialog.c:2240
+#: data/ui/source-dialog.ui:729 src/gcal-source-dialog.c:2285
+#: src/gcal-source-dialog.c:2291
 msgid "Add Calendar"
 msgstr "Dodaj kalendarz"
 
-#: data/ui/source-dialog.ui:745 data/ui/window.ui:334
-#: src/gcal-source-dialog.c:853 src/gcal-source-dialog.c:2263
+#: data/ui/source-dialog.ui:745 data/ui/window.ui:344
+#: src/gcal-source-dialog.c:862 src/gcal-source-dialog.c:2314
 msgid "Calendar Settings"
 msgstr "Ustawienia kalendarza"
 
@@ -480,8 +491,8 @@ msgstr "Proszę podać dane uwierzytelniające"
 msgid "Connect"
 msgstr "Połącz"
 
-#: data/ui/time-selector.ui:9 src/views/gcal-week-grid.c:764
-#: src/views/gcal-week-view.c:291
+#: data/ui/time-selector.ui:9 src/views/gcal-week-grid.c:754
+#: src/views/gcal-week-view.c:278
 msgid "00:00"
 msgstr "00∶00"
 
@@ -489,85 +500,104 @@ msgstr "00∶00"
 msgid ":"
 msgstr "∶"
 
-#: data/ui/time-selector.ui:78 src/views/gcal-week-view.c:446
+#: data/ui/time-selector.ui:78 src/views/gcal-week-view.c:432
 msgid "AM"
 msgstr "AM"
 
-#: data/ui/time-selector.ui:79 src/views/gcal-week-view.c:446
+#: data/ui/time-selector.ui:79 src/views/gcal-week-view.c:432
 msgid "PM"
 msgstr "PM"
 
-#: data/ui/window.ui:64
+#: data/ui/weather-settings.ui:12 data/ui/window.ui:407
+msgid "_Weather"
+msgstr "_Pogoda"
+
+#: data/ui/weather-settings.ui:30
+msgid "Show Weather"
+msgstr "Wyświetlanie"
+
+#: data/ui/weather-settings.ui:53
+msgid "Automatic Location"
+msgstr "Automatyczne położenie"
+
+#: data/ui/window.ui:67
 msgid "Week"
 msgstr "Tydzień"
 
-#: data/ui/window.ui:79
+#: data/ui/window.ui:82
 msgid "Month"
 msgstr "Miesiąc"
 
-#: data/ui/window.ui:93
+#: data/ui/window.ui:96
 msgid "Year"
 msgstr "Rok"
 
-#: 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
+#: 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 "Dzisiaj"
 
-#: data/ui/window.ui:261
+#: data/ui/window.ui:271
 msgid "Manage your calendars"
 msgstr "Zarządzanie kalendarzami"
 
-#: data/ui/window.ui:278
+#: data/ui/window.ui:288
 msgctxt "tooltip"
 msgid "Search for events"
 msgstr "Wyszukuje wydarzenia"
 
-#: data/ui/year-view.ui:95
+#: data/ui/window.ui:391
+msgid "Add Eve_nt"
+msgstr "_Dodaj wydarzenie"
+
+#: data/ui/window.ui:400
+msgid "_Synchronize"
+msgstr "_Zsynchronizuj"
+
+#: data/ui/year-view.ui:133
 msgid "No events"
 msgstr "Brak wydarzeń"
 
-#: data/ui/year-view.ui:117 src/views/gcal-month-view.c:2729
+#: data/ui/year-view.ui:155
 msgid "Add Event…"
 msgstr "Dodaj wydarzenie…"
 
-#: src/gcal-application.c:85
+#: src/gcal-application.c:88
+msgid "Quit GNOME Calendar"
+msgstr "Kończy działanie programu"
+
+#: src/gcal-application.c:93
 msgid "Display version number"
 msgstr "Wyświetla numer wersji"
 
-#: src/gcal-application.c:90
+#: src/gcal-application.c:98
 msgid "Enable debug messages"
 msgstr "Włącza komunikaty debugowania"
 
-#: src/gcal-application.c:95
+#: src/gcal-application.c:103
 msgid "Open calendar on the passed date"
 msgstr "Otwiera kalendarz na podanej dacie"
 
-#: src/gcal-application.c:100
+#: src/gcal-application.c:108
 msgid "Open calendar showing the passed event"
 msgstr "Otwiera kalendarz na podanym wydarzeniu"
 
-#: src/gcal-application.c:454
+#: src/gcal-application.c:595
 #, c-format
-msgid "Copyright © %d The Calendar authors"
-msgstr "Copyright © %d Autorzy Kalendarza"
+msgid "Copyright © 2012–%d The Calendar authors"
+msgstr "Copyright © 2012-%d Autorzy Kalendarza"
 
-#: src/gcal-application.c:460
-#, c-format
-msgid "Copyright © %d–%d The Calendar authors"
-msgstr "Copyright © %d-%d Autorzy Kalendarza"
-
-#: src/gcal-application.c:473
+#: src/gcal-application.c:646
 msgid "translator-credits"
 msgstr ""
-"Piotr Drąg <piotrdrag@gmail.com>, 2012-2017\n"
-"Aviary.pl <community-poland@mozilla.org>, 2012-2017"
+"Piotr Drąg <piotrdrag@gmail.com>, 2012-2018\n"
+"Aviary.pl <community-poland@mozilla.org>, 2012-2018"
 
-#: src/gcal-edit-dialog.c:275
+#: src/gcal-edit-dialog.c:277
 msgid "Save"
 msgstr "Zapisz"
 
-#: src/gcal-edit-dialog.c:1000
+#: src/gcal-edit-dialog.c:1037
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
@@ -575,7 +605,7 @@ msgstr[0] "%d minuta przed"
 msgstr[1] "%d minuty przed"
 msgstr[2] "%d minut przed"
 
-#: src/gcal-edit-dialog.c:1008
+#: src/gcal-edit-dialog.c:1045
 #, c-format
 msgid "%d hour before"
 msgid_plural "%d hours before"
@@ -583,7 +613,7 @@ msgstr[0] "%d godzina przed"
 msgstr[1] "%d godziny przed"
 msgstr[2] "%d godzin przed"
 
-#: src/gcal-edit-dialog.c:1016
+#: src/gcal-edit-dialog.c:1053
 #, c-format
 msgid "%d day before"
 msgid_plural "%d days before"
@@ -591,7 +621,7 @@ msgstr[0] "%d dzień przed"
 msgstr[1] "%d dni przed"
 msgstr[2] "%d dni przed"
 
-#: src/gcal-edit-dialog.c:1024
+#: src/gcal-edit-dialog.c:1061
 #, c-format
 msgid "%d week before"
 msgid_plural "%d weeks before"
@@ -599,12 +629,12 @@ msgstr[0] "%d tydzień przed"
 msgstr[1] "%d tygodnie przed"
 msgstr[2] "%d tygodni przed"
 
-#: src/gcal-edit-dialog.c:1327 src/gcal-quick-add-popover.c:680
+#: src/gcal-edit-dialog.c:1367 src/gcal-quick-add-popover.c:682
 msgid "Unnamed event"
 msgstr "Wydarzenie bez nazwy"
 
 #. Translators: %s is the location of the event (e.g. "Downtown, 3rd Avenue")
-#: src/gcal-event-widget.c:364
+#: src/gcal-event-widget.c:419
 #, c-format
 msgid "At %s"
 msgstr "Gdzie: %s"
@@ -873,104 +903,95 @@ msgstr "Nowe wydarzenie %d grudnia"
 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 "Cały dzień"
 
-#: src/gcal-search-view.c:563
+#: src/gcal-search-popover.c:563
 msgid "Use the entry above to search for events."
 msgstr "Można wyszukiwać wydarzenia za pomocą pola powyżej."
 
 #. Dialog
-#: src/gcal-source-dialog.c:1108
+#: src/gcal-source-dialog.c:1159
 msgid "Select a calendar file"
 msgstr "Wybór pliku kalendarza"
 
-#: src/gcal-source-dialog.c:1112
+#: src/gcal-source-dialog.c:1163
 msgid "Open"
 msgstr "Otwórz"
 
-#: src/gcal-source-dialog.c:1119
+#: src/gcal-source-dialog.c:1170
 msgid "Calendar files"
 msgstr "Pliki kalendarza"
 
 #. update the source properties
-#: src/gcal-source-dialog.c:1153
+#: src/gcal-source-dialog.c:1204
 msgid "Unnamed Calendar"
 msgstr "Kalendarz bez nazwy"
 
 #. Update notification label
-#: src/gcal-source-dialog.c:1759
+#: src/gcal-source-dialog.c:1810
 #, c-format
 msgid "Calendar <b>%s</b> removed"
 msgstr "Usunięto kalendarz <b>%s</b>"
 
-#: src/gcal-source-dialog.c:1808 src/gcal-source-dialog.c:1864
+#: src/gcal-source-dialog.c:1859 src/gcal-source-dialog.c:1915
 msgid "Off"
 msgstr "Wyłączony"
 
-#: src/gcal-source-dialog.c:1808 src/gcal-source-dialog.c:1864
+#: src/gcal-source-dialog.c:1859 src/gcal-source-dialog.c:1915
 msgid "On"
 msgstr "Włączony"
 
-#: src/gcal-source-dialog.c:1863
+#: src/gcal-source-dialog.c:1914
 msgid "Expired"
 msgstr "Wygasło"
 
-#: src/gcal-time-selector.c:84
+#: src/gcal-time-selector.c:83
 #, c-format
 msgid "%s AM"
 msgstr "%s AM"
 
-#: src/gcal-time-selector.c:86
+#: src/gcal-time-selector.c:85
 #, c-format
 msgid "%s PM"
 msgstr "%s PM"
 
-#: src/gcal-utils.c:1188
+#: src/gcal-utils.c:1093
 msgid ""
 "The event you are trying to modify is recurring. The changes you have "
 "selected should be applied to:"
 msgstr "Modyfikowane wydarzenie jest okresowe. Co zmienić?"
 
-#: src/gcal-utils.c:1191
+#: src/gcal-utils.c:1096
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: src/gcal-utils.c:1193
+#: src/gcal-utils.c:1098
 msgid "_Only This Event"
 msgstr "_Tylko to wydarzenie"
 
-#: src/gcal-utils.c:1200
+#: src/gcal-utils.c:1105
 msgid "_Subsequent events"
 msgstr "_Kolejne wydarzenia"
 
-#: src/gcal-utils.c:1202
+#: src/gcal-utils.c:1107
 msgid "_All events"
 msgstr "_Wszystkie wydarzenia"
 
-#: src/gcal-window.c:1123
+#: src/gcal-window.c:1039
 msgid "Another event deleted"
 msgstr "Usunięto kolejne wydarzenie"
 
-#: src/gcal-window.c:1127
+#: src/gcal-window.c:1043
 msgid "Event deleted"
 msgstr "Usunięto wydarzenie"
 
-#. 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:296 src/views/gcal-year-view.c:291
-#: src/views/gcal-year-view.c:513
-msgid "%B %d"
-msgstr "%-d %B"
+#: src/views/gcal-week-grid.c:751 src/views/gcal-week-view.c:275
+msgid "00 AM"
+msgstr "00 AM"
 
-#: src/views/gcal-month-view.c:1627
-msgid "Other events"
-msgstr "Inne wydarzenia"
-
-#. TODO: Warning: in some languages this string can be too long and may overlap with the number
-#: src/views/gcal-month-view.c:2224 src/views/gcal-week-header.c:338
+#: src/views/gcal-week-header.c:398
 #, c-format
 msgid "Other event"
 msgid_plural "Other %d events"
@@ -978,11 +999,7 @@ msgstr[0] "Inne wydarzenie"
 msgstr[1] "%d wydarzenia więcej"
 msgstr[2] "%d wydarzeń więcej"
 
-#: src/views/gcal-week-grid.c:761 src/views/gcal-week-view.c:288
-msgid "00 AM"
-msgstr "00 AM"
-
-#: src/views/gcal-week-header.c:871
+#: src/views/gcal-week-header.c:934
 #, c-format
 msgid "week %d"
 msgstr "%d. tydzień"
@@ -990,6 +1007,13 @@ msgstr "%d. tydzień"
 #. 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:285
+#: 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:294 src/views/gcal-year-view.c:517
+msgid "%B %d"
+msgstr "%-d %B"