diff --git a/po/nb.po b/po/nb.po
index 55881913..9f335213 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,11 +6,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-calendar 0.1\n"
+"Project-Id-Version: gnome-calendar 3.17.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-14 15:53+0200\n"
-"PO-Revision-Date: 2015-05-14 15:54+0200\n"
-"Last-Translator: Åka Sikrom <a4NOSPAMPLEASETHANKYOU@hush.com>\n"
+"POT-Creation-Date: 2015-08-06 16:11+0200\n"
+"PO-Revision-Date: 2015-08-06 16:14+0200\n"
+"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -105,7 +105,8 @@ msgstr "Liste over avslåtte kilder"
 msgid "Sources disabled last time Calendar ran"
 msgstr "Kilder som var slått av forrige gang Kalender kjørte"
 
-#: ../data/ui/edit-dialog.ui.h:1
+#: ../data/ui/edit-dialog.ui.h:1 ../data/ui/source-dialog.ui.h:23
+#: ../src/gcal-source-dialog.c:1131
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -129,11 +130,11 @@ msgstr "Slutter"
 msgid "Notes"
 msgstr "Notater"
 
-#: ../data/ui/edit-dialog.ui.h:7
+#: ../data/ui/edit-dialog.ui.h:7 ../data/ui/source-dialog.ui.h:17
 msgid "Location"
 msgstr "Plassering"
 
-#: ../data/ui/edit-dialog.ui.h:8 ../src/gcal-search-view.c:406
+#: ../data/ui/edit-dialog.ui.h:8 ../src/gcal-search-view.c:407
 msgid "All day"
 msgstr "Hele dagen"
 
@@ -161,13 +162,126 @@ msgstr "_Avslutt"
 msgid "_Synchronize"
 msgstr "_Synkroniser"
 
+#: ../data/ui/menus.ui.h:6
+msgid "From Web…"
+msgstr "Fra nettet …"
+
+#: ../data/ui/menus.ui.h:7
+msgid "New Local Calendar…"
+msgstr "Ny lokal kalender …"
+
+#: ../data/ui/menus.ui.h:8
+msgid "From File…"
+msgstr "Fra fil …"
+
 #: ../data/ui/search-view.ui.h:1
 msgid "No results found"
 msgstr "Ingen treff"
 
 #: ../data/ui/search-view.ui.h:2
-msgid "Use the entry above to search for events."
-msgstr "Bruk elementet ovenfor for å søke etter hendelser."
+msgid "Try a different search"
+msgstr "Prøv et annet søk"
+
+#: ../data/ui/source-dialog.ui.h:1 ../src/gcal-window.c:1240
+#: ../src/gcal-window.c:1244
+msgid "Undo"
+msgstr "Angre"
+
+#: ../data/ui/source-dialog.ui.h:2
+msgid "Online Accounts"
+msgstr "Kontoer på nettet"
+
+#: ../data/ui/source-dialog.ui.h:3
+msgid "Open online account settings"
+msgstr "Åpne innstillinger for kontoer på nettet"
+
+#: ../data/ui/source-dialog.ui.h:4
+msgid "Google"
+msgstr "Google"
+
+#: ../data/ui/source-dialog.ui.h:5
+msgid "Click to set up"
+msgstr "Klikk for å sette opp"
+
+#: ../data/ui/source-dialog.ui.h:6
+msgid "ownCloud"
+msgstr "ownCloud"
+
+#: ../data/ui/source-dialog.ui.h:7
+msgid "Microsoft Exchange"
+msgstr "Microsoft Exchange"
+
+#: ../data/ui/source-dialog.ui.h:8
+msgid "Calendars"
+msgstr "Kalendere"
+
+#: ../data/ui/source-dialog.ui.h:9
+msgid "Add"
+msgstr "Legg til"
+
+#: ../data/ui/source-dialog.ui.h:10
+msgid "Overview"
+msgstr "Oversikt"
+
+#: ../data/ui/source-dialog.ui.h:11
+msgid "Add new events to this calendar by default"
+msgstr ""
+
+#: ../data/ui/source-dialog.ui.h:12
+msgid "Remove Calendar"
+msgstr "Fjern kalender"
+
+#: ../data/ui/source-dialog.ui.h:13
+msgid "Display calendar"
+msgstr "Vis kalender"
+
+#: ../data/ui/source-dialog.ui.h:14
+msgid "Calendar name"
+msgstr "Navn på kalender"
+
+#: ../data/ui/source-dialog.ui.h:15
+msgid "Color"
+msgstr "Farge"
+
+#: ../data/ui/source-dialog.ui.h:16
+msgid "Account"
+msgstr "Konto"
+
+#: ../data/ui/source-dialog.ui.h:18
+msgid "Settings"
+msgstr "Innstillinger"
+
+#: ../data/ui/source-dialog.ui.h:19
+msgid "Edit Calendar"
+msgstr "Rediger kalender"
+
+#: ../data/ui/source-dialog.ui.h:20
+msgid ""
+"Enter the address of the calendar that you want to add. If the calendar "
+"belongs to one of you online accounts, you can add it through the <a href="
+"\"GOA\">online account settings</a>."
+msgstr ""
+
+#: ../data/ui/source-dialog.ui.h:21
+msgid "Calendar Address"
+msgstr "Adresse til kalender"
+
+#: ../data/ui/source-dialog.ui.h:22 ../src/gcal-source-dialog.c:2221
+#: ../src/gcal-source-dialog.c:2227
+msgid "Add Calendar"
+msgstr "Legg til kalender"
+
+#: ../data/ui/source-dialog.ui.h:24
+msgid "User"
+msgstr "Bruker"
+
+#: ../data/ui/source-dialog.ui.h:25
+msgid "Password"
+msgstr "Passord"
+
+#: ../data/ui/source-dialog.ui.h:26
+msgid "Connect"
+msgstr "Koble til"
 
 #: ../data/ui/time-selector.ui.h:1
 msgid "00:00"
@@ -185,11 +299,11 @@ msgstr "AM"
 msgid "PM"
 msgstr "PM"
 
-#: ../data/ui/window.ui.h:1 ../src/gcal-date-selector.c:305
+#: ../data/ui/window.ui.h:1 ../src/gcal-date-selector.c:317
 msgid "Month"
 msgstr "Måned"
 
-#: ../data/ui/window.ui.h:2 ../src/gcal-date-selector.c:307
+#: ../data/ui/window.ui.h:2 ../src/gcal-date-selector.c:319
 msgid "Year"
 msgstr "År"
 
@@ -198,11 +312,16 @@ msgstr "År"
 msgid "Today"
 msgstr "I dag"
 
-#: ../data/ui/window.ui.h:5
+#: ../data/ui/window.ui.h:5 ../src/gcal-source-dialog.c:830
+#: ../src/gcal-source-dialog.c:2254
+msgid "Calendar Settings"
+msgstr "Innstillinger for kalender"
+
+#: ../data/ui/window.ui.h:6
 msgid "Create"
 msgstr "Lag"
 
-#: ../data/ui/window.ui.h:6
+#: ../data/ui/window.ui.h:7
 msgid "Edit Details"
 msgstr "Rediger detaljer"
 
@@ -210,10 +329,58 @@ msgstr "Rediger detaljer"
 msgid "No events"
 msgstr "Ingen hendelser"
 
-#: ../data/ui/year-view.ui.h:3 ../src/gcal-month-view.c:604
+#: ../data/ui/year-view.ui.h:3 ../src/gcal-month-view.c:816
 msgid "Add Event…"
 msgstr "Legg til hendelse …"
 
+#: ../src/gb-scrolled-window.c:254
+msgid "Max Content Height"
+msgstr ""
+
+#: ../src/gb-scrolled-window.c:255
+msgid "The maximum height request that can be made."
+msgstr ""
+
+#: ../src/gb-scrolled-window.c:263
+msgid "Max Content Width"
+msgstr ""
+
+#: ../src/gb-scrolled-window.c:264
+msgid "The maximum width request that can be made."
+msgstr ""
+
+#. Dialog
+#: ../src/gcal-source-dialog.c:1128
+msgid "Select a calendar file"
+msgstr "Velg en kalenderfil"
+
+#: ../src/gcal-source-dialog.c:1132
+msgid "Open"
+msgstr "Åpne"
+
+#: ../src/gcal-source-dialog.c:1139
+msgid "Calendar files"
+msgstr "Kalenderfiler"
+
+#. update the source properties
+#: ../src/gcal-source-dialog.c:1178
+msgid "Unnamed Calendar"
+msgstr "Kalender uten navn"
+
+#. Update notification label
+#: ../src/gcal-source-dialog.c:1781
+#, c-format
+msgid "Calendar <b>%s</b> removed"
+msgstr "Kalender <b>%s</b> fjernet"
+
+#: ../src/gcal-source-dialog.c:1986 ../src/gcal-source-dialog.c:2042
+msgid "Off"
+msgstr "Av"
+
+#: ../src/gcal-source-dialog.c:1986 ../src/gcal-source-dialog.c:2042
+msgid "On"
+msgstr "På"
+
 #: ../src/gcal-application.c:102
 msgid "Display version number"
 msgstr "Vis versjonsnummer"
@@ -244,7 +411,14 @@ msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
 "Åka Sikrom <a4NOSPAMPLEASETHANKYOU@hush.com"
 
-#: ../src/gcal-date-selector.c:303
+#. This string represents day/month/year order for each of the different
+#. * languages. It could possibly be default value, %m/%d/%y placing the month
+#. * before, or any ordering according to the translator's environment.
+#: ../src/gcal-date-selector.c:239
+msgid "%m/%d/%y"
+msgstr "%d.%m.%y"
+
+#: ../src/gcal-date-selector.c:315
 msgid "Day"
 msgstr "Dag"
 
@@ -256,18 +430,22 @@ msgstr "Lagre"
 msgid "Unnamed event"
 msgstr "Hendelse uten navn"
 
-#: ../src/gcal-month-view.c:820
+#: ../src/gcal-month-view.c:1035
 msgid "Other events"
 msgstr "Andre hendelser"
 
-#. TODO: Warning in some languages this string can be too long and may overlap wit the number
-#: ../src/gcal-month-view.c:1203
+#. TODO: Warning: in some languages this string can be too long and may overlap with the number
+#: ../src/gcal-month-view.c:1417
 #, c-format
 msgid "Other event"
 msgid_plural "Other %d events"
 msgstr[0] "Annen hendelse"
 msgstr[1] "%d andre hendelser"
 
+#: ../src/gcal-search-view.c:558
+msgid "Use the entry above to search for events."
+msgstr "Bruk elementet ovenfor for å søke etter hendelser."
+
 #: ../src/gcal-time-selector.c:96
 #, c-format
 msgid "%.2d:%.2d AM"
@@ -293,24 +471,20 @@ msgstr "00:00 PM"
 #. Translators:
 #. * this is the format string for representing a date consisting of a month name
 #. * and a date of month.
-#: ../src/gcal-window.c:642
+#: ../src/gcal-window.c:746
 msgctxt "event date format"
 msgid "%B %d"
 msgstr "%d %B"
 
-#: ../src/gcal-window.c:643
+#: ../src/gcal-window.c:747
 #, c-format
 msgid "New Event on %s"
 msgstr "Ny hendelse %s"
 
-#: ../src/gcal-window.c:1071
+#: ../src/gcal-window.c:1240
 msgid "Another event deleted"
 msgstr "Enda en hendelse slettet"
 
-#: ../src/gcal-window.c:1071 ../src/gcal-window.c:1075
-msgid "Undo"
-msgstr "Angre"
-
-#: ../src/gcal-window.c:1075
+#: ../src/gcal-window.c:1244
 msgid "Event deleted"
 msgstr "Hendelse slettet"