diff --git a/po/en_GB.po b/po/en_GB.po
index 63ff6f45..b2e5f2f7 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,27 +2,26 @@
 # Copyright (C) 2015 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-calendar package.
 # Abigail Brady <morwen@evilmagic.org>, Bastien Nocera <hadess@hadess.net>, 2015.
-# Bruce Cowan <bruce@bcowan.eu>, 2017.
+# Bruce Cowan <bruce@bcowan.me.uk>, 2017, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-calendar 3.21.91\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 00:43+0000\n"
-"PO-Revision-Date: 2017-09-08 11:15+0100\n"
-"Last-Translator: Bruce Cowan <bruce@bcowan.eu>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-calendar/issues\n"
+"POT-Creation-Date: 2018-08-17 14:01+0000\n"
+"PO-Revision-Date: 2018-08-19 16:43+0100\n"
+"Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
 "Language-Team: British English <en@li.org>\n"
 "Language: en_GB\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"
-"X-Generator: Gtranslator 2.91.7\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:184 src/gcal-application.c:479
+#: data/ui/window.ui:187 src/gcal-application.c:646 src/main.c:36
 msgid "Calendar"
 msgstr "Calendar"
 
@@ -31,32 +30,35 @@ msgid "Calendar for GNOME"
 msgstr "Calendar for GNOME"
 
 #: data/appdata/org.gnome.Calendar.appdata.xml.in:11
+#| 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."
 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 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."
 
 #: data/appdata/org.gnome.Calendar.appdata.xml.in:16
 #| 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!"
+#| "user-centred usability. No excess, no lacks. You’ll feel comfortable "
+#| "using Calendar, like you’ve been using it for ages!"
 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 "
+"centred usability. No excess, nothing missing. You’ll feel comfortable using "
 "Calendar, like you’ve been using it for ages!"
 msgstr ""
 "We aim to find the perfect balance between nicely crafted features and user-"
-"centred usability. No excess, no lacks. You’ll feel comfortable using "
+"centred usability. No excess, nothing missing. You’ll feel comfortable using "
 "Calendar, like you’ve been using it for ages!"
 
 #: data/appdata/org.gnome.Calendar.appdata.xml.in:27
-#| msgctxt "shortcut window"
-#| msgid "Next view"
 msgid "Week view"
 msgstr "Week view"
 
@@ -69,13 +71,11 @@ msgid "Calendar management"
 msgstr "Calendar management"
 
 #: data/org.gnome.Calendar.desktop.in:4
-#| msgid "Access, and manage calendar"
 msgid "Access and manage your calendars"
 msgstr "Access and manage your calendars"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Calendar.desktop.in:7
-#| msgid "Unnamed Calendar"
 msgid "org.gnome.Calendar"
 msgstr "org.gnome.Calendar"
 
@@ -84,38 +84,58 @@ msgstr "org.gnome.Calendar"
 msgid "Calendar;Event;Reminder;"
 msgstr "Calendar;Event;Reminder;"
 
-#: data/org.gnome.calendar.gschema.xml:6
+#: data/org.gnome.calendar.gschema.xml.in:6
 msgid "Window maximized"
 msgstr "Window maximised"
 
-#: data/org.gnome.calendar.gschema.xml:7
+#: data/org.gnome.calendar.gschema.xml.in:7
 msgid "Window maximized state"
 msgstr "Window maximised state"
 
-#: data/org.gnome.calendar.gschema.xml:11
+#: data/org.gnome.calendar.gschema.xml.in:11
 msgid "Window size"
 msgstr "Window size"
 
-#: data/org.gnome.calendar.gschema.xml:12
+#: data/org.gnome.calendar.gschema.xml.in:12
 msgid "Window size (width and height)."
 msgstr "Window size (width and height)."
 
-#: data/org.gnome.calendar.gschema.xml:16
+#: data/org.gnome.calendar.gschema.xml.in:16
 msgid "Window position"
 msgstr "Window position"
 
-#: data/org.gnome.calendar.gschema.xml:17
+#: data/org.gnome.calendar.gschema.xml.in:17
 msgid "Window position (x and y)."
 msgstr "Window position (x and y)."
 
-#: data/org.gnome.calendar.gschema.xml:21
+#: data/org.gnome.calendar.gschema.xml.in:21
 msgid "Type of the active view"
 msgstr "Type of the active view"
 
-#: 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 "Type of the active window view, default value is: monthly view"
 
+#: data/org.gnome.calendar.gschema.xml.in:26
+msgid "Weather Service Configuration"
+msgstr "Weather Service Configuration"
+
+#: data/org.gnome.calendar.gschema.xml.in:27
+msgid ""
+"Whether weather reports are shown, automatic locations are used and a "
+"location-name"
+msgstr ""
+"Whether weather reports are shown, automatic locations are used and a "
+"location-name"
+
+#: data/org.gnome.calendar.gschema.xml.in:31
+msgid "Follow system night light"
+msgstr "Follow system night light"
+
+#: data/org.gnome.calendar.gschema.xml.in:32
+msgid "Use GNOME night light setting to activate night-mode."
+msgstr "Use GNOME night light setting to activate night-mode."
+
 #: data/ui/alarm-row.ui:34
 msgid "Toggles the sound of the alarm"
 msgstr "Toggles the sound of the alarm"
@@ -124,127 +144,124 @@ msgstr "Toggles the sound of the alarm"
 msgid "Remove the alarm"
 msgstr "Remove the 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:1162
 msgid "Cancel"
 msgstr "Cancel"
 
-#: data/ui/edit-dialog.ui:38
-#| msgid "Click to select the event's agenda"
+#: data/ui/edit-dialog.ui:36
 msgid "Click to select the calendar"
 msgstr "Click to select the calendar"
 
-#: data/ui/edit-dialog.ui:110 src/gcal-edit-dialog.c:688
+#: data/ui/edit-dialog.ui:108 src/gcal-edit-dialog.c:277
 msgid "Done"
 msgstr "Done"
 
-#: data/ui/edit-dialog.ui:140
+#: data/ui/edit-dialog.ui:146
 msgid "Title"
 msgstr "Title"
 
-#: data/ui/edit-dialog.ui:158
+#: data/ui/edit-dialog.ui:164
 msgid "Date"
 msgstr "Date"
 
-#: data/ui/edit-dialog.ui:174
+#: data/ui/edit-dialog.ui:180
 msgid "Repeat"
 msgstr "Repeat"
 
-#: data/ui/edit-dialog.ui:192
+#: data/ui/edit-dialog.ui:198
 msgid "Reminders"
 msgstr "Reminders"
 
-#: data/ui/edit-dialog.ui:210
+#: data/ui/edit-dialog.ui:216
 msgid "Notes"
 msgstr "Notes"
 
-#: 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 "Location"
 
-#: data/ui/edit-dialog.ui:293
+#: data/ui/edit-dialog.ui:301
 msgid "Time"
 msgstr "Time"
 
-#: data/ui/edit-dialog.ui:348
+#: data/ui/edit-dialog.ui:354
 msgid "All Day"
 msgstr "All Day"
 
-#: data/ui/edit-dialog.ui:393
+#: data/ui/edit-dialog.ui:399
 msgid "Add reminder…"
 msgstr "Add reminder…"
 
-#: data/ui/edit-dialog.ui:424
+#: data/ui/edit-dialog.ui:430
 msgid "No Repeat"
 msgstr "No Repeat"
 
-#: data/ui/edit-dialog.ui:425
+#: data/ui/edit-dialog.ui:431
 msgid "Daily"
 msgstr "Daily"
 
-#: data/ui/edit-dialog.ui:426
+#: data/ui/edit-dialog.ui:432
 msgid "Monday – Friday"
 msgstr "Monday – Friday"
 
-#: data/ui/edit-dialog.ui:427
+#: data/ui/edit-dialog.ui:433
 msgid "Weekly"
 msgstr "Weekly"
 
-#: data/ui/edit-dialog.ui:428
-#| msgid "Month"
+#: data/ui/edit-dialog.ui:434
 msgid "Monthly"
 msgstr "Monthly"
 
-#: data/ui/edit-dialog.ui:429
-#| msgid "Year"
+#: data/ui/edit-dialog.ui:435
 msgid "Yearly"
 msgstr "Yearly"
 
-#: data/ui/edit-dialog.ui:457
+#: data/ui/edit-dialog.ui:463
 msgid "Forever"
 msgstr "Forever"
 
-#: data/ui/edit-dialog.ui:458
+#: data/ui/edit-dialog.ui:464
 msgid "No. of occurrences"
 msgstr "No. of occurrences"
 
-#: data/ui/edit-dialog.ui:459
+#: data/ui/edit-dialog.ui:465
 msgid "Until Date"
 msgstr "Until Date"
 
-#: data/ui/edit-dialog.ui:553
+#: data/ui/edit-dialog.ui:560
 msgid "Delete Event"
 msgstr "Delete Event"
 
-#: data/ui/edit-dialog.ui:590
+#: data/ui/edit-dialog.ui:599
 msgid "5 minutes"
 msgstr "5 minutes"
 
-#: data/ui/edit-dialog.ui:599
+#: data/ui/edit-dialog.ui:608
 msgid "10 minutes"
 msgstr "10 minutes"
 
-#: data/ui/edit-dialog.ui:608
+#: data/ui/edit-dialog.ui:617
 msgid "30 minutes"
 msgstr "30 minutes"
 
-#: data/ui/edit-dialog.ui:617
+#: data/ui/edit-dialog.ui:626
 msgid "1 hour"
 msgstr "1 hour"
 
-#: data/ui/edit-dialog.ui:625
+#: data/ui/edit-dialog.ui:634
 msgid "1 day"
 msgstr "1 day"
 
-#: data/ui/edit-dialog.ui:634
+#: data/ui/edit-dialog.ui:643
 msgid "2 days"
 msgstr "2 days"
 
-#: data/ui/edit-dialog.ui:643
+#: data/ui/edit-dialog.ui:652
 msgid "3 days"
 msgstr "3 days"
 
-#: data/ui/edit-dialog.ui:652
+#: data/ui/edit-dialog.ui:661
 msgid "1 week"
 msgstr "1 week"
 
@@ -314,8 +331,6 @@ msgid "View"
 msgstr "View"
 
 #: data/ui/help-overlay.ui:99
-#| msgctxt "shortcut window"
-#| msgid "Next view"
 msgctxt "shortcut window"
 msgid "Week view"
 msgstr "Week view"
@@ -330,43 +345,38 @@ msgctxt "shortcut window"
 msgid "Year view"
 msgstr "Year view"
 
-#: data/ui/menus.ui:6 data/ui/menus.ui:36
-msgid "Add Eve_nt…"
-msgstr "Add Eve_nt…"
-
-#: data/ui/menus.ui:13
-#| msgid "Calendars"
+#: data/ui/menus.ui:6
 msgid "_Calendars"
 msgstr "_Calendars"
 
-#: data/ui/menus.ui:19
+#: data/ui/menus.ui:12
 msgid "_Keyboard Shortcuts"
 msgstr "_Keyboard Shortcuts"
 
-#: data/ui/menus.ui:23
+#: data/ui/menus.ui:16
 msgid "_About"
 msgstr "_About"
 
-#: data/ui/menus.ui:27
+#: data/ui/menus.ui:20
 msgid "_Quit"
 msgstr "_Quit"
 
-#: data/ui/menus.ui:40
-msgid "_Synchronize"
-msgstr "_Synchronise"
-
-#: data/ui/menus.ui:49
+#: data/ui/menus.ui:29
 msgid "From Web…"
 msgstr "From Web…"
 
-#: data/ui/menus.ui:53
+#: data/ui/menus.ui:33
 msgid "New Local Calendar…"
 msgstr "New Local Calendar…"
 
-#: data/ui/menus.ui:57
+#: data/ui/menus.ui:37
 msgid "From File…"
 msgstr "From File…"
 
+#: data/ui/month-popover.ui:91
+msgid "New Event…"
+msgstr "New Event…"
+
 #: data/ui/quick-add-popover.ui:117
 msgid "Edit Details…"
 msgstr "Edit Details…"
@@ -376,15 +386,15 @@ msgstr "Edit Details…"
 msgid "Add"
 msgstr "Add"
 
-#: data/ui/search-view.ui:76
+#: data/ui/search-popover.ui:76
 msgid "No results found"
 msgstr "No results found"
 
-#: data/ui/search-view.ui:92
+#: data/ui/search-popover.ui:92
 msgid "Try a different search"
 msgstr "Try a different search"
 
-#: 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:1028 src/gcal-window.c:1032
 msgid "Undo"
 msgstr "Undo"
 
@@ -467,11 +477,16 @@ msgstr ""
 msgid "Calendar Address"
 msgstr "Calendar Address"
 
-#: 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:2286
+#: src/gcal-source-dialog.c:2292
 msgid "Add Calendar"
 msgstr "Add Calendar"
 
+#: data/ui/source-dialog.ui:745 data/ui/window.ui:344
+#: src/gcal-source-dialog.c:862 src/gcal-source-dialog.c:2315
+msgid "Calendar Settings"
+msgstr "Calendar Settings"
+
 #: data/ui/source-dialog.ui:806
 msgid "User"
 msgstr "User"
@@ -480,12 +495,16 @@ msgstr "User"
 msgid "Password"
 msgstr "Password"
 
+#: data/ui/source-dialog.ui:866
+msgid "Enter your credentials"
+msgstr "Enter your credentials"
+
 #: data/ui/source-dialog.ui:878
 msgid "Connect"
 msgstr "Connect"
 
-#: 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:755
+#: src/views/gcal-week-view.c:278
 msgid "00:00"
 msgstr "00:00"
 
@@ -493,130 +512,135 @@ 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 "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:432
 msgid "PM"
 msgstr "PM"
 
-#: data/ui/window.ui:64
+#: data/ui/weather-settings.ui:12 data/ui/window.ui:395
+msgid "_Weather"
+msgstr "_Weather"
+
+#: data/ui/weather-settings.ui:30
+msgid "Show Weather"
+msgstr "Show Weather"
+
+#: data/ui/weather-settings.ui:53
+msgid "Automatic Location"
+msgstr "Automatic Location"
+
+#: data/ui/window.ui:67
 msgid "Week"
 msgstr "Week"
 
-#: data/ui/window.ui:79
+#: data/ui/window.ui:82
 msgid "Month"
 msgstr "Month"
 
-#: data/ui/window.ui:93
+#: data/ui/window.ui:96
 msgid "Year"
 msgstr "Year"
 
-#: 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:190 data/ui/year-view.ui:88 src/views/gcal-year-view.c:281
+#: src/views/gcal-year-view.c:516
 msgid "Today"
 msgstr "Today"
 
-#: data/ui/window.ui:261
+#: data/ui/window.ui:271
 msgid "Manage your calendars"
 msgstr "Manage your calendars"
 
-#: data/ui/window.ui:278
-#| msgid "Search for events"
+#: data/ui/window.ui:288
 msgctxt "tooltip"
 msgid "Search for events"
 msgstr "Search for events"
 
-#: data/ui/window.ui:334 src/gcal-source-dialog.c:844
-#: src/gcal-source-dialog.c:2222
-msgid "Calendar Settings"
-msgstr "Calendar Settings"
+#: data/ui/window.ui:386
+msgid "_Synchronize"
+msgstr "_Synchronise"
 
-#: data/ui/year-view.ui:95
+#: data/ui/year-view.ui:133
 msgid "No events"
 msgstr "No events"
 
-#: data/ui/year-view.ui:117 src/views/gcal-month-view.c:2322
+#: data/ui/year-view.ui:155
 msgid "Add Event…"
 msgstr "Add Event…"
 
-#: src/gcal-application.c:89
+#: src/gcal-application.c:87
+msgid "Quit GNOME Calendar"
+msgstr "Quit GNOME Calendar"
+
+#: src/gcal-application.c:92
 msgid "Display version number"
 msgstr "Display version number"
 
-#: src/gcal-application.c:94
+#: src/gcal-application.c:97
 msgid "Enable debug messages"
 msgstr "Enable debug messages"
 
-#: src/gcal-application.c:99
+#: src/gcal-application.c:102
 msgid "Open calendar on the passed date"
 msgstr "Open calendar on the passed date"
 
-#: src/gcal-application.c:104
+#: src/gcal-application.c:107
 msgid "Open calendar showing the passed event"
 msgstr "Open calendar showing the passed event"
 
-#: src/gcal-application.c:285
-#| msgid "- Calendar management"
-msgid "— Calendar management"
-msgstr "— Calendar management"
-
-#: src/gcal-application.c:467
+#: src/gcal-application.c:601
 #, c-format
-msgid "Copyright © %d The Calendar authors"
-msgstr "Copyright © %d The Calendar authors"
+msgid "Copyright © 2012–%d The Calendar authors"
+msgstr "Copyright © 2012–%d The Calendar authors"
 
-#: src/gcal-application.c:473
-#, c-format
-msgid "Copyright © %d–%d The Calendar authors"
-msgstr "Copyright © %d–%d The Calendar authors"
-
-#: src/gcal-application.c:486
+#: src/gcal-application.c:652
 msgid "translator-credits"
 msgstr ""
 "Bastien Nocera <hadess@hadess.net>\n"
 "David King <amigadave@amigadave.com>\n"
-"Bruce Cowan <bruce@bcowan.eu>"
+"Bruce Cowan <bruce@bcowan.me.uk>\n"
+"Waldo Luís Ribeiro <waldoribeiro@sapo.pt>"
 
-#: src/gcal-edit-dialog.c:688
+#: src/gcal-edit-dialog.c:277
 msgid "Save"
 msgstr "Save"
 
-#: src/gcal-edit-dialog.c:1001
+#: src/gcal-edit-dialog.c:1037
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
 msgstr[0] "%d minute before"
 msgstr[1] "%d minutes before"
 
-#: src/gcal-edit-dialog.c:1009
+#: src/gcal-edit-dialog.c:1045
 #, c-format
 msgid "%d hour before"
 msgid_plural "%d hours before"
 msgstr[0] "%d hour before"
 msgstr[1] "%d hours before"
 
-#: src/gcal-edit-dialog.c:1017
+#: src/gcal-edit-dialog.c:1053
 #, c-format
 msgid "%d day before"
 msgid_plural "%d days before"
 msgstr[0] "%d day before"
 msgstr[1] "%d days before"
 
-#: src/gcal-edit-dialog.c:1025
+#: src/gcal-edit-dialog.c:1061
 #, c-format
 msgid "%d week before"
 msgid_plural "%d weeks before"
 msgstr[0] "%d week before"
 msgstr[1] "%d weeks before"
 
-#: src/gcal-edit-dialog.c:1328 src/gcal-quick-add-popover.c:680
+#: src/gcal-edit-dialog.c:1367 src/gcal-quick-add-popover.c:682
 msgid "Unnamed event"
 msgstr "Unnamed event"
 
 #. Translators: %s is the location of the event (e.g. "Downtown, 3rd Avenue")
-#: src/gcal-event-widget.c:364
+#: src/gcal-event-widget.c:424
 #, c-format
 msgid "At %s"
 msgstr "At %s"
@@ -691,8 +715,6 @@ msgid "February"
 msgstr "February"
 
 #: src/gcal-quick-add-popover.c:268
-#| msgctxt "shortcut window"
-#| msgid "Search"
 msgid "March"
 msgstr "March"
 
@@ -701,7 +723,6 @@ msgid "April"
 msgstr "April"
 
 #: src/gcal-quick-add-popover.c:270
-#| msgid "Day"
 msgid "May"
 msgstr "May"
 
@@ -734,15 +755,17 @@ msgid "December"
 msgstr "December"
 
 #: src/gcal-quick-add-popover.c:286
-#| msgid "Today"
+#, c-format
 msgid "from Today"
 msgstr "from Today"
 
 #: src/gcal-quick-add-popover.c:290
+#, c-format
 msgid "from Tomorrow"
 msgstr "from Tomorrow"
 
 #: src/gcal-quick-add-popover.c:294
+#, c-format
 msgid "from Yesterday"
 msgstr "from Yesterday"
 
@@ -756,15 +779,17 @@ msgid "from %1$s %2$s"
 msgstr "from %2$s %1$s"
 
 #: src/gcal-quick-add-popover.c:323
-#| msgid "Today"
+#, c-format
 msgid "to Today"
 msgstr "to Today"
 
 #: src/gcal-quick-add-popover.c:327
+#, c-format
 msgid "to Tomorrow"
 msgstr "to Tomorrow"
 
 #: src/gcal-quick-add-popover.c:331
+#, c-format
 msgid "to Yesterday"
 msgstr "to Yesterday"
 
@@ -780,130 +805,110 @@ msgstr "to %2$s %1$s"
 #. Translators: %1$s is the start date (e.g. "from Today") and %2$s is the end date (e.g. "to Tomorrow")
 #: src/gcal-quick-add-popover.c:356
 #, c-format
-#| msgid "New Event on %s"
 msgid "New Event %1$s %2$s"
 msgstr "New Event %1$s %2$s"
 
 #: src/gcal-quick-add-popover.c:373
-#| msgid "New Event on %s"
+#, c-format
 msgid "New Event Today"
 msgstr "New Event Today"
 
 #: src/gcal-quick-add-popover.c:377
-#| msgid "New Event on %s"
+#, c-format
 msgid "New Event Tomorrow"
 msgstr "New Event Tomorrow"
 
 #: src/gcal-quick-add-popover.c:381
-#| msgid "New Event on %s"
+#, c-format
 msgid "New Event Yesterday"
 msgstr "New Event Yesterday"
 
 #: src/gcal-quick-add-popover.c:387
-#| msgid "New Event on %s"
 msgid "New Event next Monday"
 msgstr "New Event next Monday"
 
 #: src/gcal-quick-add-popover.c:388
-#| msgid "New Event on %s"
 msgid "New Event next Tuesday"
 msgstr "New Event next Tuesday"
 
 #: src/gcal-quick-add-popover.c:389
-#| msgid "New Event on %s"
 msgid "New Event next Wednesday"
 msgstr "New Event next Wednesday"
 
 #: src/gcal-quick-add-popover.c:390
-#| msgid "New Event on %s"
 msgid "New Event next Thursday"
 msgstr "New Event next Thursday"
 
 #: src/gcal-quick-add-popover.c:391
-#| msgid "New Event on %s"
 msgid "New Event next Friday"
 msgstr "New Event next Friday"
 
 #: src/gcal-quick-add-popover.c:392
-#| msgid "New Event on %s"
 msgid "New Event next Saturday"
 msgstr "New Event next Saturday"
 
 #: src/gcal-quick-add-popover.c:393
-#| msgid "New Event on %s"
 msgid "New Event next Sunday"
 msgstr "New Event next Sunday"
 
 #. Translators: %d is the numeric day of month
 #: src/gcal-quick-add-popover.c:405
 #, c-format
-#| msgid "New Event on %s"
 msgid "New Event on January %d"
 msgstr "New Event on %d January"
 
 #: src/gcal-quick-add-popover.c:406
 #, c-format
-#| msgid "New Event on %s"
 msgid "New Event on February %d"
 msgstr "New Event on %d February"
 
 #: src/gcal-quick-add-popover.c:407
 #, c-format
-#| msgid "New Event on %s"
 msgid "New Event on March %d"
 msgstr "New Event on %d March"
 
 #: src/gcal-quick-add-popover.c:408
 #, c-format
-#| msgid "New Event on %s"
 msgid "New Event on April %d"
 msgstr "New Event on %d April"
 
 #: src/gcal-quick-add-popover.c:409
 #, c-format
-#| msgid "New Event on %s"
 msgid "New Event on May %d"
 msgstr "New Event on %d May"
 
 #: src/gcal-quick-add-popover.c:410
 #, c-format
-#| msgid "New Event on %s"
 msgid "New Event on June %d"
 msgstr "New Event on %d June"
 
 #: src/gcal-quick-add-popover.c:411
 #, c-format
-#| msgid "New Event on %s"
 msgid "New Event on July %d"
 msgstr "New Event on %d July"
 
 #: src/gcal-quick-add-popover.c:412
 #, c-format
-#| msgid "New Event on %s"
 msgid "New Event on August %d"
 msgstr "New Event on %d August"
 
 #: src/gcal-quick-add-popover.c:413
 #, c-format
-#| msgid "New Event on %s"
 msgid "New Event on September %d"
 msgstr "New Event on %d September"
 
 #: src/gcal-quick-add-popover.c:414
 #, c-format
-#| msgid "New Event on %s"
 msgid "New Event on October %d"
 msgstr "New Event on %d October"
 
 #: src/gcal-quick-add-popover.c:415
 #, c-format
-#| msgid "New Event on %s"
 msgid "New Event on November %d"
 msgstr "New Event on %d November"
 
 #: src/gcal-quick-add-popover.c:416
 #, c-format
-#| msgid "New Event on %s"
 msgid "New Event on December %d"
 msgstr "New Event on %d December"
 
@@ -913,61 +918,61 @@ msgstr "New Event on %d December"
 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 "All day"
 
-#: src/gcal-search-view.c:563
+#: src/gcal-search-popover.c:563
 msgid "Use the entry above to search for events."
 msgstr "Use the entry above to search for events."
 
 #. Dialog
-#: src/gcal-source-dialog.c:1099
+#: src/gcal-source-dialog.c:1159
 msgid "Select a calendar file"
 msgstr "Select a calendar file"
 
-#: src/gcal-source-dialog.c:1103
+#: src/gcal-source-dialog.c:1163
 msgid "Open"
 msgstr "Open"
 
-#: src/gcal-source-dialog.c:1110
+#: src/gcal-source-dialog.c:1170
 msgid "Calendar files"
 msgstr "Calendar files"
 
 #. update the source properties
-#: src/gcal-source-dialog.c:1144
+#: src/gcal-source-dialog.c:1204
 msgid "Unnamed Calendar"
 msgstr "Unnamed Calendar"
 
 #. Update notification label
-#: src/gcal-source-dialog.c:1750
+#: src/gcal-source-dialog.c:1811
 #, c-format
 msgid "Calendar <b>%s</b> removed"
 msgstr "Calendar <b>%s</b> removed"
 
-#: src/gcal-source-dialog.c:1953 src/gcal-source-dialog.c:2010
+#: src/gcal-source-dialog.c:1860 src/gcal-source-dialog.c:1916
 msgid "Off"
 msgstr "Off"
 
-#: src/gcal-source-dialog.c:1953 src/gcal-source-dialog.c:2010
+#: src/gcal-source-dialog.c:1860 src/gcal-source-dialog.c:1916
 msgid "On"
 msgstr "On"
 
-#: src/gcal-source-dialog.c:2009
+#: src/gcal-source-dialog.c:1915
 msgid "Expired"
 msgstr "Expired"
 
-#: 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:1120
 msgid ""
 "The event you are trying to modify is recurring. The changes you have "
 "selected should be applied to:"
@@ -975,73 +980,77 @@ msgstr ""
 "The event you are trying to modify is recurring. The changes you have "
 "selected should be applied to:"
 
-#: src/gcal-utils.c:1191
-#| msgid "Cancel"
+#: src/gcal-utils.c:1123
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: src/gcal-utils.c:1193
+#: src/gcal-utils.c:1125
 msgid "_Only This Event"
 msgstr "_Only This Event"
 
-#: src/gcal-utils.c:1200
+#: src/gcal-utils.c:1132
 msgid "_Subsequent events"
 msgstr "_Subsequent events"
 
-#: src/gcal-utils.c:1202
-#| msgid "No events"
+#: src/gcal-utils.c:1134
 msgid "_All events"
 msgstr "_All events"
 
-#: src/gcal-window.c:1129
+#: src/gcal-window.c:1028
 msgid "Another event deleted"
 msgstr "Another event deleted"
 
-#: src/gcal-window.c:1133
+#: src/gcal-window.c:1032
 msgid "Event deleted"
 msgstr "Event deleted"
 
-#. 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
-#| msgctxt "event date format"
-#| msgid "%B %d"
-msgid "%B %d"
-msgstr "%d %B"
+#: src/views/gcal-week-grid.c:752 src/views/gcal-week-view.c:275
+msgid "00 AM"
+msgstr "00 AM"
 
-#: src/views/gcal-month-view.c:1186
-msgid "Other events"
-msgstr "Other events"
-
-#. 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:400
 #, c-format
 msgid "Other event"
 msgid_plural "Other %d events"
 msgstr[0] "Other event"
 msgstr[1] "Other %d events"
 
-#: 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
+#: src/views/gcal-week-header.c:936
 #, c-format
-#| msgid "1 week"
 msgid "week %d"
 msgstr "week %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
-#| msgctxt "event date format"
-#| msgid "%B %d"
+#: src/views/gcal-year-view.c:290
 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:296 src/views/gcal-year-view.c:519
+msgid "%B %d"
+msgstr "%d %B"
+
+#~ msgid "Add Eve_nt…"
+#~ msgstr "Add Eve_nt…"
+
+#~| msgid "Add Eve_nt…"
+#~ msgid "Add Eve_nt"
+#~ msgstr "Add Eve_nt"
+
+#~| msgid "- Calendar management"
+#~ msgid "— Calendar management"
+#~ msgstr "— Calendar management"
+
+#~ msgid "Copyright © %d The Calendar authors"
+#~ msgstr "Copyright © %d The Calendar authors"
+
+#~ msgid "Other events"
+#~ msgstr "Other events"
+
 #~ msgid "List of the disabled sources"
 #~ msgstr "List of the disabled sources"