diff --git a/po/ChangeLog b/po/ChangeLog
index dfd76ceaa..8d1b2892a 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-04  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
 2008-09-03  Hendrik Richter  <hendrikr@gnome.org>
 
 	* de.po: Updated German translation.
diff --git a/po/nb.po b/po/nb.po
index 6d149b4b3..92dd87509 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 2.21.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 13:43+0200\n"
-"PO-Revision-Date: 2008-08-27 13:44+0200\n"
+"POT-Creation-Date: 2008-09-04 15:09+0200\n"
+"PO-Revision-Date: 2008-09-04 15:17+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -493,7 +493,9 @@ msgstr "Hjelpeteknologier"
 
 #: ../capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Choose which accessibility features to enable when you log in"
-msgstr "Velg hvilke funksjoner for tilgjengelighet som skal aktiveres når du logger inn"
+msgstr ""
+"Velg hvilke funksjoner for tilgjengelighet som skal aktiveres når du logger "
+"inn"
 
 #: ../capplets/appearance/appearance-desktop.c:629
 msgid "Add Wallpaper"
@@ -1879,9 +1881,7 @@ msgstr "Av"
 msgid "Sound"
 msgstr "Lyd"
 
-#. Desktop
 #: ../capplets/keybindings/01-desktop-key.xml.in.h:1
-#: ../capplets/sound/sound-theme-definition.h:56
 #: ../libslab/bookmark-agent.c:1154
 msgid "Desktop"
 msgstr "Skrivebord"
@@ -1990,7 +1990,9 @@ msgstr "Tastatursnarveier"
 msgid ""
 "To edit a shortcut key, click on the corresponding row and type a new key "
 "combination, or press backspace to clear."
-msgstr "Klikk på tilhørende rad og skriv inn en ny hurtigtast for å redigere en snarveitast, eller trykk slett for å fjerne."
+msgstr ""
+"Klikk på tilhørende rad og skriv inn en ny hurtigtast for å redigere en "
+"snarveitast, eller trykk slett for å fjerne."
 
 #: ../capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
@@ -2752,77 +2754,100 @@ msgstr "Av_spilling av lyd:"
 
 #. Bell
 #: ../capplets/sound/sound-theme-definition.h:46
+msgctxt "Sound event"
 msgid "Alert sound"
 msgstr "Varsellyd"
 
 #: ../capplets/sound/sound-theme-definition.h:47
+msgctxt "Sound event"
 msgid "Visual alert"
 msgstr "Synlig varsling"
 
 #. Windows and buttons
 #: ../capplets/sound/sound-theme-definition.h:49
+msgctxt "Sound event"
 msgid "Windows and Buttons"
 msgstr "Vinduer og knapper"
 
 #: ../capplets/sound/sound-theme-definition.h:50
+msgctxt "Sound event"
 msgid "Button clicked"
 msgstr "Klikk på knapp"
 
 #: ../capplets/sound/sound-theme-definition.h:51
+msgctxt "Sound event"
 msgid "Toggle button clicked"
 msgstr "Vendebryter klikket"
 
 #: ../capplets/sound/sound-theme-definition.h:52
+msgctxt "Sound event"
 msgid "Window maximized"
 msgstr "Vindu maksimert"
 
 #: ../capplets/sound/sound-theme-definition.h:53
+msgctxt "Sound event"
 msgid "Window unmaximized"
 msgstr "Vindu gjenopprettet"
 
 #: ../capplets/sound/sound-theme-definition.h:54
+msgctxt "Sound event"
 msgid "Window minimised"
 msgstr "Vinduer minimert"
 
+#. Desktop
+#: ../capplets/sound/sound-theme-definition.h:56
+msgctxt "Sound event"
+msgid "Desktop"
+msgstr "Skrivebord"
+
 #: ../capplets/sound/sound-theme-definition.h:57
+msgctxt "Sound event"
 msgid "Login"
 msgstr "Innlogging"
 
 #: ../capplets/sound/sound-theme-definition.h:58
-#: ../libslab/bookmark-agent.c:1060
+msgctxt "Sound event"
 msgid "Logout"
 msgstr "Utlogging"
 
 #: ../capplets/sound/sound-theme-definition.h:59
+msgctxt "Sound event"
 msgid "New e-mail"
 msgstr "Ny e-post"
 
 #: ../capplets/sound/sound-theme-definition.h:60
+msgctxt "Sound event"
 msgid "Empty trash"
 msgstr "Tøm papirkurv"
 
 #: ../capplets/sound/sound-theme-definition.h:61
+msgctxt "Sound event"
 msgid "Long action completed (download, CD burning, etc.)"
 msgstr "Lang handling fullført (nedlasting, brenning av CD osv.)"
 
 #. Alerts?
 #: ../capplets/sound/sound-theme-definition.h:63
+msgctxt "Sound event"
 msgid "Alerts"
 msgstr "Varsling"
 
 #: ../capplets/sound/sound-theme-definition.h:64
+msgctxt "Sound event"
 msgid "Information or question"
 msgstr "Informasjon eller spørsmål"
 
 #: ../capplets/sound/sound-theme-definition.h:65
+msgctxt "Sound event"
 msgid "Warning"
 msgstr "Advarsel"
 
 #: ../capplets/sound/sound-theme-definition.h:66
+msgctxt "Sound event"
 msgid "Error"
 msgstr "Feil"
 
 #: ../capplets/sound/sound-theme-definition.h:67
+msgctxt "Sound event"
 msgid "Battery warning"
 msgstr "Batterivarsel"
 
@@ -2976,6 +3001,10 @@ msgstr "Annet"
 msgid "Lock Screen"
 msgstr "Lås skjerm"
 
+#: ../libslab/bookmark-agent.c:1060
+msgid "Logout"
+msgstr "Utlogging"
+
 #: ../libslab/bookmark-agent.c:1062
 msgid "Shutdown"
 msgstr "Slå av"