diff --git a/po/nb.po b/po/nb.po
index 3d4388b9e..e0a7c5d07 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 2.91.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-06 19:05+0100\n"
-"PO-Revision-Date: 2011-02-06 19:09+0100\n"
+"POT-Creation-Date: 2011-02-09 18:06+0100\n"
+"PO-Revision-Date: 2011-02-09 18:09+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@@ -997,180 +997,215 @@ msgid "cd;dvd;usb;audio;video;disc;"
 msgstr "cd;dvd;usb;lyd;video;plate;"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:221
+#: ../panels/printers/cc-printers-panel.c:223
 msgid "Low on toner"
 msgstr "Lite toner"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:223
+#: ../panels/printers/cc-printers-panel.c:225
 msgid "Out of toner"
 msgstr "Ikke mer toner"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:226
+#: ../panels/printers/cc-printers-panel.c:228
 msgid "Low on developer"
 msgstr "Lite utvikler"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:229
+#: ../panels/printers/cc-printers-panel.c:231
 msgid "Out of developer"
 msgstr "Ikke mer utvikler"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:231
+#: ../panels/printers/cc-printers-panel.c:233
 msgid "Low on a marker supply"
 msgstr ""
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:233
+#: ../panels/printers/cc-printers-panel.c:235
 msgid "Out of a marker supply"
 msgstr ""
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:235
+#: ../panels/printers/cc-printers-panel.c:237
 msgid "Open cover"
 msgstr "Åpne lokket"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:237
+#: ../panels/printers/cc-printers-panel.c:239
 msgid "Open door"
 msgstr "Åpne døren"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:239
+#: ../panels/printers/cc-printers-panel.c:241
 msgid "Low on paper"
 msgstr "Lite papir"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:241
+#: ../panels/printers/cc-printers-panel.c:243
 msgid "Out of paper"
 msgstr "Ikke mer papir"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:243
+#: ../panels/printers/cc-printers-panel.c:245
+msgctxt "printer state"
 msgid "Offline"
 msgstr "Frakoblet"
 
 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:245
+#: ../panels/printers/cc-printers-panel.c:247
+msgctxt "printer state"
 msgid "Paused"
-msgstr "Pause"
+msgstr "På pause"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:247
+#: ../panels/printers/cc-printers-panel.c:249
 msgid "Waste receptacle almost full"
 msgstr ""
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:249
+#: ../panels/printers/cc-printers-panel.c:251
 msgid "Waste receptacle full"
 msgstr ""
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:251
+#: ../panels/printers/cc-printers-panel.c:253
 msgid "The optical photo conductor is near end of life"
 msgstr ""
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:253
+#: ../panels/printers/cc-printers-panel.c:255
 msgid "The optical photo conductor is no longer functioning"
 msgstr ""
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:345
+#: ../panels/printers/cc-printers-panel.c:347
+msgctxt "printer state"
 msgid "Idle"
 msgstr "Ledig"
 
 #. Translators: Printer's state (jobs are processing)
-#. Translators: Job's state (job is currently printing)
-#: ../panels/printers/cc-printers-panel.c:349
-#: ../panels/printers/cc-printers-panel.c:885
+#: ../panels/printers/cc-printers-panel.c:351
+msgctxt "printer state"
 msgid "Processing"
 msgstr "Prosesserer"
 
 #. Translators: Printer's state (no jobs can be processed)
-#. Translators: Job's state (job has been stopped)
-#: ../panels/printers/cc-printers-panel.c:353
-#: ../panels/printers/cc-printers-panel.c:889
+#: ../panels/printers/cc-printers-panel.c:355
+msgctxt "printer state"
 msgid "Stopped"
 msgstr "Stoppet"
 
+#. Translators: Toner supply
+#: ../panels/printers/cc-printers-panel.c:453
+msgid "Toner Level"
+msgstr "Tonernivå"
+
+#. Translators: Ink supply
+#: ../panels/printers/cc-printers-panel.c:456
+msgid "Ink Level"
+msgstr "Blekknivå"
+
+#. Translators: By supply we mean ink, toner, staples, water, ...
+#: ../panels/printers/cc-printers-panel.c:459
+msgid "Supply Level"
+msgstr ""
+
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:466
+#: ../panels/printers/cc-printers-panel.c:474
 #, c-format
-msgid "%d active"
-msgstr "%d aktive"
+msgid "%u active"
+msgid_plural "%u active"
+msgstr[0] "%u aktiv"
+msgstr[1] "%u aktive"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/cc-printers-panel.c:877
+#: ../panels/printers/cc-printers-panel.c:885
+msgctxt "print job"
 msgid "Pending"
 msgstr "Utestående"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/cc-printers-panel.c:881
+#: ../panels/printers/cc-printers-panel.c:889
+msgctxt "print job"
 msgid "Held"
 msgstr "På hold"
 
-#. Translators: Job's state (job has been canceled)
+#. Translators: Job's state (job is currently printing)
 #: ../panels/printers/cc-printers-panel.c:893
+msgctxt "print job"
+msgid "Processing"
+msgstr "Prosesserer"
+
+#. Translators: Job's state (job has been stopped)
+#: ../panels/printers/cc-printers-panel.c:897
+msgctxt "print job"
+msgid "Stopped"
+msgstr "Stoppet"
+
+#. Translators: Job's state (job has been canceled)
+#: ../panels/printers/cc-printers-panel.c:901
+msgctxt "print job"
 msgid "Canceled"
 msgstr "Avbrutt"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/cc-printers-panel.c:897
+#: ../panels/printers/cc-printers-panel.c:905
+msgctxt "print job"
 msgid "Aborted"
 msgstr "Avbrutt med feil"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/cc-printers-panel.c:901
+#: ../panels/printers/cc-printers-panel.c:909
+msgctxt "print job"
 msgid "Completed"
 msgstr "Fullført"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/cc-printers-panel.c:996
+#: ../panels/printers/cc-printers-panel.c:1004
 msgid "Job Title"
 msgstr "Jobbtittel"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/cc-printers-panel.c:1004
+#: ../panels/printers/cc-printers-panel.c:1012
 msgid "Job State"
 msgstr "Tilstand for jobb"
 
 #. Translators: Name of column showing names of creators of print jobs
-#: ../panels/printers/cc-printers-panel.c:1010
+#: ../panels/printers/cc-printers-panel.c:1018
 msgid "User"
 msgstr "Bruker"
 
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/cc-printers-panel.c:1016
+#: ../panels/printers/cc-printers-panel.c:1024
 msgid "Time"
 msgstr "Tid"
 
 #. Translators: Program cannot connect to DBus' system bus
-#: ../panels/printers/cc-printers-panel.c:1206
+#: ../panels/printers/cc-printers-panel.c:1214
 #, c-format
 msgid "Could not connect to system bus: %s"
 msgstr "Kunne ikke koble til systembussen: %s"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:1858
+#: ../panels/printers/cc-printers-panel.c:1924
 msgid "Test page"
 msgstr "Testside"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: ../panels/printers/cc-printers-panel.c:1866
+#: ../panels/printers/cc-printers-panel.c:1932
 msgid "Clean print heads"
 msgstr "Rens utskriftshodene"
 
 #. Translators: An error has occured during execution of a CUPS maintenance command
-#: ../panels/printers/cc-printers-panel.c:1871
+#: ../panels/printers/cc-printers-panel.c:1937
 msgid "An error has occured during a maintenance command."
 msgstr "En feil har oppstått under en vedlikeholdskommando."
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:1997
+#: ../panels/printers/cc-printers-panel.c:2063
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Klarte ikke å laste brukergrensesnitt: %s"
@@ -1192,101 +1227,97 @@ msgstr "Skrivere"
 msgid "---"
 msgstr "---"
 
-#: ../panels/printers/printers.ui.h:2
-msgid "0 active"
-msgstr "0 aktive"
-
-#: ../panels/printers/printers.ui.h:3
-msgid "<b>Allowed users</b>"
-msgstr "<b>Tilatte brukere</b>"
-
 #. Translators: This tab contains list of active print jobs of the selected printer
-#: ../panels/printers/printers.ui.h:5
+#: ../panels/printers/printers.ui.h:3
 msgid "Active Print Jobs"
 msgstr "Aktive utskriftsjobber"
 
+#: ../panels/printers/printers.ui.h:4
+msgid "Allowed users"
+msgstr "Tilatte brukere"
+
 #. Translators: Switch back to printer's info tab
-#: ../panels/printers/printers.ui.h:7
+#: ../panels/printers/printers.ui.h:6
 msgid "Back"
 msgstr "Tilbake"
 
 #. Translators: This checkbox is checked when the default printer is selected.
-#: ../panels/printers/printers.ui.h:9
+#: ../panels/printers/printers.ui.h:8
 #: ../panels/region/gnome-region-panel-xkbot.c:229
 #: ../panels/sound/gvc-sound-theme-chooser.c:581
 msgid "Default"
 msgstr "Forvalg"
 
-#: ../panels/printers/printers.ui.h:10
+#: ../panels/printers/printers.ui.h:9
 msgid "IP Address"
 msgstr "IP-adresse"
 
-#: ../panels/printers/printers.ui.h:11
+#: ../panels/printers/printers.ui.h:10
 msgid "Info"
 msgstr "Informasjon"
 
-#: ../panels/printers/printers.ui.h:12
+#: ../panels/printers/printers.ui.h:11
 msgid "Jobs"
 msgstr "Jobber"
 
 #. Translators: Location of the printer (e.g. Lab, 1st floor,...).
-#: ../panels/printers/printers.ui.h:14
+#: ../panels/printers/printers.ui.h:13
 msgid "Location"
 msgstr "Plassering"
 
-#: ../panels/printers/printers.ui.h:15
+#: ../panels/printers/printers.ui.h:14
 msgid "Model"
 msgstr "Modell"
 
 #. Translators: This button opens printer's options tab
-#: ../panels/printers/printers.ui.h:17
+#: ../panels/printers/printers.ui.h:16
 msgid "Options"
 msgstr "Alternativer"
 
 #. Translators: This button executes command which prints test page.
-#: ../panels/printers/printers.ui.h:19
+#: ../panels/printers/printers.ui.h:18
 msgid "Print Test Page"
 msgstr "Skriv ut testside"
 
-#: ../panels/printers/printers.ui.h:20
+#: ../panels/printers/printers.ui.h:19
 msgid "Printer"
 msgstr "Skriver"
 
 #. Translators: This tab contains list of active print jobs of the selected printer
-#: ../panels/printers/printers.ui.h:22
+#: ../panels/printers/printers.ui.h:21
 msgid "Printer Options"
 msgstr "Alternativer for skriver"
 
-#: ../panels/printers/printers.ui.h:23
+#: ../panels/printers/printers.ui.h:22
 msgid "Printing..."
 msgstr "Skriver ut …"
 
 #. Tanslators: Switch to tab containing printer's jobs
-#: ../panels/printers/printers.ui.h:25
+#: ../panels/printers/printers.ui.h:24
 msgid "Show"
 msgstr "Vis"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/printers.ui.h:27
+#: ../panels/printers/printers.ui.h:26
 msgid "Supply"
 msgstr ""
 
 #: ../panels/region/gnome-region-panel.ui.h:1
+msgid "Allow different layouts for each window"
+msgstr "Tillat forskjellige utforminger for hvert vindu"
+
+#: ../panels/region/gnome-region-panel.ui.h:2
 msgid "Install languages..."
 msgstr "Installer språk …"
 
-#: ../panels/region/gnome-region-panel.ui.h:2
+#: ../panels/region/gnome-region-panel.ui.h:3
 msgid "Language"
 msgstr "Språk"
 
-#: ../panels/region/gnome-region-panel.ui.h:3
+#: ../panels/region/gnome-region-panel.ui.h:4
 msgid "Layouts"
 msgstr "Utforminger"
 
-#: ../panels/region/gnome-region-panel.ui.h:4
-msgid "New windows u_se active window's layout"
-msgstr "Nye vinduer bru_ker aktivt vindus utforming"
-
 #: ../panels/region/gnome-region-panel.ui.h:5
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:4
 msgid "Region and Language"
@@ -1309,17 +1340,25 @@ msgid "Select a display language"
 msgstr "Velg et språk"
 
 #: ../panels/region/gnome-region-panel.ui.h:10
+msgid "Use default layout in new windows"
+msgstr "Bruk forvalgt utforming i nye vinduer"
+
+#: ../panels/region/gnome-region-panel.ui.h:11
+msgid "Use previous window's layout in new windows"
+msgstr "Bruk utforming fra forrige vindu i nye vinduer"
+
+#: ../panels/region/gnome-region-panel.ui.h:12
+msgid "Use same layout in all windows"
+msgstr "Bruk samme utforming i alle vinduer"
+
+#: ../panels/region/gnome-region-panel.ui.h:13
 msgid "View and edit keyboard layout options"
 msgstr "Vis og rediger alternativer for tastaturutforming"
 
-#: ../panels/region/gnome-region-panel.ui.h:11
+#: ../panels/region/gnome-region-panel.ui.h:14
 msgid "_Options..."
 msgstr "_Alternativer …"
 
-#: ../panels/region/gnome-region-panel.ui.h:12
-msgid "_Separate layout for each window"
-msgstr "Egen _utforming for hvert vindu"
-
 #: ../panels/region/gnome-region-panel-layout-chooser.ui.h:1
 msgid "Choose a Layout"
 msgstr "Velg en utforming"
@@ -1478,121 +1517,123 @@ msgstr "Sett dine brukervalg for mus og pekeplate"
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;"
 msgstr "Styrepute;Peker;Klikk;Tapp;Dobbel;Knapp;Styrekule;"
 
-#: ../panels/network/cc-network-panel.c:1086
-#: ../panels/network/cc-network-panel.c:1108
-#, c-format
-msgid "%i Mb/s"
-msgstr "%i Mb/s"
-
-#: ../panels/network/cc-network-panel.c:1088
-#, c-format
-msgid "%i Gb/s"
-msgstr "%i Gb/s"
-
-#: ../panels/network/cc-network-panel.c:1106
-#, c-format
-msgid "%i kb/s"
-msgstr "%i kb/s"
-
-#: ../panels/network/cc-network-panel.c:1763
+#: ../panels/network/cc-network-panel.c:819
 msgid "Network proxy"
 msgstr "Nettverksproxy"
 
-#: ../panels/network/cc-network-panel.c:1772
+#: ../panels/network/cc-network-panel.c:828
 msgid "Set the system proxy settings"
 msgstr "Systeminnstillinger for proxy"
 
+#. TRANSLATORS: device type
+#. TRANSLATORS: AP type
 #. TRANSLATORS: device type
 #. TRANSLATORS: AP type
 #: ../panels/network/panel-common.c:65 ../panels/network/panel-common.c:138
+#: ../panels/network/nm-device.c:117 ../panels/network/nm-access-point.c:65
 msgid "Unknown"
 msgstr "Ukjent"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:69
+#: ../panels/network/panel-common.c:69 ../panels/network/nm-device.c:121
 msgid "Wired"
 msgstr "Kablet"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:73
+#: ../panels/network/panel-common.c:73 ../panels/network/nm-device.c:125
 msgid "Wireless"
 msgstr "Trådløs"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:78
+#: ../panels/network/panel-common.c:78 ../panels/network/nm-device.c:130
 msgid "Mobile broadband"
 msgstr "Mobilt bredbånd"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:82
+#: ../panels/network/panel-common.c:82 ../panels/network/nm-device.c:134
 msgid "Bluetooth"
 msgstr "Blåtann"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:86
+#: ../panels/network/panel-common.c:86 ../panels/network/nm-device.c:138
 msgid "Mesh"
 msgstr "Mesh"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:142
+#: ../panels/network/panel-common.c:142 ../panels/network/nm-access-point.c:69
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:146
+#: ../panels/network/panel-common.c:146 ../panels/network/nm-access-point.c:73
 msgid "Infrastructure"
 msgstr "Infrastruktur"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:164
+#: ../panels/network/panel-common.c:164 ../panels/network/nm-device.c:190
 msgid "Status unknown"
 msgstr "Ukjent status"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:168
+#: ../panels/network/panel-common.c:168 ../panels/network/nm-device.c:194
 msgid "Unmanaged"
 msgstr "Ikke administrert"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:172
+#: ../panels/network/panel-common.c:172 ../panels/network/nm-device.c:198
 msgid "Unavailable"
 msgstr "Ikke tilgjengelig"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:176
+#: ../panels/network/panel-common.c:176 ../panels/network/nm-device.c:202
 msgid "Disconnected"
 msgstr "Frakoblet"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:180
+#: ../panels/network/panel-common.c:180 ../panels/network/nm-device.c:206
 msgid "Preparing connection"
 msgstr "Forbereder tilkobling"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:184
+#: ../panels/network/panel-common.c:184 ../panels/network/nm-device.c:210
 msgid "Configuring connection"
 msgstr "Konfigurerer tilkobling"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:188
+#: ../panels/network/panel-common.c:188 ../panels/network/nm-device.c:214
 msgid "Authenticating"
 msgstr "Autentiserer"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:192
+#: ../panels/network/panel-common.c:192 ../panels/network/nm-device.c:218
 msgid "Getting network address"
 msgstr "Henter nettverksadresse"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:196
+#: ../panels/network/panel-common.c:196 ../panels/network/nm-device.c:222
 msgid "Connected"
 msgstr "Tilkoblet"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:200
+#: ../panels/network/panel-common.c:200 ../panels/network/nm-device.c:226
 msgid "Failed to connect"
 msgstr "Klarte ikke å koble til"
 
+#: ../panels/network/nm-device.c:837
+#, c-format
+msgid "%i kb/s"
+msgstr "%i kb/s"
+
+#: ../panels/network/nm-device.c:839 ../panels/network/nm-device.c:856
+#, c-format
+msgid "%i Mb/s"
+msgstr "%i Mb/s"
+
+#: ../panels/network/nm-device.c:858
+#, c-format
+msgid "%i Gb/s"
+msgstr "%i Gb/s"
+
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:1
 msgid "Network"
 msgstr "Nettverk"
@@ -1789,7 +1830,7 @@ msgstr "%s før fullt ladet (%.0lf%%)"
 #: ../panels/power/cc-power-panel.c:292
 #, c-format
 msgid "%s until empty (%.0lf%%)"
-msgstr "%s før tomt (%.0lf%%)"
+msgstr "%s igjen før det er tomt (%.0lf%%)"
 
 #. TRANSLATORS: %1 is a percentage value. Note: this string is only
 #. * used when we don't have a time value