diff --git a/po/nb.po b/po/nb.po
index 03605477..b34a2520 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,16 +1,15 @@
 # Norwegian bokmål translation of gnome-calendar.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Kjartan Maraas <kmaraas@gnome.org>, 2012-2017.
+# Kjartan Maraas <kmaraas@gnome.org>, 2012-2019.
 # Åka Sikrom <a4NOSPAMPLEASETHANKYOU@hush.com>, 2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-calendar 3.27.x\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-11-15 23:59+0000\n"
-"PO-Revision-Date: 2017-11-20 12:16+0100\n"
+"Project-Id-Version: gnome-calendar 3.34.x\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-calendar/issues\n"
+"POT-Creation-Date: 2019-07-13 19:05+0000\n"
+"PO-Revision-Date: 2019-07-26 10:00+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
@@ -21,7 +20,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:163 src/main.c:36 src/gui/gcal-application.c:280
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -33,21 +32,15 @@ msgstr "Kalender for GNOME"
 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."
-msgstr ""
-"GNOME Kalender er et enkelt og pent kalenderprogram. Det gjenbruker mange av "
-"komponentene som GNOME-skrivebordet er bygget på, og kler derfor GNOME-"
-"skrivebordet perfekt."
+"desktop is built on, Calendar nicely integrates with the GNOME ecosystem."
+msgstr "GNOME Kalender er et enkelt og pent kalenderprogram som er laget for å passe til GNOME skrivebordet. Det gjenbruker mange av komponentene som GNOME-skrivebordet er bygget på og integrerer bra med GNOME økosystemet."
 
 #: 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 "
+"centred usability. No excess, nothing missing. You’ll feel comfortable using "
 "Calendar, like you’ve been using it for ages!"
-msgstr ""
-"Vi prøver å finne en perfekt balanse mellom velbygde funksjoner og "
-"brukskvalitet. Ikke for mye, og ikke for lite. Du skal føle deg komfortabel "
-"med å bruke Kalender, som om du har brukt den i mange år."
+msgstr "Vi prøver å finne en perfekt balanse mellom velbygde funksjoner og brukervennlighet. Ikke for mye, og ikke for lite. Du skal føle deg komfortabel med å bruke Kalender som om du har brukt den i mange år."
 
 #: data/appdata/org.gnome.Calendar.appdata.xml.in:27
 msgid "Week view"
@@ -65,48 +58,61 @@ msgstr "Kalenderbehandling"
 msgid "Access and manage your calendars"
 msgstr "Se på og håndter dine kalendere"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: data/org.gnome.Calendar.desktop.in:7
-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 "Kalender;Hendelse;Påminnelse;"
 
-#: data/org.gnome.calendar.gschema.xml:6
+#: data/org.gnome.calendar.gschema.xml.in:6
 msgid "Window maximized"
 msgstr "Vindu maksimert"
 
-#: data/org.gnome.calendar.gschema.xml:7
+#: data/org.gnome.calendar.gschema.xml.in:7
 msgid "Window maximized state"
 msgstr "Vindu maksimert tilstand"
 
-#: data/org.gnome.calendar.gschema.xml:11
+#: data/org.gnome.calendar.gschema.xml.in:11
 msgid "Window size"
 msgstr "Vindustørrelse"
 
-#: data/org.gnome.calendar.gschema.xml:12
+#: data/org.gnome.calendar.gschema.xml.in:12
 msgid "Window size (width and height)."
 msgstr "Vindustørrelse (bredde og høyde)."
 
-#: data/org.gnome.calendar.gschema.xml:16
+#: data/org.gnome.calendar.gschema.xml.in:16
 msgid "Window position"
 msgstr "Vinduposisjon"
 
-#: data/org.gnome.calendar.gschema.xml:17
+#: data/org.gnome.calendar.gschema.xml.in:17
 msgid "Window position (x and y)."
 msgstr "Vinduposisjon (x og y)."
 
-#: data/org.gnome.calendar.gschema.xml:21
+#: data/org.gnome.calendar.gschema.xml.in:21
 msgid "Type of the active view"
 msgstr "Gjeldende visningstype"
 
-#: 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 "Gjeldende vindu-visningstype. Standardverdi er månedsvisning"
 
+#: data/org.gnome.calendar.gschema.xml.in:26
+msgid "Weather Service Configuration"
+msgstr "Konfigurasjon av værtjeneste"
+
+#: data/org.gnome.calendar.gschema.xml.in:27
+msgid ""
+"Whether weather reports are shown, automatic locations are used and a "
+"location-name"
+msgstr "Hvorvidt værmeldinger vises. Automatisk lokasjon brukes og et navn på en lokasjon"
+
+#: data/org.gnome.calendar.gschema.xml.in:31
+msgid "Follow system night light"
+msgstr "Følg systemets nattlys"
+
+#: data/org.gnome.calendar.gschema.xml.in:32
+msgid "Use GNOME night light setting to activate night-mode."
+msgstr "Bruk innstilling for GNOME nattlys for å aktivere nattmodus."
+
 #: data/ui/alarm-row.ui:34
 msgid "Toggles the sound of the alarm"
 msgstr "Slår av/på lyden for alarmen"
@@ -115,8 +121,66 @@ msgstr "Slår av/på lyden for alarmen"
 msgid "Remove the alarm"
 msgstr "Fjern alarmen"
 
-#: data/ui/edit-dialog.ui:16 data/ui/source-dialog.ui:762
-#: data/ui/source-dialog.ui:869 src/gcal-source-dialog.c:1158
+#: data/ui/calendar-management-dialog.ui:42
+msgid "Calendar Settings"
+msgstr "Innstillinger for kalender"
+
+#: data/ui/calendar-popover.ui:43
+msgid "_Synchronize Calendars"
+msgstr "_Synkroniser kalendere"
+
+#: data/ui/calendar-popover.ui:51
+msgid "Manage Calendars…"
+msgstr "Håndter kalendere …"
+
+#: data/ui/calendar-popover.ui:75
+msgctxt "tooltip"
+msgid "Synchronizing remote calendars…"
+msgstr "Synkroniserer eksterne kalendere …"
+
+#: data/ui/calendars-page.ui:31 src/gui/gcal-window.c:706
+#: src/gui/gcal-window.c:710
+msgid "Undo"
+msgstr "Angre"
+
+#: data/ui/calendars-page.ui:97
+msgid "Add Calendar…"
+msgstr "Legg til kalender …"
+
+#: data/ui/edit-calendar-page.ui:18
+msgid "Account"
+msgstr "Konto"
+
+#: data/ui/edit-calendar-page.ui:43
+msgid "Settings"
+msgstr "Innstillinger"
+
+#: data/ui/edit-calendar-page.ui:64 data/ui/edit-dialog.ui:232
+msgid "Location"
+msgstr "Plassering"
+
+#: data/ui/edit-calendar-page.ui:93
+msgid "Calendar name"
+msgstr "Navn på kalender"
+
+#: data/ui/edit-calendar-page.ui:121 data/ui/new-calendar-page.ui:65
+msgid "Color"
+msgstr "Farge"
+
+#: data/ui/edit-calendar-page.ui:155
+msgid "Display calendar"
+msgstr "Vis kalender"
+
+#: data/ui/edit-calendar-page.ui:175
+msgid "Add new events to this calendar by default"
+msgstr "Legg til nye hendelser i denne kalenderen som forvalg"
+
+#: data/ui/edit-calendar-page.ui:190
+msgid "Remove Calendar"
+msgstr "Fjern kalender"
+
+#: data/ui/edit-dialog.ui:16 data/ui/new-calendar-page.ui:302
+#: data/ui/new-calendar-page.ui:341
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -124,7 +188,7 @@ msgstr "Avbryt"
 msgid "Click to select the calendar"
 msgstr "Klikk for å velge kalender"
 
-#: data/ui/edit-dialog.ui:108 src/gcal-edit-dialog.c:275
+#: data/ui/edit-dialog.ui:108 src/gui/gcal-edit-dialog.c:375
 msgid "Done"
 msgstr "Ferdig"
 
@@ -148,10 +212,6 @@ msgstr "Påminnelser"
 msgid "Notes"
 msgstr "Notater"
 
-#: data/ui/edit-dialog.ui:232 data/ui/source-dialog.ui:563
-msgid "Location"
-msgstr "Plassering"
-
 #: data/ui/edit-dialog.ui:301
 msgid "Time"
 msgstr "Tid"
@@ -316,39 +376,15 @@ msgctxt "shortcut window"
 msgid "Year view"
 msgstr "Årsvisning"
 
-#: data/ui/menus.ui:6 data/ui/menus.ui:36
-msgid "Add Eve_nt…"
-msgstr "Legg til he_ndelse …"
-
-#: data/ui/menus.ui:13
-msgid "_Calendars"
-msgstr "_Kalendere"
-
-#: data/ui/menus.ui:19
-msgid "_Keyboard Shortcuts"
-msgstr "Tastatur_snarveier"
-
-#: data/ui/menus.ui:23
-msgid "_About"
-msgstr "_Om"
-
-#: data/ui/menus.ui:27
-msgid "_Quit"
-msgstr "_Avslutt"
-
-#: data/ui/menus.ui:40
-msgid "_Synchronize"
-msgstr "_Synkroniser"
-
-#: data/ui/menus.ui:49
+#: data/ui/menus.ui:6
 msgid "From Web…"
 msgstr "Fra nettet …"
 
-#: data/ui/menus.ui:53
+#: data/ui/menus.ui:10
 msgid "New Local Calendar…"
 msgstr "Ny lokal kalender …"
 
-#: data/ui/menus.ui:57
+#: data/ui/menus.ui:14
 msgid "From File…"
 msgstr "Fra fil …"
 
@@ -356,134 +392,64 @@ msgstr "Fra fil …"
 msgid "New Event…"
 msgstr "Ny hendelse …"
 
+#: data/ui/new-calendar-page.ui:33 data/ui/new-calendar-page.ui:41
+msgid "Calendar Name"
+msgstr "Navn på kalender"
+
+#: data/ui/new-calendar-page.ui:86
+msgid "Import a Calendar"
+msgstr "Importer en kalender"
+
+#: data/ui/new-calendar-page.ui:105
+msgid ""
+"Alternatively, enter the web address of an online calendar you want to "
+"import, or open a supported calendar file."
+msgstr "Oppgi alternativt nettadressen for en kalender på nettet som du ønsker å importere, eller åpne en støttet kalenderfil."
+
+#: data/ui/new-calendar-page.ui:137
+msgid "Open a File"
+msgstr "Åpne en fil"
+
+#: data/ui/new-calendar-page.ui:158
+msgid "Calendars"
+msgstr "Kalendere"
+
+#: data/ui/new-calendar-page.ui:204
+msgid ""
+"If the calendar belongs to one of your online accounts, you can add it "
+"through the <a href=\"GOA\">online account settings</a>."
+msgstr "Hvis kalenderen tilhører en av dine kontoer på nettet kan du legge den til via <a href=\"GOA\">Innstillinger for kontoer på nettet</a>."
+
+#: data/ui/new-calendar-page.ui:240
+msgid "User"
+msgstr "Bruker"
+
+#: data/ui/new-calendar-page.ui:254
+msgid "Password"
+msgstr "Passord"
+
+#: data/ui/new-calendar-page.ui:311
+msgid "Connect"
+msgstr "Koble til"
+
+#: data/ui/new-calendar-page.ui:348 data/ui/quick-add-popover.ui:130
+msgid "Add"
+msgstr "Legg til"
+
 #: data/ui/quick-add-popover.ui:117
 msgid "Edit Details…"
 msgstr "Rediger detaljer …"
 
-#: data/ui/quick-add-popover.ui:130 data/ui/source-dialog.ui:389
-#: data/ui/source-dialog.ui:773
-msgid "Add"
-msgstr "Legg til"
-
-#: data/ui/search-view.ui:76
+#: data/ui/search-popover.ui:76
 msgid "No results found"
 msgstr "Ingen treff"
 
-#: data/ui/search-view.ui:92
+#: data/ui/search-popover.ui:92
 msgid "Try a different search"
 msgstr "Prøv et annet søk"
 
-#: data/ui/source-dialog.ui:53 src/gcal-window.c:1123 src/gcal-window.c:1127
-msgid "Undo"
-msgstr "Angre"
-
-#: data/ui/source-dialog.ui:135
-msgid "Online Accounts"
-msgstr "Kontoer på nettet"
-
-#: data/ui/source-dialog.ui:151
-msgid "Open online account settings"
-msgstr "Åpne innstillinger for kontoer på nettet"
-
-#: data/ui/source-dialog.ui:198
-msgid "Google"
-msgstr "Google"
-
-#: data/ui/source-dialog.ui:209 data/ui/source-dialog.ui:260
-#: data/ui/source-dialog.ui:311
-msgid "Click to set up"
-msgstr "Klikk for å sette opp"
-
-#: data/ui/source-dialog.ui:249
-msgid "Nextcloud"
-msgstr "Nextcloud"
-
-#: data/ui/source-dialog.ui:300
-msgid "Microsoft Exchange"
-msgstr "Microsoft Exchange"
-
-#: data/ui/source-dialog.ui:346 data/ui/source-dialog.ui:682
-msgid "Calendars"
-msgstr "Kalendere"
-
-#: data/ui/source-dialog.ui:421
-msgid "Overview"
-msgstr "Oversikt"
-
-#: data/ui/source-dialog.ui:441
-msgid "Add new events to this calendar by default"
-msgstr "Legg til nye hendelser i denne kalenderen som forvalg"
-
-#: data/ui/source-dialog.ui:454
-msgid "Remove Calendar"
-msgstr "Fjern kalender"
-
-#: data/ui/source-dialog.ui:483
-msgid "Display calendar"
-msgstr "Vis kalender"
-
-#: data/ui/source-dialog.ui:521
-msgid "Calendar name"
-msgstr "Navn på kalender"
-
-#: data/ui/source-dialog.ui:535
-msgid "Color"
-msgstr "Farge"
-
-#: data/ui/source-dialog.ui:549
-msgid "Account"
-msgstr "Konto"
-
-#: data/ui/source-dialog.ui:587
-msgid "Settings"
-msgstr "Innstillinger"
-
-#: data/ui/source-dialog.ui:618
-msgid "Edit Calendar"
-msgstr "Rediger kalender"
-
-#: 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="
-"\"GOA\">online account settings</a>."
-msgstr ""
-"Skriv inn adressen til kalenderen du vil legge til. Hvis kalenderen tilhører "
-"en av dine kontoer på nettet kan du legge den til via <a href=\"GOA"
-"\">Innstillinger for kontoer på nettet</a>."
-
-#: data/ui/source-dialog.ui:646
-msgid "Calendar Address"
-msgstr "Adresse til kalender"
-
-#: data/ui/source-dialog.ui:729 src/gcal-source-dialog.c:2281
-#: src/gcal-source-dialog.c:2287
-msgid "Add Calendar"
-msgstr "Legg til kalender"
-
-#: 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 "Innstillinger for kalender"
-
-#: data/ui/source-dialog.ui:806
-msgid "User"
-msgstr "Bruker"
-
-#: data/ui/source-dialog.ui:820
-msgid "Password"
-msgstr "Passord"
-
-#: data/ui/source-dialog.ui:866
-msgid "Enter your credentials"
-msgstr "Oppgi påloggingsinformasjon"
-
-#: data/ui/source-dialog.ui:878
-msgid "Connect"
-msgstr "Koble til"
-
-#: data/ui/time-selector.ui:9 src/views/gcal-week-grid.c:770
-#: src/views/gcal-week-view.c:291
+#: data/ui/time-selector.ui:9 src/views/gcal-week-grid.c:756
+#: src/views/gcal-week-view.c:315
 msgid "00:00"
 msgstr "00:00"
 
@@ -491,240 +457,311 @@ 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:474
 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:474
 msgid "PM"
 msgstr "PM"
 
-#: data/ui/window.ui:64
+#: data/ui/weather-settings.ui:12 data/ui/window.ui:318
+msgid "_Weather"
+msgstr "_Vær"
+
+#: data/ui/weather-settings.ui:30
+msgid "Show Weather"
+msgstr "Vis vær"
+
+#: data/ui/weather-settings.ui:53
+msgid "Automatic Location"
+msgstr "Automatisk lokasjon"
+
+#: data/ui/window.ui:43
 msgid "Week"
 msgstr "Uke"
 
-#: data/ui/window.ui:79
+#: data/ui/window.ui:58
 msgid "Month"
 msgstr "Måned"
 
-#: data/ui/window.ui:93
+#: data/ui/window.ui:72
 msgid "Year"
 msgstr "År"
 
-#: 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:169
+msgctxt "tooltip"
+msgid "Add a new event"
+msgstr "Legg til en ny hendelse"
+
+#: data/ui/window.ui:180 data/ui/year-view.ui:88 src/views/gcal-year-view.c:279
+#: src/views/gcal-year-view.c:516
 msgid "Today"
 msgstr "I dag"
 
-#: data/ui/window.ui:261
+#: data/ui/window.ui:258
 msgid "Manage your calendars"
 msgstr "Håndter dine kalendere"
 
-#: data/ui/window.ui:278
+#: data/ui/window.ui:269
 msgctxt "tooltip"
 msgid "Search for events"
 msgstr "Søk etter hendelser"
 
-#: data/ui/year-view.ui:95
+#: data/ui/window.ui:309
+msgid "_Online Accounts…"
+msgstr "K_ontoer på nettet …"
+
+#: data/ui/window.ui:333
+msgid "_Keyboard Shortcuts"
+msgstr "Tastatur_snarveier"
+
+#: data/ui/window.ui:342
+msgid "_About Calendar"
+msgstr "_Om Kalender"
+
+#: data/ui/year-view.ui:133
 msgid "No events"
 msgstr "Ingen hendelser"
 
-#: data/ui/year-view.ui:117
+#: data/ui/year-view.ui:155
 msgid "Add Event…"
 msgstr "Legg til hendelse …"
 
-#: src/gcal-application.c:85
+#. Translators: %1$s is the start date and %2$s is the end date.
+#: src/core/gcal-event.c:1849
+#, c-format
+msgid "%1$s — %2$s"
+msgstr "%1$s – %2$s"
+
+#.
+#. * Translators: %1$s is the start date, %2$s is the start time,
+#. * %3$s is the end date, and %4$s is the end time.
+#.
+#: src/core/gcal-event.c:1857
+#, c-format
+msgid "%1$s %2$s — %3$s %4$s"
+msgstr "%1$s %2$s – %3$s %4$s"
+
+#. Translators: %1$s is a date, %2$s is the start hour, and %3$s is the end hour
+#. Translators: %1$s is the event name, %2$s is the start hour, and %3$s is the end hour
+#: src/core/gcal-event.c:1873 src/gui/gcal-quick-add-popover.c:470
+#, c-format
+msgid "%1$s, %2$s – %3$s"
+msgstr "%1$s, %2$s – %3$s"
+
+#: src/gui/calendar-management/gcal-calendars-page.c:358
+msgid "Manage Calendars"
+msgstr "Håndter kalendere"
+
+#. Update notification label
+#: src/gui/calendar-management/gcal-calendars-page.c:388
+#, c-format
+msgid "Calendar <b>%s</b> removed"
+msgstr "Kalender <b>%s</b> fjernet"
+
+#: src/gui/calendar-management/gcal-new-calendar-page.c:491
+msgid "New Calendar"
+msgstr "Ny kalender"
+
+#: src/gui/calendar-management/gcal-new-calendar-page.c:652
+msgid "Calendar files"
+msgstr "Kalenderfiler"
+
+#: src/gui/gcal-application.c:63
+msgid "Quit GNOME Calendar"
+msgstr "Avslutt GNOME kalender"
+
+#: src/gui/gcal-application.c:68
 msgid "Display version number"
 msgstr "Vis versjonsnummer"
 
-#: src/gcal-application.c:90
+#: src/gui/gcal-application.c:73
 msgid "Enable debug messages"
 msgstr "Slå på feilsøkingsmeldinger"
 
-#: src/gcal-application.c:95
+#: src/gui/gcal-application.c:78
 msgid "Open calendar on the passed date"
 msgstr "Åpne kalender på passert dato"
 
-#: src/gcal-application.c:100
+#: src/gui/gcal-application.c:83
 msgid "Open calendar showing the passed event"
 msgstr "Åpne kalender som viser passert hendelse"
 
-#: src/gcal-application.c:454
+#: src/gui/gcal-application.c:234
 #, c-format
-msgid "Copyright © %d The Calendar authors"
-msgstr "Opphavsrett © %d Kalender-utviklerne"
+msgid "Copyright © 2012–%d The Calendar authors"
+msgstr "Opphavsrett © 2012–%d Kalender-utviklerne"
 
-#: src/gcal-application.c:460
-#, c-format
-msgid "Copyright © %d–%d The Calendar authors"
-msgstr "Opphavsrett © %d–%d Kalender-utviklerne"
-
-#: src/gcal-application.c:473
+#: src/gui/gcal-application.c:286
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
 "Åka Sikrom <a4NOSPAMPLEASETHANKYOU@hush.com"
 
-#: src/gcal-edit-dialog.c:275
+#: src/gui/gcal-edit-dialog.c:375
 msgid "Save"
 msgstr "Lagre"
 
-#: src/gcal-edit-dialog.c:1000
+#: src/gui/gcal-edit-dialog.c:530
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
 msgstr[0] "%d minutt før"
 msgstr[1] "%d minutter før"
 
-#: src/gcal-edit-dialog.c:1008
+#: src/gui/gcal-edit-dialog.c:538
 #, c-format
 msgid "%d hour before"
 msgid_plural "%d hours before"
 msgstr[0] "%d time før"
 msgstr[1] "%d timer før"
 
-#: src/gcal-edit-dialog.c:1016
+#: src/gui/gcal-edit-dialog.c:546
 #, c-format
 msgid "%d day before"
 msgid_plural "%d days before"
 msgstr[0] "%d dag før"
 msgstr[1] "%d dager før"
 
-#: src/gcal-edit-dialog.c:1024
+#: src/gui/gcal-edit-dialog.c:554
 #, c-format
 msgid "%d week before"
 msgid_plural "%d weeks before"
 msgstr[0] "%d uke før"
 msgstr[1] "%d uker før"
 
-#: src/gcal-edit-dialog.c:1328 src/gcal-quick-add-popover.c:680
+#: src/gui/gcal-edit-dialog.c:1477 src/gui/gcal-quick-add-popover.c:687
 msgid "Unnamed event"
 msgstr "Hendelse uten navn"
 
 #. Translators: %s is the location of the event (e.g. "Downtown, 3rd Avenue")
-#: src/gcal-event-widget.c:390
+#: src/gui/gcal-event-widget.c:428
 #, c-format
 msgid "At %s"
 msgstr "Kl. %s"
 
-#: src/gcal-quick-add-popover.c:119
+#: src/gui/gcal-quick-add-popover.c:117
 #, c-format
 msgid "%s (this calendar is read-only)"
 msgstr "%s (denne kalenderen er skrivebeskyttet)"
 
-#: src/gcal-quick-add-popover.c:244
+#: src/gui/gcal-quick-add-popover.c:244
 msgid "from next Monday"
 msgstr "fra neste mandag"
 
-#: src/gcal-quick-add-popover.c:245
+#: src/gui/gcal-quick-add-popover.c:245
 msgid "from next Tuesday"
 msgstr "fra neste tirsdag"
 
-#: src/gcal-quick-add-popover.c:246
+#: src/gui/gcal-quick-add-popover.c:246
 msgid "from next Wednesday"
 msgstr "fra neste onsdag"
 
-#: src/gcal-quick-add-popover.c:247
+#: src/gui/gcal-quick-add-popover.c:247
 msgid "from next Thursday"
 msgstr "fra neste torsdag"
 
-#: src/gcal-quick-add-popover.c:248
+#: src/gui/gcal-quick-add-popover.c:248
 msgid "from next Friday"
 msgstr "fra neste fredag"
 
-#: src/gcal-quick-add-popover.c:249
+#: src/gui/gcal-quick-add-popover.c:249
 msgid "from next Saturday"
 msgstr "fra neste lørdag"
 
-#: src/gcal-quick-add-popover.c:250
+#: src/gui/gcal-quick-add-popover.c:250
 msgid "from next Sunday"
 msgstr "fra neste søndag"
 
-#: src/gcal-quick-add-popover.c:255
+#: src/gui/gcal-quick-add-popover.c:255
 msgid "to next Monday"
 msgstr "til neste mandag"
 
-#: src/gcal-quick-add-popover.c:256
+#: src/gui/gcal-quick-add-popover.c:256
 msgid "to next Tuesday"
 msgstr "til neste tirsdag"
 
-#: src/gcal-quick-add-popover.c:257
+#: src/gui/gcal-quick-add-popover.c:257
 msgid "to next Wednesday"
 msgstr "til neste onsdag"
 
-#: src/gcal-quick-add-popover.c:258
+#: src/gui/gcal-quick-add-popover.c:258
 msgid "to next Thursday"
 msgstr "til neste torsdag"
 
-#: src/gcal-quick-add-popover.c:259
+#: src/gui/gcal-quick-add-popover.c:259
 msgid "to next Friday"
 msgstr "til neste fredag"
 
-#: src/gcal-quick-add-popover.c:260
+#: src/gui/gcal-quick-add-popover.c:260
 msgid "to next Saturday"
 msgstr "til neste lørdag"
 
-#: src/gcal-quick-add-popover.c:261
+#: src/gui/gcal-quick-add-popover.c:261
 msgid "to next Sunday"
 msgstr "til neste søndag"
 
-#: src/gcal-quick-add-popover.c:266
+#: src/gui/gcal-quick-add-popover.c:266
 msgid "January"
 msgstr "Januar"
 
-#: src/gcal-quick-add-popover.c:267
+#: src/gui/gcal-quick-add-popover.c:267
 msgid "February"
 msgstr "Februar"
 
-#: src/gcal-quick-add-popover.c:268
+#: src/gui/gcal-quick-add-popover.c:268
 msgid "March"
 msgstr "Mars"
 
-#: src/gcal-quick-add-popover.c:269
+#: src/gui/gcal-quick-add-popover.c:269
 msgid "April"
 msgstr "April"
 
-#: src/gcal-quick-add-popover.c:270
+#: src/gui/gcal-quick-add-popover.c:270
 msgid "May"
 msgstr "Mai"
 
-#: src/gcal-quick-add-popover.c:271
+#: src/gui/gcal-quick-add-popover.c:271
 msgid "June"
 msgstr "Juni"
 
-#: src/gcal-quick-add-popover.c:272
+#: src/gui/gcal-quick-add-popover.c:272
 msgid "July"
 msgstr "Juli"
 
-#: src/gcal-quick-add-popover.c:273
+#: src/gui/gcal-quick-add-popover.c:273
 msgid "August"
 msgstr "August"
 
-#: src/gcal-quick-add-popover.c:274
+#: src/gui/gcal-quick-add-popover.c:274
 msgid "September"
 msgstr "September"
 
-#: src/gcal-quick-add-popover.c:275
+#: src/gui/gcal-quick-add-popover.c:275
 msgid "October"
 msgstr "Oktober"
 
-#: src/gcal-quick-add-popover.c:276
+#: src/gui/gcal-quick-add-popover.c:276
 msgid "November"
 msgstr "November"
 
-#: src/gcal-quick-add-popover.c:277
+#: src/gui/gcal-quick-add-popover.c:277
 msgid "December"
 msgstr "Desember"
 
-#: src/gcal-quick-add-popover.c:286
+#: src/gui/gcal-quick-add-popover.c:286
+#, c-format
 msgid "from Today"
 msgstr "fra i dag"
 
-#: src/gcal-quick-add-popover.c:290
+#: src/gui/gcal-quick-add-popover.c:290
+#, c-format
 msgid "from Tomorrow"
 msgstr "fra i morgen"
 
-#: src/gcal-quick-add-popover.c:294
+#: src/gui/gcal-quick-add-popover.c:294
+#, c-format
 msgid "from Yesterday"
 msgstr "fra i går"
 
@@ -732,20 +769,23 @@ msgstr "fra i går"
 #. * 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
+#: src/gui/gcal-quick-add-popover.c:312
 #, c-format
 msgid "from %1$s %2$s"
 msgstr "fra %1$s %2$s"
 
-#: src/gcal-quick-add-popover.c:323
+#: src/gui/gcal-quick-add-popover.c:323
+#, c-format
 msgid "to Today"
 msgstr "til i dag"
 
-#: src/gcal-quick-add-popover.c:327
+#: src/gui/gcal-quick-add-popover.c:327
+#, c-format
 msgid "to Tomorrow"
 msgstr "til i morgen"
 
-#: src/gcal-quick-add-popover.c:331
+#: src/gui/gcal-quick-add-popover.c:331
+#, c-format
 msgid "to Yesterday"
 msgstr "til i går"
 
@@ -753,179 +793,140 @@ msgstr "til i går"
 #. * 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
+#: src/gui/gcal-quick-add-popover.c:349
 #, c-format
 msgid "to %1$s %2$s"
 msgstr "til %1$s %2$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
+#: src/gui/gcal-quick-add-popover.c:356
 #, c-format
 msgid "New Event %1$s %2$s"
 msgstr "Ny hendelse %1$s %2$s"
 
-#: src/gcal-quick-add-popover.c:373
+#: src/gui/gcal-quick-add-popover.c:373
+#, c-format
 msgid "New Event Today"
 msgstr "Ny hendelse i dag"
 
-#: src/gcal-quick-add-popover.c:377
+#: src/gui/gcal-quick-add-popover.c:377
+#, c-format
 msgid "New Event Tomorrow"
 msgstr "Ny hendelse i morgen"
 
-#: src/gcal-quick-add-popover.c:381
+#: src/gui/gcal-quick-add-popover.c:381
+#, c-format
 msgid "New Event Yesterday"
 msgstr "Ny hendelse i går"
 
-#: src/gcal-quick-add-popover.c:387
+#: src/gui/gcal-quick-add-popover.c:387
 msgid "New Event next Monday"
 msgstr "Ny hendelse neste mandag"
 
-#: src/gcal-quick-add-popover.c:388
+#: src/gui/gcal-quick-add-popover.c:388
 msgid "New Event next Tuesday"
 msgstr "Ny hendelse neste tirsdag"
 
-#: src/gcal-quick-add-popover.c:389
+#: src/gui/gcal-quick-add-popover.c:389
 msgid "New Event next Wednesday"
 msgstr "Ny hendelse neste onsdag"
 
-#: src/gcal-quick-add-popover.c:390
+#: src/gui/gcal-quick-add-popover.c:390
 msgid "New Event next Thursday"
 msgstr "Ny hendelse neste torsdag"
 
-#: src/gcal-quick-add-popover.c:391
+#: src/gui/gcal-quick-add-popover.c:391
 msgid "New Event next Friday"
 msgstr "Ny hendelse neste fredag"
 
-#: src/gcal-quick-add-popover.c:392
+#: src/gui/gcal-quick-add-popover.c:392
 msgid "New Event next Saturday"
 msgstr "Ny hendelse neste lørdag"
 
-#: src/gcal-quick-add-popover.c:393
+#: src/gui/gcal-quick-add-popover.c:393
 msgid "New Event next Sunday"
 msgstr "Ny hendelse neste søndag"
 
 #. Translators: %d is the numeric day of month
-#: src/gcal-quick-add-popover.c:405
+#: src/gui/gcal-quick-add-popover.c:405
 #, c-format
 msgid "New Event on January %d"
 msgstr "Ny hendelse %d januar"
 
-#: src/gcal-quick-add-popover.c:406
+#: src/gui/gcal-quick-add-popover.c:406
 #, c-format
 msgid "New Event on February %d"
 msgstr "Ny hendelse %d februar"
 
-#: src/gcal-quick-add-popover.c:407
+#: src/gui/gcal-quick-add-popover.c:407
 #, c-format
 msgid "New Event on March %d"
 msgstr "Ny hendelse %d mars"
 
-#: src/gcal-quick-add-popover.c:408
+#: src/gui/gcal-quick-add-popover.c:408
 #, c-format
 msgid "New Event on April %d"
 msgstr "Ny hendelse %d april"
 
-#: src/gcal-quick-add-popover.c:409
+#: src/gui/gcal-quick-add-popover.c:409
 #, c-format
 msgid "New Event on May %d"
 msgstr "Ny hendelse %d mai"
 
-#: src/gcal-quick-add-popover.c:410
+#: src/gui/gcal-quick-add-popover.c:410
 #, c-format
 msgid "New Event on June %d"
 msgstr "Ny hendelse %d juni"
 
-#: src/gcal-quick-add-popover.c:411
+#: src/gui/gcal-quick-add-popover.c:411
 #, c-format
 msgid "New Event on July %d"
 msgstr "Ny hendelse %d juli"
 
-#: src/gcal-quick-add-popover.c:412
+#: src/gui/gcal-quick-add-popover.c:412
 #, c-format
 msgid "New Event on August %d"
 msgstr "Ny hendelse %d august"
 
-#: src/gcal-quick-add-popover.c:413
+#: src/gui/gcal-quick-add-popover.c:413
 #, c-format
 msgid "New Event on September %d"
 msgstr "Ny hendelse %d september"
 
-#: src/gcal-quick-add-popover.c:414
+#: src/gui/gcal-quick-add-popover.c:414
 #, c-format
 msgid "New Event on October %d"
 msgstr "Ny hendelse %d oktober"
 
-#: src/gcal-quick-add-popover.c:415
+#: src/gui/gcal-quick-add-popover.c:415
 #, c-format
 msgid "New Event on November %d"
 msgstr "Ny hendelse %d november"
 
-#: src/gcal-quick-add-popover.c:416
+#: src/gui/gcal-quick-add-popover.c:416
 #, c-format
 msgid "New Event on December %d"
 msgstr "Ny hendelse %d desember"
 
-#. 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 "Hele dagen"
-
-#: src/gcal-search-view.c:563
-msgid "Use the entry above to search for events."
-msgstr "Bruk elementet ovenfor for å søke etter hendelser."
-
-#. Dialog
-#: src/gcal-source-dialog.c:1155
-msgid "Select a calendar file"
-msgstr "Velg en kalenderfil"
-
-#: src/gcal-source-dialog.c:1159
-msgid "Open"
-msgstr "Åpne"
-
-#: src/gcal-source-dialog.c:1166
-msgid "Calendar files"
-msgstr "Kalenderfiler"
-
-#. update the source properties
-#: src/gcal-source-dialog.c:1200
-msgid "Unnamed Calendar"
-msgstr "Kalender uten navn"
-
-#. Update notification label
-#: src/gcal-source-dialog.c:1806
-#, c-format
-msgid "Calendar <b>%s</b> removed"
-msgstr "Kalender <b>%s</b> fjernet"
-
-#: src/gcal-source-dialog.c:1855 src/gcal-source-dialog.c:1911
-msgid "Off"
-msgstr "Av"
-
-#: src/gcal-source-dialog.c:1855 src/gcal-source-dialog.c:1911
-msgid "On"
-msgstr "På"
-
-#: src/gcal-source-dialog.c:1910
-msgid "Expired"
-msgstr "Utløpt"
-
-#: src/gcal-time-selector.c:84
+#: src/gui/gcal-time-selector.c:83
 #, c-format
 msgid "%s AM"
 msgstr "%s AM"
 
-#: src/gcal-time-selector.c:86
+#: src/gui/gcal-time-selector.c:85
 #, c-format
 msgid "%s PM"
 msgstr "%s PM"
 
-#: src/gcal-utils.c:1188
+#: src/gui/gcal-window.c:706
+msgid "Another event deleted"
+msgstr "Enda en hendelse slettet"
+
+#: src/gui/gcal-window.c:710
+msgid "Event deleted"
+msgstr "Hendelse slettet"
+
+#: src/utils/gcal-utils.c:942
 msgid ""
 "The event you are trying to modify is recurring. The changes you have "
 "selected should be applied to:"
@@ -933,42 +934,34 @@ msgstr ""
 "Hendelsen du prøver å endre er gjeninntreffende. Endringene du gjør bør "
 "brukes på:"
 
-#: src/gcal-utils.c:1191
+#: src/utils/gcal-utils.c:945
 msgid "_Cancel"
 msgstr "A_vbryt"
 
-#: src/gcal-utils.c:1193
+#: src/utils/gcal-utils.c:947
 msgid "_Only This Event"
 msgstr "K_un denne hendelsen"
 
-#: src/gcal-utils.c:1200
+#: src/utils/gcal-utils.c:954
 msgid "_Subsequent events"
 msgstr "_Senere hendelser"
 
-#: src/gcal-utils.c:1202
+#: src/utils/gcal-utils.c:956
 msgid "_All events"
 msgstr "_Alle hendelser"
 
-#: src/gcal-window.c:1123
-msgid "Another event deleted"
-msgstr "Enda en hendelse slettet"
-
-#: src/gcal-window.c:1127
-msgid "Event deleted"
-msgstr "Hendelse slettet"
-
-#: src/views/gcal-week-grid.c:767 src/views/gcal-week-view.c:288
+#: src/views/gcal-week-grid.c:753 src/views/gcal-week-view.c:312
 msgid "00 AM"
 msgstr "00 AM"
 
-#: src/views/gcal-week-header.c:338
+#: src/views/gcal-week-header.c:462
 #, c-format
 msgid "Other event"
 msgid_plural "Other %d events"
 msgstr[0] "Annen hendelse"
 msgstr[1] "%d andre hendelser"
 
-#: src/views/gcal-week-header.c:871
+#: src/views/gcal-week-header.c:998
 #, c-format
 msgid "week %d"
 msgstr "uke %d"
@@ -976,13 +969,13 @@ msgstr "uke %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: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:291 src/views/gcal-year-view.c:513
+#: src/views/gcal-year-view.c:294 src/views/gcal-year-view.c:519
 msgid "%B %d"
 msgstr "%d %B"