diff --git a/po/en_GB.po b/po/en_GB.po
index 720678b4..77fcf352 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,35 +2,35 @@
 # 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.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-calendar 3.21.91\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "calendar&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2016-09-01 19:15+0000\n"
-"PO-Revision-Date: 2016-09-04 11:57+0200\n"
-"Last-Translator: David King <amigadave@amigadave.com>\n"
-"Language-Team: \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"
+"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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.7\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/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
 msgid "Calendar"
 msgstr "Calendar"
 
-#: ../data/appdata/org.gnome.Calendar.appdata.xml.in.h:2
+#: data/appdata/org.gnome.Calendar.appdata.xml.in:8
 msgid "Calendar for GNOME"
 msgstr "Calendar for GNOME"
 
-#: ../data/appdata/org.gnome.Calendar.appdata.xml.in.h:3
+#: 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 "
@@ -40,363 +40,420 @@ msgstr ""
 "perfectly fit the GNOME desktop. By reusing the components which the GNOME "
 "desktop is build on, Calendar nicely integrates with the GNOME ecosystem."
 
-#: ../data/appdata/org.gnome.Calendar.appdata.xml.in.h:4
+#: 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!"
 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 ""
 "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!"
 
-#: ../data/appdata/org.gnome.Calendar.appdata.xml.in.h:5
-#: ../data/ui/window.ui.h:6
+#: data/appdata/org.gnome.Calendar.appdata.xml.in:27
+#| msgctxt "shortcut window"
+#| msgid "Next view"
+msgid "Week view"
+msgstr "Week view"
+
+#: data/appdata/org.gnome.Calendar.appdata.xml.in:31
 msgid "Search for events"
 msgstr "Search for events"
 
-#: ../data/appdata/org.gnome.Calendar.appdata.xml.in.h:6
+#: data/appdata/org.gnome.Calendar.appdata.xml.in:35
 msgid "Calendar management"
 msgstr "Calendar management"
 
-#: ../data/org.gnome.Calendar.desktop.in.in.h:2
-msgid "Access, and manage calendar"
-msgstr "Access, and manage calendar"
+#: data/org.gnome.Calendar.desktop.in:4
+#| msgid "Access, and manage calendar"
+msgid "Access and manage your calendars"
+msgstr "Access and manage your calendars"
 
-#: ../data/org.gnome.Calendar.desktop.in.in.h:3
+#. 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"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/org.gnome.Calendar.desktop.in:13
 msgid "Calendar;Event;Reminder;"
 msgstr "Calendar;Event;Reminder;"
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:1
+#: data/org.gnome.calendar.gschema.xml:6
 msgid "Window maximized"
 msgstr "Window maximised"
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:2
+#: data/org.gnome.calendar.gschema.xml:7
 msgid "Window maximized state"
 msgstr "Window maximised state"
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:3
+#: data/org.gnome.calendar.gschema.xml:11
 msgid "Window size"
 msgstr "Window size"
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:4
+#: data/org.gnome.calendar.gschema.xml:12
 msgid "Window size (width and height)."
 msgstr "Window size (width and height)."
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:5
+#: data/org.gnome.calendar.gschema.xml:16
 msgid "Window position"
 msgstr "Window position"
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:6
+#: data/org.gnome.calendar.gschema.xml:17
 msgid "Window position (x and y)."
 msgstr "Window position (x and y)."
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:7
+#: data/org.gnome.calendar.gschema.xml:21
 msgid "Type of the active view"
 msgstr "Type of the active view"
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:8
+#: data/org.gnome.calendar.gschema.xml: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.h:9
-msgid "List of the disabled sources"
-msgstr "List of the disabled sources"
-
-#: ../data/org.gnome.calendar.gschema.xml.in.h:10
-msgid "Sources disabled last time Calendar ran"
-msgstr "Sources disabled last time Calendar ran"
-
-#: ../data/ui/alarm-row.ui.h:1
+#: data/ui/alarm-row.ui:34
 msgid "Toggles the sound of the alarm"
 msgstr "Toggles the sound of the alarm"
 
-#: ../data/ui/alarm-row.ui.h:2
+#: data/ui/alarm-row.ui:54
 msgid "Remove the alarm"
 msgstr "Remove the alarm"
 
-#: ../data/ui/edit-dialog.ui.h:1 ../data/ui/source-dialog.ui.h:23
-#: ../src/gcal-source-dialog.c:1116
+#: data/ui/edit-dialog.ui:18 data/ui/source-dialog.ui:762
+#: data/ui/source-dialog.ui:869 src/gcal-source-dialog.c:1102
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../data/ui/edit-dialog.ui.h:2
-msgid "Click to select the event's agenda"
-msgstr "Click to select the agenda of the event"
+#: data/ui/edit-dialog.ui:38
+#| msgid "Click to select the event's agenda"
+msgid "Click to select the calendar"
+msgstr "Click to select the calendar"
 
-#: ../data/ui/edit-dialog.ui.h:3 ../src/gcal-edit-dialog.c:565
+#: data/ui/edit-dialog.ui:110 src/gcal-edit-dialog.c:688
 msgid "Done"
 msgstr "Done"
 
-#: ../data/ui/edit-dialog.ui.h:4
+#: data/ui/edit-dialog.ui:140
 msgid "Title"
 msgstr "Title"
 
-#: ../data/ui/edit-dialog.ui.h:5
+#: data/ui/edit-dialog.ui:158
 msgid "Date"
 msgstr "Date"
 
-#: ../data/ui/edit-dialog.ui.h:6
+#: data/ui/edit-dialog.ui:174
+msgid "Repeat"
+msgstr "Repeat"
+
+#: data/ui/edit-dialog.ui:192
 msgid "Reminders"
 msgstr "Reminders"
 
-#: ../data/ui/edit-dialog.ui.h:7
+#: data/ui/edit-dialog.ui:210
 msgid "Notes"
 msgstr "Notes"
 
-#: ../data/ui/edit-dialog.ui.h:8 ../data/ui/source-dialog.ui.h:17
+#: data/ui/edit-dialog.ui:226 data/ui/source-dialog.ui:563
 msgid "Location"
 msgstr "Location"
 
-#: ../data/ui/edit-dialog.ui.h:9
+#: data/ui/edit-dialog.ui:293
 msgid "Time"
 msgstr "Time"
 
-#: ../data/ui/edit-dialog.ui.h:10
+#: data/ui/edit-dialog.ui:348
 msgid "All Day"
 msgstr "All Day"
 
-#: ../data/ui/edit-dialog.ui.h:11
+#: data/ui/edit-dialog.ui:393
 msgid "Add reminder…"
 msgstr "Add reminder…"
 
-#: ../data/ui/edit-dialog.ui.h:12
+#: data/ui/edit-dialog.ui:424
+msgid "No Repeat"
+msgstr "No Repeat"
+
+#: data/ui/edit-dialog.ui:425
+msgid "Daily"
+msgstr "Daily"
+
+#: data/ui/edit-dialog.ui:426
+msgid "Monday – Friday"
+msgstr "Monday – Friday"
+
+#: data/ui/edit-dialog.ui:427
+msgid "Weekly"
+msgstr "Weekly"
+
+#: data/ui/edit-dialog.ui:428
+#| msgid "Month"
+msgid "Monthly"
+msgstr "Monthly"
+
+#: data/ui/edit-dialog.ui:429
+#| msgid "Year"
+msgid "Yearly"
+msgstr "Yearly"
+
+#: data/ui/edit-dialog.ui:457
+msgid "Forever"
+msgstr "Forever"
+
+#: data/ui/edit-dialog.ui:458
+msgid "No. of occurrences"
+msgstr "No. of occurrences"
+
+#: data/ui/edit-dialog.ui:459
+msgid "Until Date"
+msgstr "Until Date"
+
+#: data/ui/edit-dialog.ui:553
 msgid "Delete Event"
 msgstr "Delete Event"
 
-#: ../data/ui/edit-dialog.ui.h:13
+#: data/ui/edit-dialog.ui:590
 msgid "5 minutes"
 msgstr "5 minutes"
 
-#: ../data/ui/edit-dialog.ui.h:14
+#: data/ui/edit-dialog.ui:599
 msgid "10 minutes"
 msgstr "10 minutes"
 
-#: ../data/ui/edit-dialog.ui.h:15
+#: data/ui/edit-dialog.ui:608
 msgid "30 minutes"
 msgstr "30 minutes"
 
-#: ../data/ui/edit-dialog.ui.h:16
+#: data/ui/edit-dialog.ui:617
 msgid "1 hour"
 msgstr "1 hour"
 
-#: ../data/ui/edit-dialog.ui.h:17
+#: data/ui/edit-dialog.ui:625
 msgid "1 day"
 msgstr "1 day"
 
-#: ../data/ui/edit-dialog.ui.h:18
+#: data/ui/edit-dialog.ui:634
 msgid "2 days"
 msgstr "2 days"
 
-#: ../data/ui/edit-dialog.ui.h:19
+#: data/ui/edit-dialog.ui:643
 msgid "3 days"
 msgstr "3 days"
 
-#: ../data/ui/edit-dialog.ui.h:20
+#: data/ui/edit-dialog.ui:652
 msgid "1 week"
 msgstr "1 week"
 
-#: ../data/ui/help-overlay.ui.h:1
+#: data/ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
 msgstr "General"
 
-#: ../data/ui/help-overlay.ui.h:2
+#: data/ui/help-overlay.ui:17
 msgctxt "shortcut window"
 msgid "New event"
 msgstr "New event"
 
-#: ../data/ui/help-overlay.ui.h:3
+#: data/ui/help-overlay.ui:24
 msgctxt "shortcut window"
 msgid "Close window"
 msgstr "Close window"
 
-#: ../data/ui/help-overlay.ui.h:4
+#: data/ui/help-overlay.ui:31
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "Search"
 
-#: ../data/ui/help-overlay.ui.h:5
+#: data/ui/help-overlay.ui:38
 msgctxt "shortcut window"
 msgid "Show help"
 msgstr "Show help"
 
-#: ../data/ui/help-overlay.ui.h:6
+#: data/ui/help-overlay.ui:45
 msgctxt "shortcut window"
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: ../data/ui/help-overlay.ui.h:7
+#: data/ui/help-overlay.ui:54
 msgctxt "shortcut window"
 msgid "Navigation"
 msgstr "Navigation"
 
-#: ../data/ui/help-overlay.ui.h:8
+#: data/ui/help-overlay.ui:58
 msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Go back"
 
-#: ../data/ui/help-overlay.ui.h:9
+#: data/ui/help-overlay.ui:65
 msgctxt "shortcut window"
 msgid "Go forward"
 msgstr "Go forward"
 
-#: ../data/ui/help-overlay.ui.h:10
+#: data/ui/help-overlay.ui:72
 msgctxt "shortcut window"
 msgid "Show today"
 msgstr "Show today"
 
-#: ../data/ui/help-overlay.ui.h:11
+#: data/ui/help-overlay.ui:79
 msgctxt "shortcut window"
 msgid "Next view"
 msgstr "Next view"
 
-#: ../data/ui/help-overlay.ui.h:12
+#: data/ui/help-overlay.ui:86
 msgctxt "shortcut window"
 msgid "Previous view"
 msgstr "Previous view"
 
-#: ../data/ui/help-overlay.ui.h:13
+#: data/ui/help-overlay.ui:95
 msgctxt "shortcut window"
 msgid "View"
 msgstr "View"
 
-#: ../data/ui/help-overlay.ui.h:14
+#: data/ui/help-overlay.ui:99
+#| msgctxt "shortcut window"
+#| msgid "Next view"
+msgctxt "shortcut window"
+msgid "Week view"
+msgstr "Week view"
+
+#: data/ui/help-overlay.ui:106
 msgctxt "shortcut window"
 msgid "Month view"
 msgstr "Month view"
 
-#: ../data/ui/help-overlay.ui.h:15
+#: data/ui/help-overlay.ui:113
 msgctxt "shortcut window"
 msgid "Year view"
 msgstr "Year view"
 
-#: ../data/ui/menus.ui.h:1
+#: data/ui/menus.ui:6 data/ui/menus.ui:36
 msgid "Add Eve_nt…"
 msgstr "Add Eve_nt…"
 
-#: ../data/ui/menus.ui.h:2
-msgid "_Search…"
-msgstr "_Search…"
+#: data/ui/menus.ui:13
+#| msgid "Calendars"
+msgid "_Calendars"
+msgstr "_Calendars"
 
-#: ../data/ui/menus.ui.h:3
-msgid "_Calendars…"
-msgstr "_Calendars…"
-
-#: ../data/ui/menus.ui.h:4
+#: data/ui/menus.ui:19
 msgid "_Keyboard Shortcuts"
 msgstr "_Keyboard Shortcuts"
 
-#: ../data/ui/menus.ui.h:5
+#: data/ui/menus.ui:23
 msgid "_About"
 msgstr "_About"
 
-#: ../data/ui/menus.ui.h:6
+#: data/ui/menus.ui:27
 msgid "_Quit"
 msgstr "_Quit"
 
-#: ../data/ui/menus.ui.h:7
+#: data/ui/menus.ui:40
 msgid "_Synchronize"
 msgstr "_Synchronise"
 
-#: ../data/ui/menus.ui.h:8
+#: data/ui/menus.ui:49
 msgid "From Web…"
 msgstr "From Web…"
 
-#: ../data/ui/menus.ui.h:9
+#: data/ui/menus.ui:53
 msgid "New Local Calendar…"
 msgstr "New Local Calendar…"
 
-#: ../data/ui/menus.ui.h:10
+#: data/ui/menus.ui:57
 msgid "From File…"
 msgstr "From File…"
 
-#: ../data/ui/quick-add-popover.ui.h:1
+#: data/ui/quick-add-popover.ui:117
 msgid "Edit Details…"
 msgstr "Edit Details…"
 
-#: ../data/ui/quick-add-popover.ui.h:2 ../data/ui/source-dialog.ui.h:9
+#: data/ui/quick-add-popover.ui:130 data/ui/source-dialog.ui:389
+#: data/ui/source-dialog.ui:773
 msgid "Add"
 msgstr "Add"
 
-#: ../data/ui/search-view.ui.h:1
+#: data/ui/search-view.ui:76
 msgid "No results found"
 msgstr "No results found"
 
-#: ../data/ui/search-view.ui.h:2
+#: data/ui/search-view.ui:92
 msgid "Try a different search"
 msgstr "Try a different search"
 
-#: ../data/ui/source-dialog.ui.h:1 ../src/gcal-window.c:1123
-#: ../src/gcal-window.c:1127
+#: data/ui/source-dialog.ui:53 src/gcal-window.c:1129 src/gcal-window.c:1133
 msgid "Undo"
 msgstr "Undo"
 
-#: ../data/ui/source-dialog.ui.h:2
+#: data/ui/source-dialog.ui:135
 msgid "Online Accounts"
 msgstr "Online Accounts"
 
-#: ../data/ui/source-dialog.ui.h:3
+#: data/ui/source-dialog.ui:151
 msgid "Open online account settings"
 msgstr "Open online account settings"
 
-#: ../data/ui/source-dialog.ui.h:4
+#: data/ui/source-dialog.ui:198
 msgid "Google"
 msgstr "Google"
 
-#: ../data/ui/source-dialog.ui.h:5
+#: data/ui/source-dialog.ui:209 data/ui/source-dialog.ui:260
+#: data/ui/source-dialog.ui:311
 msgid "Click to set up"
 msgstr "Click to set up"
 
-#: ../data/ui/source-dialog.ui.h:6
+#: data/ui/source-dialog.ui:249
 msgid "ownCloud"
 msgstr "ownCloud"
 
-#: ../data/ui/source-dialog.ui.h:7
+#: data/ui/source-dialog.ui:300
 msgid "Microsoft Exchange"
 msgstr "Microsoft Exchange"
 
-#: ../data/ui/source-dialog.ui.h:8
+#: data/ui/source-dialog.ui:346 data/ui/source-dialog.ui:682
 msgid "Calendars"
 msgstr "Calendars"
 
-#: ../data/ui/source-dialog.ui.h:10
+#: data/ui/source-dialog.ui:421
 msgid "Overview"
 msgstr "Overview"
 
-#: ../data/ui/source-dialog.ui.h:11
+#: data/ui/source-dialog.ui:441
 msgid "Add new events to this calendar by default"
 msgstr "Add new events to this calendar by default"
 
-#: ../data/ui/source-dialog.ui.h:12
+#: data/ui/source-dialog.ui:454
 msgid "Remove Calendar"
 msgstr "Remove Calendar"
 
-#: ../data/ui/source-dialog.ui.h:13
+#: data/ui/source-dialog.ui:483
 msgid "Display calendar"
 msgstr "Display calendar"
 
-#: ../data/ui/source-dialog.ui.h:14
+#: data/ui/source-dialog.ui:521
 msgid "Calendar name"
 msgstr "Calendar name"
 
-#: ../data/ui/source-dialog.ui.h:15
+#: data/ui/source-dialog.ui:535
 msgid "Color"
 msgstr "Colour"
 
-#: ../data/ui/source-dialog.ui.h:16
+#: data/ui/source-dialog.ui:549
 msgid "Account"
 msgstr "Account"
 
-#: ../data/ui/source-dialog.ui.h:18
+#: data/ui/source-dialog.ui:587
 msgid "Settings"
 msgstr "Settings"
 
-#: ../data/ui/source-dialog.ui.h:19
+#: data/ui/source-dialog.ui:618
 msgid "Edit Calendar"
 msgstr "Edit Calendar"
 
-#: ../data/ui/source-dialog.ui.h:20
+#: data/ui/source-dialog.ui:631
 msgid ""
 "Enter the address of the calendar that you want to add. If the calendar "
 "belongs to one of your online accounts, you can add it through the <a href="
@@ -406,242 +463,608 @@ msgstr ""
 "belongs to one of your online accounts, you can add it through the <a href="
 "\"GOA\">online account settings</a>."
 
-#: ../data/ui/source-dialog.ui.h:21
+#: data/ui/source-dialog.ui:646
 msgid "Calendar Address"
 msgstr "Calendar Address"
 
-#: ../data/ui/source-dialog.ui.h:22 ../src/gcal-source-dialog.c:2202
-#: ../src/gcal-source-dialog.c:2208
+#: data/ui/source-dialog.ui:729 src/gcal-source-dialog.c:2193
+#: src/gcal-source-dialog.c:2199
 msgid "Add Calendar"
 msgstr "Add Calendar"
 
-#: ../data/ui/source-dialog.ui.h:24
+#: data/ui/source-dialog.ui:806
 msgid "User"
 msgstr "User"
 
-#: ../data/ui/source-dialog.ui.h:25
+#: data/ui/source-dialog.ui:820
 msgid "Password"
 msgstr "Password"
 
-#: ../data/ui/source-dialog.ui.h:26
+#: data/ui/source-dialog.ui:878
 msgid "Connect"
 msgstr "Connect"
 
-#: ../data/ui/time-selector.ui.h:1
+#: data/ui/time-selector.ui:9 src/views/gcal-week-grid.c:763
+#: src/views/gcal-week-view.c:287
 msgid "00:00"
 msgstr "00:00"
 
-#: ../data/ui/time-selector.ui.h:2
+#: data/ui/time-selector.ui:65
 msgid ":"
 msgstr ":"
 
-#: ../data/ui/time-selector.ui.h:3 ../src/gcal-week-view.c:417
+#: data/ui/time-selector.ui:78 src/views/gcal-week-view.c:442
 msgid "AM"
 msgstr "AM"
 
-#: ../data/ui/time-selector.ui.h:4 ../src/gcal-week-view.c:417
+#: data/ui/time-selector.ui:79 src/views/gcal-week-view.c:442
 msgid "PM"
 msgstr "PM"
 
-#: ../data/ui/window.ui.h:1
+#: data/ui/window.ui:64
+msgid "Week"
+msgstr "Week"
+
+#: data/ui/window.ui:79
 msgid "Month"
 msgstr "Month"
 
-#: ../data/ui/window.ui.h:2
+#: data/ui/window.ui:93
 msgid "Year"
 msgstr "Year"
 
-#: ../data/ui/window.ui.h:4 ../data/ui/year-view.ui.h:1
-#: ../src/gcal-year-view.c:262 ../src/gcal-year-view.c:482
+#: 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
 msgid "Today"
 msgstr "Today"
 
-#: ../data/ui/window.ui.h:5
+#: data/ui/window.ui:261
 msgid "Manage your calendars"
 msgstr "Manage your calendars"
 
-#: ../data/ui/window.ui.h:7 ../src/gcal-source-dialog.c:817
-#: ../src/gcal-source-dialog.c:2231
+#: data/ui/window.ui:278
+#| msgid "Search for events"
+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/year-view.ui.h:2
+#: data/ui/year-view.ui:95
 msgid "No events"
 msgstr "No events"
 
-#: ../data/ui/year-view.ui.h:3 ../src/gcal-month-view.c:1037
+#: data/ui/year-view.ui:117 src/views/gcal-month-view.c:2322
 msgid "Add Event…"
 msgstr "Add Event…"
 
-#: ../src/gcal-application.c:102
+#: src/gcal-application.c:89
 msgid "Display version number"
 msgstr "Display version number"
 
-#: ../src/gcal-application.c:107
+#: src/gcal-application.c:94
+msgid "Enable debug messages"
+msgstr "Enable debug messages"
+
+#: src/gcal-application.c:99
 msgid "Open calendar on the passed date"
 msgstr "Open calendar on the passed date"
 
-#: ../src/gcal-application.c:112
+#: src/gcal-application.c:104
 msgid "Open calendar showing the passed event"
 msgstr "Open calendar showing the passed event"
 
-#: ../src/gcal-application.c:324
-msgid "- Calendar management"
-msgstr "- Calendar management"
+#: src/gcal-application.c:285
+#| msgid "- Calendar management"
+msgid "— Calendar management"
+msgstr "— Calendar management"
 
-#: ../src/gcal-application.c:471
+#: src/gcal-application.c:467
 #, c-format
 msgid "Copyright © %d The Calendar authors"
 msgstr "Copyright © %d The Calendar authors"
 
-#: ../src/gcal-application.c:477
+#: 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:490
+#: src/gcal-application.c:486
 msgid "translator-credits"
 msgstr ""
 "Bastien Nocera <hadess@hadess.net>\n"
-"David King <amigadave@amigadave.com>"
+"David King <amigadave@amigadave.com>\n"
+"Bruce Cowan <bruce@bcowan.eu>"
 
-#: ../src/gcal-edit-dialog.c:565
+#: src/gcal-edit-dialog.c:688
 msgid "Save"
 msgstr "Save"
 
-#: ../src/gcal-edit-dialog.c:837
+#: src/gcal-edit-dialog.c:1001
 #, 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:845
+#: src/gcal-edit-dialog.c:1009
 #, 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:853
+#: src/gcal-edit-dialog.c:1017
 #, 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:861
+#: src/gcal-edit-dialog.c:1025
 #, 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:1080 ../src/gcal-quick-add-popover.c:424
+#: src/gcal-edit-dialog.c:1328 src/gcal-quick-add-popover.c:680
 msgid "Unnamed event"
 msgstr "Unnamed event"
 
-#: ../src/gcal-month-view.c:1275
+#. Translators: %s is the location of the event (e.g. "Downtown, 3rd Avenue")
+#: src/gcal-event-widget.c:364
+#, c-format
+msgid "At %s"
+msgstr "At %s"
+
+#: src/gcal-quick-add-popover.c:119
+#, c-format
+msgid "%s (this calendar is read-only)"
+msgstr "%s (this calendar is read-only)"
+
+#: src/gcal-quick-add-popover.c:244
+msgid "from next Monday"
+msgstr "from next Monday"
+
+#: src/gcal-quick-add-popover.c:245
+msgid "from next Tuesday"
+msgstr "from next Tuesday"
+
+#: src/gcal-quick-add-popover.c:246
+msgid "from next Wednesday"
+msgstr "from next Wednesday"
+
+#: src/gcal-quick-add-popover.c:247
+msgid "from next Thursday"
+msgstr "from next Thursday"
+
+#: src/gcal-quick-add-popover.c:248
+msgid "from next Friday"
+msgstr "from next Friday"
+
+#: src/gcal-quick-add-popover.c:249
+msgid "from next Saturday"
+msgstr "from next Saturday"
+
+#: src/gcal-quick-add-popover.c:250
+msgid "from next Sunday"
+msgstr "from next Sunday"
+
+#: src/gcal-quick-add-popover.c:255
+msgid "to next Monday"
+msgstr "to next Monday"
+
+#: src/gcal-quick-add-popover.c:256
+msgid "to next Tuesday"
+msgstr "to next Tuesday"
+
+#: src/gcal-quick-add-popover.c:257
+msgid "to next Wednesday"
+msgstr "to next Wednesday"
+
+#: src/gcal-quick-add-popover.c:258
+msgid "to next Thursday"
+msgstr "to next Thursday"
+
+#: src/gcal-quick-add-popover.c:259
+msgid "to next Friday"
+msgstr "to next Friday"
+
+#: src/gcal-quick-add-popover.c:260
+msgid "to next Saturday"
+msgstr "to next Saturday"
+
+#: src/gcal-quick-add-popover.c:261
+msgid "to next Sunday"
+msgstr "to next Sunday"
+
+#: src/gcal-quick-add-popover.c:266
+msgid "January"
+msgstr "January"
+
+#: src/gcal-quick-add-popover.c:267
+msgid "February"
+msgstr "February"
+
+#: src/gcal-quick-add-popover.c:268
+#| msgctxt "shortcut window"
+#| msgid "Search"
+msgid "March"
+msgstr "March"
+
+#: src/gcal-quick-add-popover.c:269
+msgid "April"
+msgstr "April"
+
+#: src/gcal-quick-add-popover.c:270
+#| msgid "Day"
+msgid "May"
+msgstr "May"
+
+#: src/gcal-quick-add-popover.c:271
+msgid "June"
+msgstr "June"
+
+#: src/gcal-quick-add-popover.c:272
+msgid "July"
+msgstr "July"
+
+#: src/gcal-quick-add-popover.c:273
+msgid "August"
+msgstr "August"
+
+#: src/gcal-quick-add-popover.c:274
+msgid "September"
+msgstr "September"
+
+#: src/gcal-quick-add-popover.c:275
+msgid "October"
+msgstr "October"
+
+#: src/gcal-quick-add-popover.c:276
+msgid "November"
+msgstr "November"
+
+#: src/gcal-quick-add-popover.c:277
+msgid "December"
+msgstr "December"
+
+#: src/gcal-quick-add-popover.c:286
+#| msgid "Today"
+msgid "from Today"
+msgstr "from Today"
+
+#: src/gcal-quick-add-popover.c:290
+msgid "from Tomorrow"
+msgstr "from Tomorrow"
+
+#: src/gcal-quick-add-popover.c:294
+msgid "from Yesterday"
+msgstr "from Yesterday"
+
+#. 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:312
+#, c-format
+msgid "from %1$s %2$s"
+msgstr "from %2$s %1$s"
+
+#: src/gcal-quick-add-popover.c:323
+#| msgid "Today"
+msgid "to Today"
+msgstr "to Today"
+
+#: src/gcal-quick-add-popover.c:327
+msgid "to Tomorrow"
+msgstr "to Tomorrow"
+
+#: src/gcal-quick-add-popover.c:331
+msgid "to Yesterday"
+msgstr "to Yesterday"
+
+#. 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:349
+#, c-format
+msgid "to %1$s %2$s"
+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"
+msgid "New Event Today"
+msgstr "New Event Today"
+
+#: src/gcal-quick-add-popover.c:377
+#| msgid "New Event on %s"
+msgid "New Event Tomorrow"
+msgstr "New Event Tomorrow"
+
+#: src/gcal-quick-add-popover.c:381
+#| msgid "New Event on %s"
+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"
+
+#. Translators: %1$s is the event name, %2$s is the start hour, and %3$s is the end hour
+#: src/gcal-quick-add-popover.c:464
+#, c-format
+msgid "%1$s, %2$s – %3$s"
+msgstr "%1$s, %2$s – %3$s"
+
+#: src/gcal-search-view.c:358
+msgid "All day"
+msgstr "All day"
+
+#: src/gcal-search-view.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
+msgid "Select a calendar file"
+msgstr "Select a calendar file"
+
+#: src/gcal-source-dialog.c:1103
+msgid "Open"
+msgstr "Open"
+
+#: src/gcal-source-dialog.c:1110
+msgid "Calendar files"
+msgstr "Calendar files"
+
+#. update the source properties
+#: src/gcal-source-dialog.c:1144
+msgid "Unnamed Calendar"
+msgstr "Unnamed Calendar"
+
+#. Update notification label
+#: src/gcal-source-dialog.c:1750
+#, 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
+msgid "Off"
+msgstr "Off"
+
+#: src/gcal-source-dialog.c:1953 src/gcal-source-dialog.c:2010
+msgid "On"
+msgstr "On"
+
+#: src/gcal-source-dialog.c:2009
+msgid "Expired"
+msgstr "Expired"
+
+#: src/gcal-time-selector.c:84
+#, c-format
+msgid "%s AM"
+msgstr "%s AM"
+
+#: src/gcal-time-selector.c:86
+#, c-format
+msgid "%s PM"
+msgstr "%s PM"
+
+#: src/gcal-utils.c:1188
+msgid ""
+"The event you are trying to modify is recurring. The changes you have "
+"selected should be applied to:"
+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"
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: src/gcal-utils.c:1193
+msgid "_Only This Event"
+msgstr "_Only This Event"
+
+#: src/gcal-utils.c:1200
+msgid "_Subsequent events"
+msgstr "_Subsequent events"
+
+#: src/gcal-utils.c:1202
+#| msgid "No events"
+msgid "_All events"
+msgstr "_All events"
+
+#: src/gcal-window.c:1129
+msgid "Another event deleted"
+msgstr "Another event deleted"
+
+#: src/gcal-window.c:1133
+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-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/gcal-month-view.c:1737
+#: src/views/gcal-month-view.c:1785 src/views/gcal-week-header.c:338
 #, c-format
 msgid "Other event"
 msgid_plural "Other %d events"
 msgstr[0] "Other event"
 msgstr[1] "Other %d events"
 
-#: ../src/gcal-quick-add-popover.c:115
+#: 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 "%s (this calendar is read-only)"
-msgstr "%s (this calendar is read-only)"
+#| msgid "1 week"
+msgid "week %d"
+msgstr "week %d"
 
-#: ../src/gcal-quick-add-popover.c:225 ../src/gcal-quick-add-popover.c:243
-msgctxt "event date format"
-msgid "%B %d"
-msgstr "%d %B"
+#. 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"
+msgid "%B %d…"
+msgstr "%d %B…"
 
-#: ../src/gcal-quick-add-popover.c:245
-#, c-format
-msgid "New Event from %s to %s"
-msgstr "New Event from %s to %s"
+#~ msgid "List of the disabled sources"
+#~ msgstr "List of the disabled sources"
 
-#: ../src/gcal-quick-add-popover.c:251
-#, c-format
-msgid "New Event on %s"
-msgstr "New Event on %s"
+#~ msgid "Sources disabled last time Calendar ran"
+#~ msgstr "Sources disabled last time Calendar ran"
 
-#: ../src/gcal-search-view.c:353
-msgid "All day"
-msgstr "All day"
+#~ msgid "_Search…"
+#~ msgstr "_Search…"
 
-#: ../src/gcal-search-view.c:502
-msgid "Use the entry above to search for events."
-msgstr "Use the entry above to search for events."
+#~ msgid "_Calendars…"
+#~ msgstr "_Calendars…"
 
-#. Dialog
-#: ../src/gcal-source-dialog.c:1113
-msgid "Select a calendar file"
-msgstr "Select a calendar file"
+#~ msgid "New Event from %s to %s"
+#~ msgstr "New Event from %s to %s"
 
-#: ../src/gcal-source-dialog.c:1117
-msgid "Open"
-msgstr "Open"
+#~ msgid "Midnight"
+#~ msgstr "Midnight"
 
-#: ../src/gcal-source-dialog.c:1124
-msgid "Calendar files"
-msgstr "Calendar files"
+#~ msgid "Noon"
+#~ msgstr "Noon"
 
-#. update the source properties
-#: ../src/gcal-source-dialog.c:1166
-msgid "Unnamed Calendar"
-msgstr "Unnamed Calendar"
-
-#. Update notification label
-#: ../src/gcal-source-dialog.c:1766
-#, c-format
-msgid "Calendar <b>%s</b> removed"
-msgstr "Calendar <b>%s</b> removed"
-
-#: ../src/gcal-source-dialog.c:1969 ../src/gcal-source-dialog.c:2025
-msgid "Off"
-msgstr "Off"
-
-#: ../src/gcal-source-dialog.c:1969 ../src/gcal-source-dialog.c:2025
-msgid "On"
-msgstr "On"
-
-#: ../src/gcal-time-selector.c:82
-#, c-format
-msgid "%s AM"
-msgstr "%s AM"
-
-#: ../src/gcal-time-selector.c:84
-#, c-format
-msgid "%s PM"
-msgstr "%s PM"
-
-#: ../src/gcal-week-view.c:420 ../src/gcal-week-view.c:493
-msgid "Midnight"
-msgstr "Midnight"
-
-#: ../src/gcal-week-view.c:422 ../src/gcal-week-view.c:496
-msgid "Noon"
-msgstr "Noon"
-
-#: ../src/gcal-week-view.c:499
-msgid "00:00 PM"
-msgstr "00:00 PM"
-
-#: ../src/gcal-window.c:1123
-msgid "Another event deleted"
-msgstr "Another event deleted"
-
-#: ../src/gcal-window.c:1127
-msgid "Event deleted"
-msgstr "Event deleted"
+#~ msgid "00:00 PM"
+#~ msgstr "00:00 PM"
 
 #~ msgid "Starts"
 #~ msgstr "Starts"
@@ -655,9 +1078,6 @@ msgstr "Event deleted"
 #~ msgid "%m/%d/%y"
 #~ msgstr "%m/%d/%y"
 
-#~ msgid "Day"
-#~ msgstr "Day"
-
 #~ msgid "%.2d:%.2d AM"
 #~ msgstr "%.2d:%.2d AM"