[gnome-control-center] Updated Norwegian bokmÃl translation

[Kjartan Maraas <kmaraas src gnome org>]

commit f05f74c132ad3fa4bd6002e392e7eb5227da8121
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Mon Nov 5 18:28:34 2012 +0100

    Updated Norwegian bokmÃl translation

 po/nb.po |  374 ++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 208 insertions(+), 166 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 6adddaa..7889496 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 3.7.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-13 12:34+0200\n"
-"PO-Revision-Date: 2012-10-13 12:38+0200\n"
+"POT-Creation-Date: 2012-11-05 18:22+0100\n"
+"PO-Revision-Date: 2012-11-05 18:28+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmÃl <i18n-nb lister ping uio no>\n"
 "Language: \n"
@@ -96,7 +96,7 @@ msgstr "%d x %d"
 msgid "No Desktop Background"
 msgstr "Ingen skrivebordsbakgrunn"
 
-#: ../panels/background/cc-background-panel.c:435
+#: ../panels/background/cc-background-panel.c:449
 msgid "Current background"
 msgstr "NÃvÃrende bakgrunn"
 
@@ -860,26 +860,26 @@ msgid "VESA: %s"
 msgstr "VESA: %s"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:437 ../panels/network/panel-common.c:119
+#: ../panels/info/cc-info-panel.c:437 ../panels/network/panel-common.c:120
 msgid "Unknown"
 msgstr "Ukjent"
 
 #. translators: This is the type of architecture, for example:
 #. * "64-bit" or "32-bit"
-#: ../panels/info/cc-info-panel.c:593
+#: ../panels/info/cc-info-panel.c:575
 #, c-format
 msgid "%d-bit"
 msgstr "%d-bit"
 
-#: ../panels/info/cc-info-panel.c:752
+#: ../panels/info/cc-info-panel.c:734
 msgid "Unknown model"
 msgstr "Ukjent modell"
 
-#: ../panels/info/cc-info-panel.c:835
+#: ../panels/info/cc-info-panel.c:817
 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:837
+#: ../panels/info/cc-info-panel.c:819
 msgid ""
 "The next login will use the fallback mode intended for unsupported graphics "
 "hardware."
@@ -889,51 +889,51 @@ 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:879
+#: ../panels/info/cc-info-panel.c:861
 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:885
+#: ../panels/info/cc-info-panel.c:867
 msgctxt "Experience"
 msgid "Standard"
 msgstr "Standard"
 
-#: ../panels/info/cc-info-panel.c:1227
+#: ../panels/info/cc-info-panel.c:1329
 msgid "Ask what to do"
 msgstr "SpÃr hvs som skal gjÃres"
 
-#: ../panels/info/cc-info-panel.c:1231
+#: ../panels/info/cc-info-panel.c:1333
 msgid "Do nothing"
 msgstr "Ikke gjÃr noe"
 
-#: ../panels/info/cc-info-panel.c:1235
+#: ../panels/info/cc-info-panel.c:1337
 msgid "Open folder"
 msgstr "Ãpne mappe"
 
-#: ../panels/info/cc-info-panel.c:1326
+#: ../panels/info/cc-info-panel.c:1428
 msgid "Other Media"
 msgstr "Annet medie"
 
-#: ../panels/info/cc-info-panel.c:1357
+#: ../panels/info/cc-info-panel.c:1459
 msgid "Select an application for audio CDs"
 msgstr "Velg et program for lyd-CDer"
 
-#: ../panels/info/cc-info-panel.c:1358
+#: ../panels/info/cc-info-panel.c:1460
 msgid "Select an application for video DVDs"
 msgstr "Velg et program for video-DVDer"
 
-#: ../panels/info/cc-info-panel.c:1359
+#: ../panels/info/cc-info-panel.c:1461
 msgid "Select an application to run when a music player is connected"
 msgstr "Velg et program som skal kjÃres nÃr en musikkavspiller kobles til"
 
-#: ../panels/info/cc-info-panel.c:1360
+#: ../panels/info/cc-info-panel.c:1462
 msgid "Select an application to run when a camera is connected"
 msgstr "Velg et program som skal kjÃres nÃr et kamera kobles til"
 
-#: ../panels/info/cc-info-panel.c:1361
+#: ../panels/info/cc-info-panel.c:1463
 msgid "Select an application for software CDs"
 msgstr "Velg et program for programvare-CDer"
 
@@ -942,93 +942,93 @@ msgstr "Velg et program for programvare-CDer"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1373
+#: ../panels/info/cc-info-panel.c:1475
 msgid "audio DVD"
 msgstr "Lyd-DVD"
 
-#: ../panels/info/cc-info-panel.c:1374
+#: ../panels/info/cc-info-panel.c:1476
 msgid "blank Blu-ray disc"
 msgstr "Tom Blu-ray-plate"
 
-#: ../panels/info/cc-info-panel.c:1375
+#: ../panels/info/cc-info-panel.c:1477
 msgid "blank CD disc"
 msgstr "Tom CD-plate"
 
-#: ../panels/info/cc-info-panel.c:1376
+#: ../panels/info/cc-info-panel.c:1478
 msgid "blank DVD disc"
 msgstr "Tom DVD-plate"
 
-#: ../panels/info/cc-info-panel.c:1377
+#: ../panels/info/cc-info-panel.c:1479
 msgid "blank HD DVD disc"
 msgstr "tom HD-DVD plate"
 
-#: ../panels/info/cc-info-panel.c:1378
+#: ../panels/info/cc-info-panel.c:1480
 msgid "Blu-ray video disc"
 msgstr "Blu-ray videoplate"
 
-#: ../panels/info/cc-info-panel.c:1379
+#: ../panels/info/cc-info-panel.c:1481
 msgid "e-book reader"
 msgstr "E-bokleser"
 
-#: ../panels/info/cc-info-panel.c:1380
+#: ../panels/info/cc-info-panel.c:1482
 msgid "HD DVD video disc"
 msgstr "HD-DVD-videoplate"
 
-#: ../panels/info/cc-info-panel.c:1381
+#: ../panels/info/cc-info-panel.c:1483
 msgid "Picture CD"
 msgstr "Bilde-CD"
 
-#: ../panels/info/cc-info-panel.c:1382
+#: ../panels/info/cc-info-panel.c:1484
 msgid "Super Video CD"
 msgstr "Super Video CD"
 
-#: ../panels/info/cc-info-panel.c:1383
+#: ../panels/info/cc-info-panel.c:1485
 msgid "Video CD"
 msgstr "Video-CD"
 
-#: ../panels/info/cc-info-panel.c:1384
+#: ../panels/info/cc-info-panel.c:1486
 msgid "Windows software"
 msgstr "Windows programvare"
 
-#: ../panels/info/cc-info-panel.c:1385
+#: ../panels/info/cc-info-panel.c:1487
 msgid "Software"
 msgstr "Programvare"
 
-#: ../panels/info/cc-info-panel.c:1508
+#: ../panels/info/cc-info-panel.c:1610
 #: ../panels/keyboard/keyboard-shortcuts.c:1692
 msgid "Section"
 msgstr "Seksjon"
 
-#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:11
+#: ../panels/info/cc-info-panel.c:1619 ../panels/info/info.ui.h:12
 msgid "Overview"
 msgstr "Oversikt"
 
-#: ../panels/info/cc-info-panel.c:1523 ../panels/info/info.ui.h:18
+#: ../panels/info/cc-info-panel.c:1625 ../panels/info/info.ui.h:19
 msgid "Default Applications"
 msgstr "Forvalgte programmer"
 
-#: ../panels/info/cc-info-panel.c:1528 ../panels/info/info.ui.h:26
+#: ../panels/info/cc-info-panel.c:1630 ../panels/info/info.ui.h:27
 msgid "Removable Media"
 msgstr "Avtagbare medier"
 
-#: ../panels/info/cc-info-panel.c:1533 ../panels/info/info.ui.h:10
+#: ../panels/info/cc-info-panel.c:1635 ../panels/info/info.ui.h:10
 msgid "Graphics"
 msgstr "Grafikk"
 
-#: ../panels/info/cc-info-panel.c:1735
+#: ../panels/info/cc-info-panel.c:1837
 #, c-format
 msgid "Version %s"
 msgstr "Versjon %s"
 
-#: ../panels/info/cc-info-panel.c:1785
+#: ../panels/info/cc-info-panel.c:1887
 msgid "Install Updates"
 msgstr "Installer oppdateringer"
 
-#: ../panels/info/cc-info-panel.c:1789
+#: ../panels/info/cc-info-panel.c:1891
 msgid "System Up-To-Date"
 msgstr "Systemet er oppdatert"
 
-#: ../panels/info/cc-info-panel.c:1793
+#: ../panels/info/cc-info-panel.c:1895
 msgid "Checking for Updates"
 msgstr "Ser etter oppdateringer"
 
@@ -1086,68 +1086,72 @@ msgstr "Disk"
 msgid "Calculating..."
 msgstr "Beregner â"
 
-#: ../panels/info/info.ui.h:12
+#: ../panels/info/info.ui.h:11
+msgid "Virtualization"
+msgstr "Virtualisering"
+
+#: ../panels/info/info.ui.h:13
 msgid "_Web"
 msgstr "_Nett"
 
-#: ../panels/info/info.ui.h:13
+#: ../panels/info/info.ui.h:14
 msgid "_Mail"
 msgstr "_E-post"
 
-#: ../panels/info/info.ui.h:14
+#: ../panels/info/info.ui.h:15
 msgid "_Calendar"
 msgstr "_Kalender"
 
-#: ../panels/info/info.ui.h:15
+#: ../panels/info/info.ui.h:16
 msgid "M_usic"
 msgstr "M_usikk"
 
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info.ui.h:17
 msgid "_Video"
 msgstr "_Video"
 
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info.ui.h:18
 msgid "_Photos"
 msgstr "_Fotografier"
 
-#: ../panels/info/info.ui.h:19
+#: ../panels/info/info.ui.h:20
 msgid "Select how media should be handled"
 msgstr "Velg hvordan medier skal hÃndteres"
 
-#: ../panels/info/info.ui.h:20
+#: ../panels/info/info.ui.h:21
 msgid "CD _audio"
 msgstr "CD-_lyd"
 
-#: ../panels/info/info.ui.h:21
+#: ../panels/info/info.ui.h:22
 msgid "_DVD video"
 msgstr "_DVD-video"
 
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info.ui.h:23
 msgid "_Music player"
 msgstr "_Musikkavspiller"
 
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info.ui.h:24
 msgid "_Software"
 msgstr "_Programvare"
 
-#: ../panels/info/info.ui.h:24
+#: ../panels/info/info.ui.h:25
 msgid "_Other Media..."
 msgstr "_Annet medie â"
 
-#: ../panels/info/info.ui.h:25
+#: ../panels/info/info.ui.h:26
 msgid "_Never prompt or start programs on media insertion"
 msgstr "_Aldri spÃr eller start programmer nÃr et medie settes inn"
 
-#: ../panels/info/info.ui.h:27
+#: ../panels/info/info.ui.h:28
 msgid "Driver"
 msgstr "Driver"
 
-#: ../panels/info/info.ui.h:28
+#: ../panels/info/info.ui.h:29
 msgid "Experience"
 msgstr "Opplevelse"
 
 #. Hardware is not able to run GNOME 3's shell, so we might want to force running the 'Fallback' experience.
-#: ../panels/info/info.ui.h:30
+#: ../panels/info/info.ui.h:31
 msgid "Forced _Fallback Mode"
 msgstr "Tvungen _bruk av reservelÃsning"
 
@@ -1606,17 +1610,17 @@ msgstr "Dobbeltklikk, sekundÃrknapp"
 msgid "Single click, secondary button"
 msgstr "Enkeltklikk, sekundÃrknapp"
 
-#: ../panels/network/cc-network-panel.c:750
+#: ../panels/network/cc-network-panel.c:767
 msgid "Network proxy"
 msgstr "Nettverksproxy"
 
-#: ../panels/network/cc-network-panel.c:940 ../panels/network/net-vpn.c:278
+#: ../panels/network/cc-network-panel.c:957 ../panels/network/net-vpn.c:278
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
 #. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:1004
+#: ../panels/network/cc-network-panel.c:1021
 msgid "The system network services are not compatible with this version."
 msgstr ""
 "Nettverkstjenesten for dette systemet er ikke kompatibelt med denne "
@@ -1624,7 +1628,7 @@ msgstr ""
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:1139
+#: ../panels/network/cc-network-panel.c:1156
 msgid "Air_plane Mode"
 msgstr "_Flymodus"
 
@@ -1642,13 +1646,17 @@ msgstr "Innstillinger for nettverk"
 msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
 msgstr "Nettverk;TrÃdlÃs;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;BredbÃnd;Modem;BlÃtann;"
 
+#: ../panels/network/net-device-bond.c:131
+msgid "Bond slaves"
+msgstr "Koble sammen slaver"
+
 #. Translators: network device speed
 #: ../panels/network/net-device-ethernet.c:49
 #: ../panels/network/net-device-mobile.c:261
 #: ../panels/network/net-device-wifi.c:725
 #, c-format
 msgid "%d Mb/s"
-msgstr "%d MB/s"
+msgstr "%d Mb/s"
 
 #: ../panels/network/net-device-mobile.c:222
 msgid "Add new connection"
@@ -1703,7 +1711,7 @@ msgstr[1] "%i dager siden"
 
 #. TRANSLATORS: VPN status
 #: ../panels/network/net-device-wifi.c:735
-#: ../panels/network/panel-common.c:234
+#: ../panels/network/panel-common.c:235
 msgid "Not connected"
 msgstr "Ikke tilkoblet"
 
@@ -1742,7 +1750,9 @@ msgstr "Utmerket"
 msgid ""
 "Network details for %s including password and any custom configuration will "
 "be lost."
-msgstr "Nettverksdetaljer for %s inkludert passord og egendefinert konfigurasjon vil gà tapt."
+msgstr ""
+"Nettverksdetaljer for %s inkludert passord og egendefinert konfigurasjon vil "
+"gà tapt."
 
 #: ../panels/network/net-device-wifi.c:971
 msgid "Forget"
@@ -1752,7 +1762,9 @@ msgstr "Glem"
 msgid ""
 "If you have a connection to the Internet other than wireless, you can set up "
 "a wireless hotspot to share the connection with others."
-msgstr "Hvis du har en annen tilkobling til internett enn trÃdlÃs kan du sette opp et trÃdlÃst aksesspunkt for à dele tilkoblingen med andre."
+msgstr ""
+"Hvis du har en annen tilkobling til internett enn trÃdlÃs kan du sette opp "
+"et trÃdlÃst aksesspunkt for à dele tilkoblingen med andre."
 
 #: ../panels/network/net-device-wifi.c:1558
 #, c-format
@@ -1791,7 +1803,7 @@ msgstr ""
 msgid "This is not recommended for untrusted public networks."
 msgstr "Dette anbefales ikke for offentlige nettverk du ikke stoler pÃ."
 
-#: ../panels/network/net-proxy.c:367
+#: ../panels/network/net-proxy.c:406
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -1804,14 +1816,14 @@ msgid "Provider"
 msgstr "Tilbyder"
 
 #: ../panels/network/network-mobile.ui.h:3
-#: ../panels/network/panel-common.c:643 ../panels/network/panel-common.c:645
+#: ../panels/network/panel-common.c:644 ../panels/network/panel-common.c:646
 #: ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "IP-adresse"
 
 #: ../panels/network/network-mobile.ui.h:4
 #: ../panels/network/network-simple.ui.h:3
-#: ../panels/network/network-wifi.ui.h:14 ../panels/network/panel-common.c:641
+#: ../panels/network/network-wifi.ui.h:14 ../panels/network/panel-common.c:642
 msgid "IPv6 Address"
 msgstr "IPv6-adresse"
 
@@ -1871,13 +1883,17 @@ msgstr "_FTP-proxy"
 msgid "_Socks Host"
 msgstr "_Socks-vert"
 
+#: ../panels/network/network-proxy.ui.h:10
+msgid "_Ignore Hosts"
+msgstr "_Ignorer verter"
+
 #: ../panels/network/network-simple.ui.h:1
 #: ../panels/network/network-wifi.ui.h:9
 msgid "Hardware Address"
 msgstr "Maskinvareadresse"
 
 #: ../panels/network/network-simple.ui.h:2
-#: ../panels/network/network-wifi.ui.h:13 ../panels/network/panel-common.c:640
+#: ../panels/network/network-wifi.ui.h:13 ../panels/network/panel-common.c:641
 msgid "IPv4 Address"
 msgstr "IPv4-adresse"
 
@@ -1998,290 +2014,290 @@ msgid "Security key"
 msgstr "SikkerhetsnÃkkel"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:123
+#: ../panels/network/panel-common.c:124
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:127
+#: ../panels/network/panel-common.c:128
 msgid "Infrastructure"
 msgstr "Infrastruktur"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:212
+#: ../panels/network/panel-common.c:152 ../panels/network/panel-common.c:213
 msgid "Status unknown"
 msgstr "Ukjent status"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:155
+#: ../panels/network/panel-common.c:156
 msgid "Unmanaged"
 msgstr "Ikke administrert"
 
-#: ../panels/network/panel-common.c:160
+#: ../panels/network/panel-common.c:161
 msgid "Firmware missing"
 msgstr "Fastvare mangler"
 
-#: ../panels/network/panel-common.c:163
+#: ../panels/network/panel-common.c:164
 msgid "Cable unplugged"
 msgstr "Kabel koblet fra"
 
-#: ../panels/network/panel-common.c:165
+#: ../panels/network/panel-common.c:166
 msgid "Unavailable"
 msgstr "Ikke tilgjengelig"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:169
+#: ../panels/network/panel-common.c:170
 msgid "Disconnected"
 msgstr "Frakoblet"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:176 ../panels/network/panel-common.c:218
+#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
 msgid "Connecting"
 msgstr "Kobler til"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:180 ../panels/network/panel-common.c:222
+#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:223
 msgid "Authentication required"
 msgstr "Autentisering kreves"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:184 ../panels/network/panel-common.c:226
+#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227
 msgid "Connected"
 msgstr "Tilkoblet"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:188
+#: ../panels/network/panel-common.c:189
 msgid "Disconnecting"
 msgstr "Kobler fra"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:192 ../panels/network/panel-common.c:230
+#: ../panels/network/panel-common.c:193 ../panels/network/panel-common.c:231
 msgid "Connection failed"
 msgstr "Tilkobling feilet"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:196 ../panels/network/panel-common.c:238
+#: ../panels/network/panel-common.c:197 ../panels/network/panel-common.c:239
 msgid "Status unknown (missing)"
 msgstr "Ukjent status (mangler)"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:258
+#: ../panels/network/panel-common.c:259
 msgid "Configuration failed"
 msgstr "Konfigurering feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:262
+#: ../panels/network/panel-common.c:263
 msgid "IP configuration failed"
 msgstr "IP-konfigurering feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:266
+#: ../panels/network/panel-common.c:267
 msgid "IP configuration expired"
 msgstr "IP-konfigurasjon har utlÃpt"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:270
+#: ../panels/network/panel-common.c:271
 msgid "Secrets were required, but not provided"
 msgstr "Hemmeligheter kreves men ble ikke oppgitt"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:274
+#: ../panels/network/panel-common.c:275
 msgid "802.1x supplicant disconnected"
 msgstr "802.1x-hjelper frakoblet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:278
+#: ../panels/network/panel-common.c:279
 msgid "802.1x supplicant configuration failed"
 msgstr "Konfigurering av 802.1x-hjelper feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:282
+#: ../panels/network/panel-common.c:283
 msgid "802.1x supplicant failed"
 msgstr "802.1x-hjelper feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:286
+#: ../panels/network/panel-common.c:287
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "802.1x-hjelper brukte for lang tid pà autentisering"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:290
+#: ../panels/network/panel-common.c:291
 msgid "PPP service failed to start"
 msgstr "Start av PPP-tjeneste feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:294
+#: ../panels/network/panel-common.c:295
 msgid "PPP service disconnected"
 msgstr "PPP-tjeneste koblet fra"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:298
+#: ../panels/network/panel-common.c:299
 msgid "PPP failed"
 msgstr "PPP feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:302
+#: ../panels/network/panel-common.c:303
 msgid "DHCP client failed to start"
 msgstr "DHCP-klient startet ikke"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:306
+#: ../panels/network/panel-common.c:307
 msgid "DHCP client error"
 msgstr "Feil i DHCP-klient"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:310
+#: ../panels/network/panel-common.c:311
 msgid "DHCP client failed"
 msgstr "DHCP-klient feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:314
+#: ../panels/network/panel-common.c:315
 msgid "Shared connection service failed to start"
 msgstr "Tjeneste for delt tilkobling startet ikke"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:318
+#: ../panels/network/panel-common.c:319
 msgid "Shared connection service failed"
 msgstr "Tjeneste for delt tilkobling feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:322
+#: ../panels/network/panel-common.c:323
 msgid "AutoIP service failed to start"
 msgstr "AutoIP-tjeneste startet ikke"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:326
+#: ../panels/network/panel-common.c:327
 msgid "AutoIP service error"
 msgstr "Feil i AutoIP-tjeneste"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:330
+#: ../panels/network/panel-common.c:331
 msgid "AutoIP service failed"
 msgstr "AutoIP-tjeneste feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:334
+#: ../panels/network/panel-common.c:335
 msgid "Line busy"
 msgstr "Linjen er opptatt"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:338
+#: ../panels/network/panel-common.c:339
 msgid "No dial tone"
 msgstr "Ingen summetone"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:342
+#: ../panels/network/panel-common.c:343
 msgid "No carrier could be established"
 msgstr "Klarte ikke à etablere bÃrekanal"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:346
+#: ../panels/network/panel-common.c:347
 msgid "Dialing request timed out"
 msgstr "Tidsavbrudd for oppringing"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:350
+#: ../panels/network/panel-common.c:351
 msgid "Dialing attempt failed"
 msgstr "OppringingsforsÃk feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:354
+#: ../panels/network/panel-common.c:355
 msgid "Modem initialization failed"
 msgstr "Initiering av modem feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:358
+#: ../panels/network/panel-common.c:359
 msgid "Failed to select the specified APN"
 msgstr "Klarte ikke à velge angitt APN"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:362
+#: ../panels/network/panel-common.c:363
 msgid "Not searching for networks"
 msgstr "SÃker ikke etter nettverk"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:366
+#: ../panels/network/panel-common.c:367
 msgid "Network registration denied"
 msgstr "Nettverksregistrering nektet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:370
+#: ../panels/network/panel-common.c:371
 msgid "Network registration timed out"
 msgstr "Tidsavbrudd for nettverksregistrering"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:374
+#: ../panels/network/panel-common.c:375
 msgid "Failed to register with the requested network"
 msgstr "Klarte ikke à registrere med forespurt nettverk"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:378
+#: ../panels/network/panel-common.c:379
 msgid "PIN check failed"
 msgstr "PIN-sjekk feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:382
+#: ../panels/network/panel-common.c:383
 msgid "Firmware for the device may be missing"
 msgstr "Fastvare for enheten mangler kanskje"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:386
+#: ../panels/network/panel-common.c:387
 msgid "Connection disappeared"
 msgstr "Tilkobling forsvant"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:390
+#: ../panels/network/panel-common.c:391
 msgid "Carrier/link changed"
 msgstr "BÃrekanal/tilkobling ble endret"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:394
+#: ../panels/network/panel-common.c:395
 msgid "Existing connection was assumed"
 msgstr "Eksisterende tilkobling ble antatt"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:398
+#: ../panels/network/panel-common.c:399
 msgid "Modem not found"
 msgstr "Modem ble ikke funnet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:402
+#: ../panels/network/panel-common.c:403
 msgid "Bluetooth connection failed"
 msgstr "Tilkobling med Bluetooth feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:406
+#: ../panels/network/panel-common.c:407
 msgid "SIM Card not inserted"
 msgstr "SIM-kort ikke satt inn"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:410
+#: ../panels/network/panel-common.c:411
 msgid "SIM Pin required"
 msgstr "Pin for SIM kreves"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:414
+#: ../panels/network/panel-common.c:415
 msgid "SIM Puk required"
 msgstr "Puk for SIM kreves"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:418
+#: ../panels/network/panel-common.c:419
 msgid "SIM wrong"
 msgstr "Feil SIM"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:422
+#: ../panels/network/panel-common.c:423
 msgid "InfiniBand device does not support connected mode"
 msgstr "InfiniBand-enhet stÃtter ikke tilkoblet modus"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:426
+#: ../panels/network/panel-common.c:427
 msgid "Connection dependency failed"
 msgstr "Tilkoblingsavhengighet feilet"
 
@@ -2548,7 +2564,9 @@ msgstr "Tom"
 #: ../panels/power/cc-power-panel.c:1075
 msgid ""
 "Tip: <a href=\"screen\">screen brightness</a> affects how much power is used"
-msgstr "Tips: <a href=\"screen\">lysstyrke for skjerm</a> pÃvirker hvor mye strÃm som blir brukt"
+msgstr ""
+"Tips: <a href=\"screen\">lysstyrke for skjerm</a> pÃvirker hvor mye strÃm "
+"som blir brukt"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
@@ -2836,7 +2854,7 @@ msgid "Cancel Print Job"
 msgstr "Avbryt utskriftsjobb"
 
 #: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-dialog.c:1044
+#: ../panels/user-accounts/um-account-dialog.c:1070
 msgid "_Add"
 msgstr "_Legg til"
 
@@ -2858,7 +2876,7 @@ msgstr "Laster alternativer â"
 
 #: ../panels/printers/ppd-selection-dialog.ui.h:2
 #: ../panels/user-accounts/data/photo-dialog.ui.h:8
-#: ../panels/user-accounts/um-account-dialog.c:1043
+#: ../panels/user-accounts/um-account-dialog.c:1069
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -3223,7 +3241,7 @@ msgstr "Velg en inndatakilde"
 msgid "Select an input source to add"
 msgstr "Velg en inndatakilde som skal legges til"
 
-#: ../panels/region/gnome-region-panel-system.c:465
+#: ../panels/region/gnome-region-panel-system.c:471
 msgid ""
 "The login screen, system accounts and new user accounts use the system-wide "
 "Region and Language settings."
@@ -3231,7 +3249,7 @@ msgstr ""
 "Innloggingsskjermen, systemkontoene og nye brukerkontoer bruker systemets "
 "innstillinger for omrÃde og sprÃk."
 
-#: ../panels/region/gnome-region-panel-system.c:470
+#: ../panels/region/gnome-region-panel-system.c:476
 #: ../panels/region/gnome-region-panel.ui.h:30
 msgid ""
 "The login screen, system accounts and new user accounts use the system-wide "
@@ -3242,11 +3260,11 @@ msgstr ""
 "innstillinger for omrÃde og sprÃk. Du kan sette systeminnstillingene slik du "
 "Ãnsker."
 
-#: ../panels/region/gnome-region-panel-system.c:473
+#: ../panels/region/gnome-region-panel-system.c:479
 msgid "Copy Settings"
 msgstr "Kopier innstillinger"
 
-#: ../panels/region/gnome-region-panel-system.c:476
+#: ../panels/region/gnome-region-panel-system.c:482
 #: ../panels/region/gnome-region-panel.ui.h:37
 msgid "Copy Settings..."
 msgstr "Kopier innstillinger â"
@@ -4586,20 +4604,20 @@ msgstr "Ukjent feil"
 msgid "Failed to add account"
 msgstr "Klarte ikke à legge til en konto"
 
-#: ../panels/user-accounts/um-account-dialog.c:378
-#: ../panels/user-accounts/um-account-dialog.c:419
+#: ../panels/user-accounts/um-account-dialog.c:404
+#: ../panels/user-accounts/um-account-dialog.c:445
 msgid "Failed to register account"
 msgstr "Klarte ikke à registrere konto"
 
-#: ../panels/user-accounts/um-account-dialog.c:551
+#: ../panels/user-accounts/um-account-dialog.c:577
 msgid "No supported way to authenticate with this domain"
 msgstr "Ingen stÃttet mÃte à autentisere med dette domenet"
 
-#: ../panels/user-accounts/um-account-dialog.c:605
+#: ../panels/user-accounts/um-account-dialog.c:631
 msgid "Failed to join domain"
 msgstr "Klarte ikke à bli med i domenet"
 
-#: ../panels/user-accounts/um-account-dialog.c:662
+#: ../panels/user-accounts/um-account-dialog.c:688
 msgid "Failed to log into domain"
 msgstr "Klarte ikke à logge inn i domenet"
 
@@ -4753,21 +4771,25 @@ msgstr "Se etter flere bilder â"
 msgid "Used by %s"
 msgstr "Brukt av %s"
 
-#: ../panels/user-accounts/um-realm-manager.c:379
+#: ../panels/user-accounts/um-realm-manager.c:351
+msgid "Cannot automatically join this type of domain"
+msgstr "Kan ikke bli medlem av denne type domene automatisk"
+
+#: ../panels/user-accounts/um-realm-manager.c:414
 #, c-format
 msgid "No such domain or realm found"
 msgstr "Fant ikke dette domenet eller omrÃdet"
 
-#: ../panels/user-accounts/um-realm-manager.c:780
+#: ../panels/user-accounts/um-realm-manager.c:815
 #, c-format
 msgid "Cannot log in as %s at the %s domain"
 msgstr "Kan ikke logge inn som %s i domenet %s"
 
-#: ../panels/user-accounts/um-realm-manager.c:785
+#: ../panels/user-accounts/um-realm-manager.c:820
 msgid "Invalid password, please try again"
 msgstr "Ugyldig passord. Vennligst prÃv igjen"
 
-#: ../panels/user-accounts/um-realm-manager.c:789
+#: ../panels/user-accounts/um-realm-manager.c:824
 #, c-format
 msgid "Couldn't connect to the %s domain: %s"
 msgstr "Kunne ikke koble til domenet %s: %s"
@@ -4843,15 +4865,15 @@ msgctxt "Password mode"
 msgid "None"
 msgstr "Ingen"
 
-#: ../panels/user-accounts/um-user-panel.c:863
+#: ../panels/user-accounts/um-user-panel.c:864
 msgid "Failed to contact the accounts service"
 msgstr "Klarte ikke à kontakte kontotjenesten"
 
-#: ../panels/user-accounts/um-user-panel.c:865
+#: ../panels/user-accounts/um-user-panel.c:866
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "Sjekk at kontotjenesten er installert og aktivert."
 
-#: ../panels/user-accounts/um-user-panel.c:905
+#: ../panels/user-accounts/um-user-panel.c:906
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -4859,12 +4881,12 @@ msgstr ""
 "Klikk pà *-ikonet\n"
 "for à gjÃre endringer"
 
-#: ../panels/user-accounts/um-user-panel.c:943
+#: ../panels/user-accounts/um-user-panel.c:944
 msgid "Create a user account"
 msgstr "Lag en ny brukerkonto"
 
-#: ../panels/user-accounts/um-user-panel.c:954
-#: ../panels/user-accounts/um-user-panel.c:1236
+#: ../panels/user-accounts/um-user-panel.c:955
+#: ../panels/user-accounts/um-user-panel.c:1237
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -4872,12 +4894,12 @@ msgstr ""
 "Klikk pà *-ikonet\n"
 "for à lage en brukerkonto"
 
-#: ../panels/user-accounts/um-user-panel.c:963
+#: ../panels/user-accounts/um-user-panel.c:964
 msgid "Delete the selected user account"
 msgstr "Slett valgt brukerkonto"
 
-#: ../panels/user-accounts/um-user-panel.c:975
-#: ../panels/user-accounts/um-user-panel.c:1241
+#: ../panels/user-accounts/um-user-panel.c:976
+#: ../panels/user-accounts/um-user-panel.c:1242
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -4885,11 +4907,11 @@ msgstr ""
 "Klikk pà *-ikonet\n"
 "for à slette valgt brukerkonto"
 
-#: ../panels/user-accounts/um-user-panel.c:1149
+#: ../panels/user-accounts/um-user-panel.c:1150
 msgid "My Account"
 msgstr "Min konto"
 
-#: ../panels/user-accounts/um-user-panel.c:1158
+#: ../panels/user-accounts/um-user-panel.c:1159
 msgid "Other Accounts"
 msgstr "Andre kontoer"
 
@@ -5065,67 +5087,87 @@ msgstr "Sporingsmodus"
 msgid "Left-Handed Orientation"
 msgstr "Venstrehendt orientering"
 
-#: ../panels/wacom/gsd-wacom-device.c:1010
+#. If no mode is available, we use "left-ring-mode-1" for backward compat
+#: ../panels/wacom/gsd-wacom-device.c:1015
+msgid "Left Ring"
+msgstr "Venstre ring"
+
+#: ../panels/wacom/gsd-wacom-device.c:1023
 #, c-format
 msgid "Left Ring Mode #%d"
 msgstr "Venstre ringmodus #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1019
+#. If no mode is available, we use "right-ring-mode-1" for backward compat
+#: ../panels/wacom/gsd-wacom-device.c:1040
+msgid "Right Ring"
+msgstr "HÃyre ring"
+
+#: ../panels/wacom/gsd-wacom-device.c:1048
 #, c-format
 msgid "Right Ring Mode #%d"
 msgstr "HÃyre ringmodus #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1049
+#. If no mode is available, we use "left-strip-mode-1" for backward compat
+#: ../panels/wacom/gsd-wacom-device.c:1087
+msgid "Left Touchstrip"
+msgstr "Venstre berÃringsstripe"
+
+#: ../panels/wacom/gsd-wacom-device.c:1095
 #, c-format
 msgid "Left Touchstrip Mode #%d"
 msgstr "Venstre berÃringsstripe modus #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1058
+#. If no mode is available, we use "right-strip-mode-1" for backward compat
+#: ../panels/wacom/gsd-wacom-device.c:1112
+msgid "Right Touchstrip"
+msgstr "HÃyre berÃringsstripe"
+
+#: ../panels/wacom/gsd-wacom-device.c:1120
 #, c-format
 msgid "Right Touchstrip Mode #%d"
 msgstr "HÃyre berÃringsstripe modus #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1075
+#: ../panels/wacom/gsd-wacom-device.c:1143
 #, c-format
 msgid "Left Touchring Mode Switch"
 msgstr "Bytt modus for venstre berÃringsring"
 
-#: ../panels/wacom/gsd-wacom-device.c:1077
+#: ../panels/wacom/gsd-wacom-device.c:1145
 #, c-format
 msgid "Right Touchring Mode Switch"
 msgstr "Bytt modus for hÃyre berÃringsring"
 
-#: ../panels/wacom/gsd-wacom-device.c:1080
+#: ../panels/wacom/gsd-wacom-device.c:1148
 #, c-format
 msgid "Left Touchstrip Mode Switch"
 msgstr "Bytt modus for venstre berÃringsstripe"
 
-#: ../panels/wacom/gsd-wacom-device.c:1082
+#: ../panels/wacom/gsd-wacom-device.c:1150
 #, c-format
 msgid "Right Touchstrip Mode Switch"
 msgstr "Bytt modus for hÃyre berÃringsstripe"
 
-#: ../panels/wacom/gsd-wacom-device.c:1087
+#: ../panels/wacom/gsd-wacom-device.c:1155
 #, c-format
 msgid "Mode Switch #%d"
 msgstr "Modusbytte #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1159
+#: ../panels/wacom/gsd-wacom-device.c:1226
 #, c-format
 msgid "Left Button #%d"
 msgstr "Venstre knapp #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1162
+#: ../panels/wacom/gsd-wacom-device.c:1229
 #, c-format
 msgid "Right Button #%d"
 msgstr "HÃyre knapp #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1165
+#: ../panels/wacom/gsd-wacom-device.c:1232
 #, c-format
 msgid "Top Button #%d"
 msgstr "Ãverste knapp #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1168
+#: ../panels/wacom/gsd-wacom-device.c:1235
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "Nederste knapp #%d"