diff --git a/po/nb.po b/po/nb.po
index ed9dff770..a2fe7c77d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 3.1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-18 13:38+0200\n"
-"PO-Revision-Date: 2011-07-18 13:41+0200\n"
+"POT-Creation-Date: 2011-08-16 17:14+0200\n"
+"PO-Revision-Date: 2011-08-16 17:15+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@@ -384,52 +384,15 @@ msgstr "Ukjent"
 msgid "%d-bit"
 msgstr "%d-bit"
 
-#: ../panels/info/cc-info-panel.c:564
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u byte"
-msgstr[1] "%u bytes"
-
-#: ../panels/info/cc-info-panel.c:572
-#, c-format
-msgid "%.1f KB"
-msgstr "%.1f KB"
-
-#: ../panels/info/cc-info-panel.c:577
-#, c-format
-msgid "%.1f MB"
-msgstr "%.1f MB"
-
-#: ../panels/info/cc-info-panel.c:582
-#, c-format
-msgid "%.1f GB"
-msgstr "%.1f GB"
-
-#: ../panels/info/cc-info-panel.c:587
-#, c-format
-msgid "%.1f TB"
-msgstr "%.1f TB"
-
-#: ../panels/info/cc-info-panel.c:592
-#, c-format
-msgid "%.1f PB"
-msgstr "%.1f PB"
-
-#: ../panels/info/cc-info-panel.c:597
-#, c-format
-msgid "%.1f EB"
-msgstr "%.1f EB"
-
-#: ../panels/info/cc-info-panel.c:755
+#: ../panels/info/cc-info-panel.c:706
 msgid "Unknown model"
 msgstr "Ukjent modell"
 
-#: ../panels/info/cc-info-panel.c:838
+#: ../panels/info/cc-info-panel.c:789
 msgid "The next login will attempt to use the standard experience."
 msgstr "Neste pålogging vil forsøke å bruke standard brukeropplevelse."
 
-#: ../panels/info/cc-info-panel.c:840
+#: ../panels/info/cc-info-panel.c:791
 msgid ""
 "The next login will use the fallback mode intended for unsupported graphics "
 "hardware."
@@ -439,36 +402,36 @@ msgstr ""
 
 #. translators: The hardware is not able to run GNOME 3's
 #. * shell, so we use the GNOME "Fallback" session
-#: ../panels/info/cc-info-panel.c:882
+#: ../panels/info/cc-info-panel.c:833
 msgctxt "Experience"
 msgid "Fallback"
 msgstr "Reserveløsning"
 
 #. translators: The hardware is able to run GNOME 3's
 #. * shell, also called "Standard" experience
-#: ../panels/info/cc-info-panel.c:888
+#: ../panels/info/cc-info-panel.c:839
 msgctxt "Experience"
 msgid "Standard"
 msgstr "Standard"
 
-#: ../panels/info/cc-info-panel.c:1028
+#: ../panels/info/cc-info-panel.c:979
 #: ../panels/keyboard/keyboard-shortcuts.c:1762
 msgid "Section"
 msgstr "Seksjon"
 
-#: ../panels/info/cc-info-panel.c:1037 ../panels/info/info.ui.h:13
+#: ../panels/info/cc-info-panel.c:988 ../panels/info/info.ui.h:13
 msgid "Overview"
 msgstr "Oversikt"
 
-#: ../panels/info/cc-info-panel.c:1043 ../panels/info/info.ui.h:2
+#: ../panels/info/cc-info-panel.c:994 ../panels/info/info.ui.h:2
 msgid "Default Applications"
 msgstr "Forvalgte programmer"
 
-#: ../panels/info/cc-info-panel.c:1048 ../panels/info/info.ui.h:9
+#: ../panels/info/cc-info-panel.c:999 ../panels/info/info.ui.h:9
 msgid "Graphics"
 msgstr "Grafikk"
 
-#: ../panels/info/cc-info-panel.c:1212
+#: ../panels/info/cc-info-panel.c:1163
 #, c-format
 msgid "Version %s"
 msgstr "Versjon %s"
@@ -1300,12 +1263,13 @@ msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr "Skriver;Kø;Utskrift;Papir;Blekk;Toner;"
 
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
+#: ../panels/printers/pp-new-printer-dialog.c:142
 msgid "Printers"
 msgstr "Skrivere"
 
 #: ../panels/printers/new-printer-dialog.ui.h:1
-msgid "A_ddress"
-msgstr "A_dresse"
+msgid "A_ddress:"
+msgstr "A_dresse:"
 
 #: ../panels/printers/new-printer-dialog.ui.h:2
 msgid "Add a New Printer"
@@ -1325,37 +1289,56 @@ msgstr "A_vbryt"
 msgid "_Search by Address"
 msgstr "_Søk etter adresse"
 
-#: ../panels/printers/pp-new-printer-dialog.c:493
+#: ../panels/printers/pp-new-printer-dialog.c:627
 msgid "Getting devices..."
 msgstr "Henter enheter …"
 
+#: ../panels/printers/pp-new-printer-dialog.c:1262
+msgid ""
+"FirewallD is not running. Network printer detection needs services mdns, "
+"ipp, ipp-client and samba-client enabled on firewall."
+msgstr "FirewallD kjører ikke. Gjenkjenning av nettverksskrivere krever at tjenestene mDNS, IPP-klient og Samba-klient er aktivert på brannmur."
+
 #. Translators: Column of devices which can be installed
-#: ../panels/printers/pp-new-printer-dialog.c:913
-#: ../panels/printers/pp-new-printer-dialog.c:918
+#: ../panels/printers/pp-new-printer-dialog.c:1282
+#: ../panels/printers/pp-new-printer-dialog.c:1287
 msgid "Devices"
 msgstr "Enheter"
 
 #. Translators: Local means local printers
-#: ../panels/printers/pp-new-printer-dialog.c:943
+#: ../panels/printers/pp-new-printer-dialog.c:1312
+msgctxt "printer type"
 msgid "Local"
 msgstr "Lokal"
 
 #. Translators: Network means network printers
-#: ../panels/printers/pp-new-printer-dialog.c:945
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
+#: ../panels/printers/pp-new-printer-dialog.c:1314
+msgctxt "printer type"
 msgid "Network"
 msgstr "Nettverk"
 
 #. Translators: Device types column (network or local)
-#: ../panels/printers/pp-new-printer-dialog.c:986
+#: ../panels/printers/pp-new-printer-dialog.c:1355
 msgid "Device types"
 msgstr "Typer enhet"
 
 #. Translators: Name of job which makes printer to autoconfigure itself
-#: ../panels/printers/pp-new-printer-dialog.c:1266
+#: ../panels/printers/pp-new-printer-dialog.c:1654
 msgid "Automatic configuration"
 msgstr "Automatisk konfigurasjon"
 
+#: ../panels/printers/pp-new-printer-dialog.c:1750
+msgid "Opening firewall for mDNS connections"
+msgstr "Åpner brannmur for mDNS-tilkoblinger"
+
+#: ../panels/printers/pp-new-printer-dialog.c:1759
+msgid "Opening firewall for Samba connections"
+msgstr "Åpner brannmur for Samba-tilkoblinger"
+
+#: ../panels/printers/pp-new-printer-dialog.c:1768
+msgid "Opening firewall for IPP connections"
+msgstr "Åpner brannmur for IPP-tilkoblinger"
+
 #. Translators: This tab contains list of active print jobs of the selected printer
 #: ../panels/printers/printers.ui.h:2
 msgid "Active Print Jobs"
@@ -1581,7 +1564,7 @@ msgstr "Dine innstillinger"
 msgid "_Options..."
 msgstr "_Alternativer …"
 
-#: ../panels/region/gnome-region-panel-xkblt.c:199
+#: ../panels/region/gnome-region-panel-xkblt.c:210
 msgid "Layout"
 msgstr "Utseende"
 
@@ -1814,35 +1797,39 @@ msgstr ""
 "Nettverkstjenesten for dette systemet er ikke kompatibelt med denne "
 "versjonen."
 
-#: ../panels/network/cc-network-panel.c:2873
+#: ../panels/network/cc-network-panel.c:2872
 msgid "Not connected to the internet."
 msgstr "Ikke koblet til internett."
 
-#: ../panels/network/cc-network-panel.c:2874
+#: ../panels/network/cc-network-panel.c:2873
 msgid "Create the hotspot anyway?"
 msgstr "Lage hotspot likevel?"
 
-#: ../panels/network/cc-network-panel.c:2892
+#: ../panels/network/cc-network-panel.c:2891
 #, c-format
 msgid "Disconnect from %s and create a new hotspot?"
 msgstr "Koble fra %s og lag ny hotspot?"
 
-#: ../panels/network/cc-network-panel.c:2895
+#: ../panels/network/cc-network-panel.c:2894
 msgid "This is your only connection to the internet."
 msgstr "Dette er din eneste tilkobling til internett."
 
-#: ../panels/network/cc-network-panel.c:2913
+#: ../panels/network/cc-network-panel.c:2912
 msgid "Create _Hotspot"
 msgstr "Lag _hotspot"
 
-#: ../panels/network/cc-network-panel.c:2973
+#: ../panels/network/cc-network-panel.c:2972
 msgid "Stop hotspot and disconnect any users?"
 msgstr "Stoppe hotspot og koble fra alle brukere?"
 
-#: ../panels/network/cc-network-panel.c:2976
+#: ../panels/network/cc-network-panel.c:2975
 msgid "_Stop Hotspot"
 msgstr "_Stopp hotspot"
 
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
+msgid "Network"
+msgstr "Nettverk"
+
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:2
 msgid "Network settings"
 msgstr "Innstillinger for nettverk"
@@ -2099,18 +2086,18 @@ msgstr "Innstillinger for strømstyring"
 msgid "Power;Sleep;Suspend;Hibernate;Battery;"
 msgstr "Strøm;Sove;Hvile;Dvale;Batteri;"
 
-#: ../panels/power/cc-power-panel.c:153
+#: ../panels/power/cc-power-panel.c:160
 msgid "Unknown time"
 msgstr "Ukjent tid"
 
-#: ../panels/power/cc-power-panel.c:159
+#: ../panels/power/cc-power-panel.c:166
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minutt"
 msgstr[1] "%i minutter"
 
-#: ../panels/power/cc-power-panel.c:171
+#: ../panels/power/cc-power-panel.c:178
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -2119,54 +2106,54 @@ msgstr[1] "%i timer"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:179
+#: ../panels/power/cc-power-panel.c:186
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:180
+#: ../panels/power/cc-power-panel.c:187
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: ../panels/power/cc-power-panel.c:181
+#: ../panels/power/cc-power-panel.c:188
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minutter"
 
-#: ../panels/power/cc-power-panel.c:253
+#: ../panels/power/cc-power-panel.c:260
 msgid "Battery charging"
 msgstr "Batteriet lader"
 
-#: ../panels/power/cc-power-panel.c:256
+#: ../panels/power/cc-power-panel.c:263
 msgid "Battery discharging"
 msgstr "Batteriet lades ut"
 
-#: ../panels/power/cc-power-panel.c:267
+#: ../panels/power/cc-power-panel.c:274
 msgid "UPS charging"
 msgstr "UPS lader"
 
-#: ../panels/power/cc-power-panel.c:270
+#: ../panels/power/cc-power-panel.c:277
 msgid "UPS discharging"
 msgstr "UPS lades ut"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:288
+#: ../panels/power/cc-power-panel.c:295
 #, c-format
 msgid "%s until charged (%.0lf%%)"
 msgstr "%s før fullt ladet (%.0lf%%)"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:294
+#: ../panels/power/cc-power-panel.c:301
 #, c-format
 msgid "%s until empty (%.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
-#: ../panels/power/cc-power-panel.c:302
+#: ../panels/power/cc-power-panel.c:309
 #, c-format
 msgid "%.0lf%% charged"
 msgstr "%.0lf%% ladet"
@@ -2916,7 +2903,8 @@ msgstr "Funksjon for å frigi data for egenskapredigerer"
 
 #: ../panels/universal-access/gconf-property-editor.c:189
 msgid "Callback to be issued when property editor object data is to be freed"
-msgstr "Funksjon som skal kjøres når objektdata for egenskapsredigerer skal frigis"
+msgstr ""
+"Funksjon som skal kjøres når objektdata for egenskapsredigerer skal frigis"
 
 #: ../panels/universal-access/gconf-property-editor.c:1474
 #, c-format
@@ -3871,28 +3859,28 @@ msgstr "_Annen finger: "
 msgid "_Right index finger"
 msgstr "Høy_re pekefinger"
 
-#: ../shell/control-center.c:53
+#: ../shell/control-center.c:54
 msgid "Enable verbose mode"
 msgstr "Vis mer informasjon"
 
-#: ../shell/control-center.c:54
+#: ../shell/control-center.c:55
 msgid "Show the overview"
 msgstr "Vis oversikt"
 
-#: ../shell/control-center.c:55 ../shell/control-center.c:56
-#: ../shell/control-center.c:57
+#: ../shell/control-center.c:56 ../shell/control-center.c:57
+#: ../shell/control-center.c:58
 msgid "Show help options"
 msgstr "Vis flagg for hjelp"
 
-#: ../shell/control-center.c:58
+#: ../shell/control-center.c:59
 msgid "Panel to display"
 msgstr "Panel som skal vises"
 
-#: ../shell/control-center.c:80
+#: ../shell/control-center.c:81
 msgid "- System Settings"
 msgstr "- Systeminnstillinger"
 
-#: ../shell/control-center.c:88
+#: ../shell/control-center.c:89
 #, c-format
 msgid ""
 "%s\n"