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

[Kjartan Maraas <kmaraas src gnome org>]

commit a9d42502e8608aa46c5fa5ff056a459f1ef2c969
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Sun Feb 19 19:55:39 2012 +0100

    Updated Norwegian bokmÃl translation

 po/nb.po |  609 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 407 insertions(+), 202 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 8b60b21..7e32a3c 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 3.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-02 18:30+0100\n"
-"PO-Revision-Date: 2012-02-02 18:30+0100\n"
+"POT-Creation-Date: 2012-02-19 19:50+0100\n"
+"PO-Revision-Date: 2012-02-19 19:55+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmÃl <i18n-nb lister ping uio no>\n"
 "Language: \n"
@@ -319,23 +319,23 @@ msgid "Available Profiles"
 msgstr "Tilgjengelige profiler"
 
 #. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:794
+#: ../panels/color/cc-color-panel.c:806
 #: ../panels/sound/gvc-mixer-dialog.c:1516
 msgid "Device"
 msgstr "Enhet"
 
 #. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:829
+#: ../panels/color/cc-color-panel.c:841
 msgid "Calibration"
 msgstr "Kalibrering"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:861
+#: ../panels/color/cc-color-panel.c:873
 msgid "Create a color profile for the selected device"
 msgstr "Lag en fargeprofil for valgt enhet"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:875 ../panels/color/cc-color-panel.c:899
+#: ../panels/color/cc-color-panel.c:887 ../panels/color/cc-color-panel.c:911
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
@@ -344,40 +344,40 @@ msgstr ""
 "tilkoblet."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:908
+#: ../panels/color/cc-color-panel.c:920
 msgid "The measuring instrument does not support printer profiling."
 msgstr "MÃleinstrumentet stÃtter ikke profilering av skrivere."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:919
+#: ../panels/color/cc-color-panel.c:931
 msgid "The device type is not currently supported."
 msgstr "Enhetstypen er ikke stÃttet."
 
 #. TRANSLATORS: this is when an auto-added profile cannot be removed
-#: ../panels/color/cc-color-panel.c:992
+#: ../panels/color/cc-color-panel.c:1004
 msgid "Cannot remove automatically added profile"
 msgstr "Kan ikke fjerne profil som er lagt til automatisk"
 
 #. TRANSLATORS: this is when there is no profile for the device
-#: ../panels/color/cc-color-panel.c:1327
+#: ../panels/color/cc-color-panel.c:1339
 msgid "No profile"
 msgstr "Ingen profil"
 
-#: ../panels/color/cc-color-panel.c:1358
+#: ../panels/color/cc-color-panel.c:1370
 #, c-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i Ãr"
 msgstr[1] "%i Ãr"
 
-#: ../panels/color/cc-color-panel.c:1369
+#: ../panels/color/cc-color-panel.c:1381
 #, c-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i mÃned"
 msgstr[1] "%i mÃneder"
 
-#: ../panels/color/cc-color-panel.c:1380
+#: ../panels/color/cc-color-panel.c:1392
 #, c-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -385,40 +385,40 @@ msgstr[0] "%i uke"
 msgstr[1] "%i uker"
 
 #. fallback
-#: ../panels/color/cc-color-panel.c:1387
+#: ../panels/color/cc-color-panel.c:1399
 #, c-format
 msgid "Less than 1 week"
 msgstr "Mindre enn en uke"
 
-#: ../panels/color/cc-color-panel.c:1449
+#: ../panels/color/cc-color-panel.c:1461
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "Forvalgt RGB"
 
-#: ../panels/color/cc-color-panel.c:1454
+#: ../panels/color/cc-color-panel.c:1466
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "Forvalgt CMYK"
 
-#: ../panels/color/cc-color-panel.c:1459
+#: ../panels/color/cc-color-panel.c:1471
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "Forvalgt grÃ"
 
-#: ../panels/color/cc-color-panel.c:1577 ../panels/color/cc-color-panel.c:1609
-#: ../panels/color/cc-color-panel.c:1620 ../panels/color/cc-color-panel.c:1631
+#: ../panels/color/cc-color-panel.c:1589 ../panels/color/cc-color-panel.c:1630
+#: ../panels/color/cc-color-panel.c:1641 ../panels/color/cc-color-panel.c:1652
 msgid "Uncalibrated"
 msgstr "Ikke kalibrert"
 
-#: ../panels/color/cc-color-panel.c:1580
+#: ../panels/color/cc-color-panel.c:1592
 msgid "This device is not color managed."
 msgstr "Denne enheten er ikke fargestyrt."
 
-#: ../panels/color/cc-color-panel.c:1612
+#: ../panels/color/cc-color-panel.c:1633
 msgid "This device is using manufacturing calibrated data."
 msgstr "Denne enheten bruker data kalibrert av produsenten."
 
-#: ../panels/color/cc-color-panel.c:1623
+#: ../panels/color/cc-color-panel.c:1644
 msgid ""
 "This device does not have a profile suitable for whole-screen color "
 "correction."
@@ -426,42 +426,42 @@ msgstr ""
 "Denne enheten har ikke en profil som passer for fargekorrigering av hele "
 "skjermen."
 
-#: ../panels/color/cc-color-panel.c:1656
+#: ../panels/color/cc-color-panel.c:1677
 msgid "This device has an old profile that may no longer be accurate."
 msgstr "Denne enheten har en gammel profil som kan vÃre unÃyaktig."
 
 #. TRANSLATORS: this is when the calibration profile age is not
 #. * specified as it has been autogenerated from the hardware
-#: ../panels/color/cc-color-panel.c:1684
+#: ../panels/color/cc-color-panel.c:1705
 msgid "Not specified"
 msgstr "Ikke spesifisert"
 
 #. add the 'No devices detected' entry
-#: ../panels/color/cc-color-panel.c:1868
+#: ../panels/color/cc-color-panel.c:1889
 msgid "No devices supporting color management detected"
 msgstr "Fant ingen enheter som stÃtter fargehÃndtering"
 
-#: ../panels/color/cc-color-panel.c:2097
+#: ../panels/color/cc-color-panel.c:2118
 msgctxt "Device kind"
 msgid "Display"
 msgstr "Skjerm"
 
-#: ../panels/color/cc-color-panel.c:2099
+#: ../panels/color/cc-color-panel.c:2120
 msgctxt "Device kind"
 msgid "Scanner"
 msgstr "Skanner"
 
-#: ../panels/color/cc-color-panel.c:2101
+#: ../panels/color/cc-color-panel.c:2122
 msgctxt "Device kind"
 msgid "Printer"
 msgstr "Skriver"
 
-#: ../panels/color/cc-color-panel.c:2103
+#: ../panels/color/cc-color-panel.c:2124
 msgctxt "Device kind"
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../panels/color/cc-color-panel.c:2105
+#: ../panels/color/cc-color-panel.c:2126
 msgctxt "Device kind"
 msgid "Webcam"
 msgstr "Nettkamera"
@@ -615,7 +615,7 @@ msgstr "Velg et sprÃk"
 
 #: ../panels/common/language-chooser.ui.h:2
 #: ../panels/printers/new-printer-dialog.ui.h:4
-#: ../panels/user-accounts/um-user-panel.c:449
+#: ../panels/user-accounts/um-user-panel.c:446
 msgid "_Cancel"
 msgstr "A_vbryt"
 
@@ -997,7 +997,7 @@ msgid "Video CD"
 msgstr "Video-CD"
 
 #: ../panels/info/cc-info-panel.c:1473
-#: ../panels/keyboard/keyboard-shortcuts.c:1627
+#: ../panels/keyboard/keyboard-shortcuts.c:1569
 msgid "Section"
 msgstr "Seksjon"
 
@@ -1411,6 +1411,7 @@ msgid "Remove Shortcut"
 msgstr "Fjern snarvei"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+#: ../panels/wacom/button-mapping.ui.h:3
 msgid ""
 "To edit a shortcut, click the row and hold down the new keys or press "
 "Backspace to clear."
@@ -1422,28 +1423,28 @@ msgstr ""
 msgid "Shortcuts"
 msgstr "Snarveier"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:555
-#: ../panels/keyboard/keyboard-shortcuts.c:563
-#: ../panels/keyboard/keyboard-shortcuts.c:882
-#: ../panels/keyboard/keyboard-shortcuts.c:1383
-#: ../panels/keyboard/keyboard-shortcuts.c:1387
+#: ../panels/keyboard/keyboard-shortcuts.c:553
+#: ../panels/keyboard/keyboard-shortcuts.c:561
+#: ../panels/keyboard/keyboard-shortcuts.c:873
+#: ../panels/keyboard/keyboard-shortcuts.c:1325
+#: ../panels/keyboard/keyboard-shortcuts.c:1329
 msgid "Custom Shortcuts"
 msgstr "Egendefinerte snarveier"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:723
+#: ../panels/keyboard/keyboard-shortcuts.c:721
 msgid "<Unknown Action>"
 msgstr "<Ukjent handling>"
 
 #. translators:
 #. * The device has been disabled
-#: ../panels/keyboard/keyboard-shortcuts.c:1064
+#: ../panels/keyboard/keyboard-shortcuts.c:1025
 #: ../panels/sound/gvc-mixer-control.c:1087
-#: ../panels/user-accounts/um-fingerprint-dialog.c:177
-#: ../panels/user-accounts/um-fingerprint-dialog.c:178
+#: ../panels/user-accounts/um-fingerprint-dialog.c:215
+#: ../panels/user-accounts/um-fingerprint-dialog.c:216
 msgid "Disabled"
 msgstr "SlÃtt av"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1205
+#: ../panels/keyboard/keyboard-shortcuts.c:1164
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -1455,7 +1456,7 @@ msgstr ""
 "Vennligst prÃv med en tastekombinasjon som inkluderer Control, Alt eller "
 "Shift."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1237
+#: ../panels/keyboard/keyboard-shortcuts.c:1196
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1464,22 +1465,23 @@ msgstr ""
 "Snarvei Â%s er allerede brukt for\n"
 "Â%sÂ"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1242
+#: ../panels/keyboard/keyboard-shortcuts.c:1201
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr ""
 "Hvis du omfordeler snarveien til Â%s vil snarveien for Â%s bli slÃtt av."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1248
+#: ../panels/keyboard/keyboard-shortcuts.c:1207
 msgid "_Reassign"
 msgstr "_Omfordel"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1676
+#: ../panels/keyboard/keyboard-shortcuts.c:1618
+#: ../panels/wacom/cc-wacom-page.c:458
 msgid "Action"
 msgstr "Handling"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1699
+#: ../panels/keyboard/keyboard-shortcuts.c:1640
 msgid "Shortcut"
 msgstr "Snarvei"
 
@@ -1529,7 +1531,9 @@ msgid "_Sensitivity:"
 msgstr "_FÃlsomhet:"
 
 #. low sensitivity
+#. TRANSLATORS: secondary battery
 #: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: ../panels/power/cc-power-panel.c:570
 msgid "Low"
 msgstr "Lav"
 
@@ -1663,7 +1667,7 @@ msgstr "Enterprise"
 #. TRANSLATORS: this no (!) WiFi security
 #: ../panels/network/cc-network-panel.c:1178
 #: ../panels/network/cc-network-panel.c:1561
-#: ../panels/universal-access/uap.ui.h:5
+#: ../panels/universal-access/uap.ui.h:5 ../panels/wacom/cc-wacom-page.c:269
 msgid "None"
 msgstr "Ingen"
 
@@ -1677,73 +1681,84 @@ msgstr "Hotspot"
 msgid "%d Mb/s"
 msgstr "%d MB/s"
 
-#: ../panels/network/cc-network-panel.c:2014 ../panels/network/network.ui.h:11
+#: ../panels/network/cc-network-panel.c:2018 ../panels/network/network.ui.h:11
 msgid "IPv4 Address"
 msgstr "IPv4-adresse"
 
-#: ../panels/network/cc-network-panel.c:2015 ../panels/network/network.ui.h:12
+#: ../panels/network/cc-network-panel.c:2019 ../panels/network/network.ui.h:12
 msgid "IPv6 Address"
 msgstr "IPv6-adresse"
 
-#: ../panels/network/cc-network-panel.c:2018
-#: ../panels/network/cc-network-panel.c:2021 ../panels/network/network.ui.h:26
+#: ../panels/network/cc-network-panel.c:2022
+#: ../panels/network/cc-network-panel.c:2025 ../panels/network/network.ui.h:27
 #: ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "IP-adresse"
 
-#: ../panels/network/cc-network-panel.c:2068
-#: ../panels/network/cc-network-panel.c:2443
+#: ../panels/network/cc-network-panel.c:2072
+#: ../panels/network/cc-network-panel.c:2447
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: ../panels/network/cc-network-panel.c:2176
+#: ../panels/network/cc-network-panel.c:2180
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../panels/network/cc-network-panel.c:2250
+#: ../panels/network/cc-network-panel.c:2254
 msgid "Network proxy"
 msgstr "Nettverksproxy"
 
 #. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:2510
+#: ../panels/network/cc-network-panel.c:2514
 msgid "The system network services are not compatible with this version."
 msgstr ""
 "Nettverkstjenesten for dette systemet er ikke kompatibelt med denne "
 "versjonen."
 
-#: ../panels/network/cc-network-panel.c:3125
+#: ../panels/network/cc-network-panel.c:2712
+#, c-format
+msgid ""
+"Network details for %s including password and any custom configuration will "
+"be lost"
+msgstr "Nettverksdetaljer for %s inklusive passord og tilpasset konfigurasjon vil gà tapt"
+
+#: ../panels/network/cc-network-panel.c:2722
+msgid "Forget"
+msgstr "Glem"
+
+#: ../panels/network/cc-network-panel.c:3221
 msgid "Not connected to the internet."
 msgstr "Ikke koblet til internett."
 
-#: ../panels/network/cc-network-panel.c:3126
+#: ../panels/network/cc-network-panel.c:3222
 msgid "Create the hotspot anyway?"
 msgstr "Lage hotspot likevel?"
 
-#: ../panels/network/cc-network-panel.c:3144
+#: ../panels/network/cc-network-panel.c:3240
 #, 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:3147
+#: ../panels/network/cc-network-panel.c:3243
 msgid "This is your only connection to the internet."
 msgstr "Dette er din eneste tilkobling til internett."
 
-#: ../panels/network/cc-network-panel.c:3165
+#: ../panels/network/cc-network-panel.c:3261
 msgid "Create _Hotspot"
 msgstr "Lag _hotspot"
 
-#: ../panels/network/cc-network-panel.c:3225
+#: ../panels/network/cc-network-panel.c:3321
 msgid "Stop hotspot and disconnect any users?"
 msgstr "Stoppe hotspot og koble fra alle brukere?"
 
-#: ../panels/network/cc-network-panel.c:3228
+#: ../panels/network/cc-network-panel.c:3324
 msgid "_Stop Hotspot"
 msgstr "_Stopp hotspot"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:3246
+#: ../panels/network/cc-network-panel.c:3342
 msgid "Airplane Mode"
 msgstr "Flymodus"
 
@@ -1816,8 +1831,9 @@ msgid "Device Off"
 msgstr "Enhet av"
 
 #: ../panels/network/network.ui.h:17
-msgid "_Configure..."
-msgstr "_Konfigurer â"
+#: ../panels/region/gnome-region-panel.ui.h:26
+msgid "_Options..."
+msgstr "_Alternativer â"
 
 #: ../panels/network/network.ui.h:18
 msgid "Security"
@@ -1836,89 +1852,93 @@ msgid "Security Key"
 msgstr "SikkerhetsnÃkkel"
 
 #: ../panels/network/network.ui.h:22
+msgid "Forget Network"
+msgstr "Glem nettverk"
+
+#: ../panels/network/network.ui.h:23
 msgid "_Use as Hotspot..."
 msgstr "Br_uk som hotspot â"
 
-#: ../panels/network/network.ui.h:23
+#: ../panels/network/network.ui.h:24
 msgid "_Stop Hotspot..."
 msgstr "_Stopp hotspot â"
 
-#: ../panels/network/network.ui.h:24
+#: ../panels/network/network.ui.h:25
 msgid "IMEI"
 msgstr "IMEI"
 
-#: ../panels/network/network.ui.h:25
+#: ../panels/network/network.ui.h:26
 msgid "Provider"
 msgstr "Tilbyder"
 
-#: ../panels/network/network.ui.h:27
+#: ../panels/network/network.ui.h:28
 msgid "VPN Type"
 msgstr "Type VPN"
 
-#: ../panels/network/network.ui.h:28
+#: ../panels/network/network.ui.h:29
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../panels/network/network.ui.h:29
+#: ../panels/network/network.ui.h:30
 msgid "Group Name"
 msgstr "Gruppenavn"
 
-#: ../panels/network/network.ui.h:30
+#: ../panels/network/network.ui.h:31
 msgid "Group Password"
 msgstr "Gruppepassord"
 
-#: ../panels/network/network.ui.h:31
+#: ../panels/network/network.ui.h:32
 msgid "Username"
 msgstr "Brukernavn"
 
-#: ../panels/network/network.ui.h:32
+#: ../panels/network/network.ui.h:33
 msgid "Disable VPN"
 msgstr "Slà av VPN"
 
-#: ../panels/network/network.ui.h:33
+#: ../panels/network/network.ui.h:34
+msgid "_Configure..."
+msgstr "_Konfigurer â"
+
+#: ../panels/network/network.ui.h:35
 msgid "_Method"
 msgstr "_Metode"
 
-#: ../panels/network/network.ui.h:34
+#: ../panels/network/network.ui.h:36
 msgid "_Configuration URL"
 msgstr "_Konfigurasjons-URL"
 
-#: ../panels/network/network.ui.h:35
+#: ../panels/network/network.ui.h:37
 msgid "_HTTP Proxy"
 msgstr "_HTTP-proxy"
 
-#: ../panels/network/network.ui.h:36
+#: ../panels/network/network.ui.h:38
 msgid "H_TTPS Proxy"
 msgstr "H_TTP-proxy"
 
-#: ../panels/network/network.ui.h:37
+#: ../panels/network/network.ui.h:39
 msgid "_FTP Proxy"
 msgstr "_FTP-proxy"
 
-#: ../panels/network/network.ui.h:38
+#: ../panels/network/network.ui.h:40
 msgid "_Socks Host"
 msgstr "_Socks-vert"
 
-#: ../panels/network/network.ui.h:39
+#: ../panels/network/network.ui.h:41
 msgid "HTTP Port"
 msgstr "HTTP-port"
 
-#: ../panels/network/network.ui.h:40
+#: ../panels/network/network.ui.h:42
 msgid "HTTPS Port"
 msgstr "HTTP-port"
 
-#: ../panels/network/network.ui.h:41
+#: ../panels/network/network.ui.h:43
 msgid "FTP Port"
 msgstr "FTP-port"
 
-#: ../panels/network/network.ui.h:42
+#: ../panels/network/network.ui.h:44
 msgid "Socks Port"
 msgstr "Socks-port"
 
-#: ../panels/network/network.ui.h:43
-msgid "Unlock"
-msgstr "LÃs opp"
-
 #. TRANSLATORS: device type
 #: ../panels/network/panel-common.c:83
 msgid "Wired"
@@ -2044,27 +2064,27 @@ msgstr "Velg kontotype fÃr du legger til en ny konto"
 msgid "Account Type:"
 msgstr "Type konto:"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:502
+#: ../panels/online-accounts/cc-online-accounts-panel.c:497
 msgid "_Add..."
 msgstr "_Legg til â"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:555
+#: ../panels/online-accounts/cc-online-accounts-panel.c:550
 msgid "Error creating account"
 msgstr "Feil under oppretting av konto"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:589
+#: ../panels/online-accounts/cc-online-accounts-panel.c:584
 msgid "Error removing account"
 msgstr "Feil under fjerning av konto"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:625
+#: ../panels/online-accounts/cc-online-accounts-panel.c:620
 msgid "Are you sure you want to remove the account?"
 msgstr "Er du sikker pà at du vil fjerne kontoen?"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:627
+#: ../panels/online-accounts/cc-online-accounts-panel.c:622
 msgid "This will not remove the account on the server."
 msgstr "Dette vil ikke fjerne kontoen pà tjeneren."
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:628
+#: ../panels/online-accounts/cc-online-accounts-panel.c:623
 msgid "_Remove"
 msgstr "Fje_rn"
 
@@ -2090,18 +2110,18 @@ msgstr "Fjern konto"
 msgid "Select an account"
 msgstr "Velg en konto"
 
-#: ../panels/power/cc-power-panel.c:160
+#: ../panels/power/cc-power-panel.c:162
 msgid "Unknown time"
 msgstr "Ukjent tid"
 
-#: ../panels/power/cc-power-panel.c:166
+#: ../panels/power/cc-power-panel.c:168
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minutt"
 msgstr[1] "%i minutter"
 
-#: ../panels/power/cc-power-panel.c:178
+#: ../panels/power/cc-power-panel.c:180
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -2110,57 +2130,160 @@ 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:186
+#: ../panels/power/cc-power-panel.c:188
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:187
+#: ../panels/power/cc-power-panel.c:189
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: ../panels/power/cc-power-panel.c:188
+#: ../panels/power/cc-power-panel.c:190
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minutter"
 
-#: ../panels/power/cc-power-panel.c:265
-msgid "Battery charging"
-msgstr "Batteriet lader"
-
-#: ../panels/power/cc-power-panel.c:268
-msgid "Battery discharging"
-msgstr "Batteriet lades ut"
-
-#: ../panels/power/cc-power-panel.c:279
-msgid "UPS charging"
-msgstr "UPS lader"
+#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+#: ../panels/power/cc-power-panel.c:233
+#, c-format
+msgid "Charging - %s until fully charged"
+msgstr "Lader - fullt ladet om %s"
 
-#: ../panels/power/cc-power-panel.c:282
-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:241
+#, c-format
+msgid "Caution low battery, %s remaining"
+msgstr "Advarsel, lite batteri, %s gjenstÃr"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:300
+#: ../panels/power/cc-power-panel.c:249
 #, c-format
-msgid "%s until charged (%.0lf%%)"
-msgstr "%s fÃr fullt ladet (%.0lf%%)"
+msgid "Using battery power - %s remaining"
+msgstr "Bruker batteristrÃm - %s gjenstÃr"
+
+#. TRANSLATORS: primary battery
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:266 ../panels/power/cc-power-panel.c:558
+msgid "Charging"
+msgstr "Lader"
+
+#. TRANSLATORS: primary battery
+#: ../panels/power/cc-power-panel.c:271
+msgid "Using battery power"
+msgstr "Bruker batteristrÃm"
+
+#. TRANSLATORS: primary battery
+#: ../panels/power/cc-power-panel.c:275 ../panels/power/cc-power-panel.c:580
+msgid "Charging - fully charged"
+msgstr "Lader - fullt ladet"
+
+#. TRANSLATORS: primary battery
+#: ../panels/power/cc-power-panel.c:279 ../panels/power/cc-power-panel.c:584
+msgid "Empty"
+msgstr "Tom"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:306
+#: ../panels/power/cc-power-panel.c:347
 #, c-format
-msgid "%s until empty (%.0lf%%)"
-msgstr "%s igjen fÃr det er tomt (%.0lf%%)"
+msgid "Caution low UPS, %s remaining"
+msgstr "Advarsel, lite strÃm pà UPS, %s gjenstÃr"
 
-#. 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:314
+#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+#: ../panels/power/cc-power-panel.c:353
 #, c-format
-msgid "%.0lf%% charged"
-msgstr "%.0lf%% ladet"
+msgid "Using UPS power - %s remaining"
+msgstr "Bruker UPS-strÃm - %s gjenstÃr"
+
+#. TRANSLATORS: UPS battery
+#: ../panels/power/cc-power-panel.c:371
+msgid "Caution low UPS"
+msgstr "Advarsel, lite strÃm pà UPS"
+
+#. TRANSLATORS: UPS battery
+#: ../panels/power/cc-power-panel.c:376
+msgid "Using UPS power"
+msgstr "Bruker UPS-strÃm"
+
+#. TRANSLATORS: secondary battery is normally in the media bay
+#: ../panels/power/cc-power-panel.c:428
+msgid "Your secondary battery is fully charged"
+msgstr "SekundÃrt batteri er fullt ladet"
+
+#. TRANSLATORS: secondary battery is normally in the media bay
+#: ../panels/power/cc-power-panel.c:432
+msgid "Your secondary battery is empty"
+msgstr "SekundÃrt batteri er tomt"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:515
+msgid "Wireless mouse"
+msgstr "TrÃdlÃs mus"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:519
+msgid "Wireless keyboard"
+msgstr "TrÃdlÃst tastatur"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:523
+msgid "Uninterruptible power supply"
+msgstr "Avbruddsfri strÃmforsyning"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:527
+msgid "Personal digital assistant"
+msgstr "Personlig digital assistent"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:531
+msgid "Cellphone"
+msgstr "Mobiltelefon"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:535
+msgid "Media player"
+msgstr "Musikkavspiller"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:539
+msgid "Tablet"
+msgstr "Tegnebrett"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:543
+msgid "Computer"
+msgstr "Datamaskin"
+
+#. TRANSLATORS: secondary battery, misc
+#: ../panels/power/cc-power-panel.c:547
+msgid "Battery"
+msgstr "Batteri"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:565
+msgid "Caution"
+msgstr "Advarsel"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:575
+msgid "Good"
+msgstr "God"
+
+#: ../panels/power/cc-power-panel.c:1081
+msgid "Tip:"
+msgstr "Tips:"
+
+#: ../panels/power/cc-power-panel.c:1082
+msgid "Screen Settings"
+msgstr "Innstillinger for skjerm"
+
+#: ../panels/power/cc-power-panel.c:1083
+msgid "affect how much power is used"
+msgstr "pÃvirk hvor mye strÃm som brukes"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
@@ -2212,12 +2335,12 @@ msgid "When plugged in"
 msgstr "NÃr den er koblet til strÃm"
 
 #: ../panels/power/power.ui.h:10
-msgid "Suspend when inactive for:"
-msgstr "Hvilemodus ved inaktivitet:"
+msgid "Suspend when inactive for"
+msgstr "Hvilemodus etter inaktivitet i"
 
 #: ../panels/power/power.ui.h:11
-msgid "When power is _critically low:"
-msgstr "NÃr strÃmmen er _kritisk lav:"
+msgid "When power is _critically low"
+msgstr "NÃr strÃmmen er _kritisk lav"
 
 #. Translators: The printer is low on toner
 #: ../panels/printers/cc-printers-panel.c:542
@@ -2408,18 +2531,18 @@ msgid "Time"
 msgstr "Tid"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:2047
+#: ../panels/printers/cc-printers-panel.c:2052
 msgid "Failed to add new printer."
 msgstr "Klarte ikke à legge til ny skriver."
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2251
-#: ../panels/printers/cc-printers-panel.c:2265
+#: ../panels/printers/cc-printers-panel.c:2256
+#: ../panels/printers/cc-printers-panel.c:2270
 msgid "Test page"
 msgstr "Testside"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2514
+#: ../panels/printers/cc-printers-panel.c:2519
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Klarte ikke à laste brukergrensesnitt: %s"
@@ -2454,21 +2577,21 @@ msgstr "_SÃk etter adresse"
 msgid "_Add"
 msgstr "_Legg til"
 
-#: ../panels/printers/pp-new-printer-dialog.c:665
+#: ../panels/printers/pp-new-printer-dialog.c:654
 msgid "Getting devices..."
 msgstr "Henter enheter â"
 
 #. Translators: No localy connected printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1277
+#: ../panels/printers/pp-new-printer-dialog.c:1254
 msgid "No local printers found"
 msgstr "Ingen lokale skrivere funnet"
 
 #. Translators: No network printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1290
+#: ../panels/printers/pp-new-printer-dialog.c:1267
 msgid "No network printers found"
 msgstr "Ingen nettverksskrivere funnet"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1382
+#: ../panels/printers/pp-new-printer-dialog.c:1359
 msgid ""
 "FirewallD is not running. Network printer detection needs services mdns, "
 "ipp, ipp-client and samba-client enabled on firewall."
@@ -2477,42 +2600,42 @@ msgstr ""
 "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:1410
-#: ../panels/printers/pp-new-printer-dialog.c:1415
+#: ../panels/printers/pp-new-printer-dialog.c:1387
+#: ../panels/printers/pp-new-printer-dialog.c:1392
 msgid "Devices"
 msgstr "Enheter"
 
 #. Translators: Local means local printers
-#: ../panels/printers/pp-new-printer-dialog.c:1440
+#: ../panels/printers/pp-new-printer-dialog.c:1417
 msgctxt "printer type"
 msgid "Local"
 msgstr "Lokal"
 
 #. Translators: Network means network printers
-#: ../panels/printers/pp-new-printer-dialog.c:1442
+#: ../panels/printers/pp-new-printer-dialog.c:1419
 msgctxt "printer type"
 msgid "Network"
 msgstr "Nettverk"
 
 #. Translators: Device types column (network or local)
-#: ../panels/printers/pp-new-printer-dialog.c:1483
+#: ../panels/printers/pp-new-printer-dialog.c:1460
 msgid "Device types"
 msgstr "Typer enhet"
 
 #. Translators: Name of job which makes printer to autoconfigure itself
-#: ../panels/printers/pp-new-printer-dialog.c:1782
+#: ../panels/printers/pp-new-printer-dialog.c:1759
 msgid "Automatic configuration"
 msgstr "Automatisk konfigurasjon"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1865
+#: ../panels/printers/pp-new-printer-dialog.c:1842
 msgid "Opening firewall for mDNS connections"
 msgstr "Ãpner brannmur for mDNS-tilkoblinger"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1874
+#: ../panels/printers/pp-new-printer-dialog.c:1851
 msgid "Opening firewall for Samba connections"
 msgstr "Ãpner brannmur for Samba-tilkoblinger"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1883
+#: ../panels/printers/pp-new-printer-dialog.c:1860
 msgid "Opening firewall for IPP connections"
 msgstr "Ãpner brannmur for IPP-tilkoblinger"
 
@@ -2778,10 +2901,6 @@ msgstr "Nye vinduer bruker forvalgt utforming"
 msgid "New windows use the previous window's layout"
 msgstr "Nye vinduer bruker utforming fra forrige vindu"
 
-#: ../panels/region/gnome-region-panel.ui.h:26
-msgid "_Options..."
-msgstr "_Alternativer â"
-
 #: ../panels/region/gnome-region-panel.ui.h:27
 msgid "View and edit keyboard layout options"
 msgstr "Vis og rediger alternativer for tastaturutforming"
@@ -3675,7 +3794,7 @@ msgid "Right little finger"
 msgstr "HÃyre lillefinger"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:571
+#: ../panels/user-accounts/um-fingerprint-dialog.c:706
 msgid "Enable Fingerprint Login"
 msgstr "Slà pà innlogging med fingeravtrykk"
 
@@ -3912,33 +4031,33 @@ msgstr "Ukjent feil"
 msgid "Failed to create user"
 msgstr "Kunne ikke opprette bruker"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:107
+#: ../panels/user-accounts/um-fingerprint-dialog.c:139
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
 msgstr "Du har ikke tilgang til enheten. Kontakt din systemadministrator."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:109
+#: ../panels/user-accounts/um-fingerprint-dialog.c:141
 msgid "The device is already in use."
 msgstr "Enheten er allerede i bruk."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:111
+#: ../panels/user-accounts/um-fingerprint-dialog.c:143
 msgid "An internal error occurred."
 msgstr "En intern feil har oppstÃtt."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:181
-#: ../panels/user-accounts/um-fingerprint-dialog.c:182
+#: ../panels/user-accounts/um-fingerprint-dialog.c:219
+#: ../panels/user-accounts/um-fingerprint-dialog.c:220
 msgid "Enabled"
 msgstr "SlÃtt pÃ"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:224
+#: ../panels/user-accounts/um-fingerprint-dialog.c:268
 msgid "Delete registered fingerprints?"
 msgstr "Slett registrerte fingeravtrykk?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:228
+#: ../panels/user-accounts/um-fingerprint-dialog.c:272
 msgid "_Delete Fingerprints"
 msgstr "_Slett fingeravtrykk"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:235
+#: ../panels/user-accounts/um-fingerprint-dialog.c:279
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
@@ -3946,15 +4065,15 @@ msgstr ""
 "Vil du slette dine registrerte fingeravtrykk slik at innlogging med "
 "fingeravtrykk slÃs av?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:363
+#: ../panels/user-accounts/um-fingerprint-dialog.c:455
 msgid "Done!"
 msgstr "Ferdig"
 
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:410
-#: ../panels/user-accounts/um-fingerprint-dialog.c:432
+#: ../panels/user-accounts/um-fingerprint-dialog.c:516
+#: ../panels/user-accounts/um-fingerprint-dialog.c:558
 #, c-format
 msgid "Could not access '%s' device"
 msgstr "Kunne ikke aksessere enheten Â%sÂ"
@@ -3962,16 +4081,16 @@ msgstr "Kunne ikke aksessere enheten Â%sÂ"
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:481
+#: ../panels/user-accounts/um-fingerprint-dialog.c:603
 #, c-format
 msgid "Could not start finger capture on '%s' device"
 msgstr "Kunne ikke starte innlesing av data pà enhet Â%sÂ"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:533
+#: ../panels/user-accounts/um-fingerprint-dialog.c:655
 msgid "Could not access any fingerprint readers"
 msgstr "Kunne ikke aksessere fingeravtrykkleser"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:534
+#: ../panels/user-accounts/um-fingerprint-dialog.c:656
 msgid "Please contact your system administrator for help."
 msgstr "Kontakt din systemadministrator for hjelp."
 
@@ -3980,7 +4099,7 @@ msgstr "Kontakt din systemadministrator for hjelp."
 #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
 #. * 'Digital Persona U.are.U 4000/4000B' device."
 #.
-#: ../panels/user-accounts/um-fingerprint-dialog.c:605
+#: ../panels/user-accounts/um-fingerprint-dialog.c:740
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
@@ -3989,15 +4108,15 @@ msgstr ""
 "Du mà lagre ett av dine fingeravtrykk med enheten Â%s for à slà pà "
 "innlogging med fingeravtrykk."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:612
+#: ../panels/user-accounts/um-fingerprint-dialog.c:747
 msgid "Selecting finger"
 msgstr "Velger finger"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:613
+#: ../panels/user-accounts/um-fingerprint-dialog.c:748
 msgid "Enrolling fingerprints"
 msgstr "Registrerer fingeravtrykk"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:614
+#: ../panels/user-accounts/um-fingerprint-dialog.c:749
 msgid "Summary"
 msgstr "Sammendrag"
 
@@ -4092,29 +4211,29 @@ msgstr "Se etter flere bilder â"
 msgid "Used by %s"
 msgstr "Brukt av %s"
 
-#: ../panels/user-accounts/um-user-manager.c:450
+#: ../panels/user-accounts/um-user-manager.c:463
 #, c-format
 msgid "A user with name '%s' already exists."
 msgstr "En bruker med navn Â%s eksisterer allerede."
 
-#: ../panels/user-accounts/um-user-manager.c:546
+#: ../panels/user-accounts/um-user-manager.c:569
 msgid "This user does not exist."
 msgstr "Denne brukeren eksisterer ikke."
 
-#: ../panels/user-accounts/um-user-panel.c:358
+#: ../panels/user-accounts/um-user-panel.c:355
 msgid "Failed to delete user"
 msgstr "Klarte ikke à slette bruker"
 
-#: ../panels/user-accounts/um-user-panel.c:418
+#: ../panels/user-accounts/um-user-panel.c:415
 msgid "You cannot delete your own account."
 msgstr "Du kan ikke slette din egen konto."
 
-#: ../panels/user-accounts/um-user-panel.c:427
+#: ../panels/user-accounts/um-user-panel.c:424
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s er fremdeles logget inn"
 
-#: ../panels/user-accounts/um-user-panel.c:431
+#: ../panels/user-accounts/um-user-panel.c:428
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
@@ -4122,12 +4241,12 @@ msgstr ""
 "Hvis du sletter en innlogget bruker kan systemet ende opp i en inkonsistent "
 "tilstand."
 
-#: ../panels/user-accounts/um-user-panel.c:440
+#: ../panels/user-accounts/um-user-panel.c:437
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "Vil du beholde filene til %s?"
 
-#: ../panels/user-accounts/um-user-panel.c:444
+#: ../panels/user-accounts/um-user-panel.c:441
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
@@ -4135,38 +4254,38 @@ msgstr ""
 "Det er mulig à beholde hjemmekatalogen, e-postkÃen og midlertidige filer nÃr "
 "du sletter en brukerkonto."
 
-#: ../panels/user-accounts/um-user-panel.c:447
+#: ../panels/user-accounts/um-user-panel.c:444
 msgid "_Delete Files"
 msgstr "_Slett filer"
 
-#: ../panels/user-accounts/um-user-panel.c:448
+#: ../panels/user-accounts/um-user-panel.c:445
 msgid "_Keep Files"
 msgstr "_Behold filer"
 
-#: ../panels/user-accounts/um-user-panel.c:500
+#: ../panels/user-accounts/um-user-panel.c:497
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "Konto deaktivert"
 
-#: ../panels/user-accounts/um-user-panel.c:508
+#: ../panels/user-accounts/um-user-panel.c:505
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "Settes ved neste innlogging"
 
-#: ../panels/user-accounts/um-user-panel.c:511
+#: ../panels/user-accounts/um-user-panel.c:508
 msgctxt "Password mode"
 msgid "None"
 msgstr "Ingen"
 
-#: ../panels/user-accounts/um-user-panel.c:846
+#: ../panels/user-accounts/um-user-panel.c:843
 msgid "Failed to contact the accounts service"
 msgstr "Klarte ikke à kontakte kontotjenesten"
 
-#: ../panels/user-accounts/um-user-panel.c:848
+#: ../panels/user-accounts/um-user-panel.c:845
 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:888
+#: ../panels/user-accounts/um-user-panel.c:885
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -4174,12 +4293,12 @@ msgstr ""
 "Klikk pà *-ikonet\n"
 "for à gjÃre endringer"
 
-#: ../panels/user-accounts/um-user-panel.c:926
+#: ../panels/user-accounts/um-user-panel.c:923
 msgid "Create a user account"
 msgstr "Lag en ny brukerkonto"
 
-#: ../panels/user-accounts/um-user-panel.c:937
-#: ../panels/user-accounts/um-user-panel.c:1226
+#: ../panels/user-accounts/um-user-panel.c:934
+#: ../panels/user-accounts/um-user-panel.c:1223
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -4187,12 +4306,12 @@ msgstr ""
 "Klikk pà *-ikonet\n"
 "for à lage en brukerkonto"
 
-#: ../panels/user-accounts/um-user-panel.c:946
+#: ../panels/user-accounts/um-user-panel.c:943
 msgid "Delete the selected user account"
 msgstr "Slett valgt brukerkonto"
 
-#: ../panels/user-accounts/um-user-panel.c:958
-#: ../panels/user-accounts/um-user-panel.c:1231
+#: ../panels/user-accounts/um-user-panel.c:955
+#: ../panels/user-accounts/um-user-panel.c:1228
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -4200,11 +4319,11 @@ msgstr ""
 "Klikk pà *-ikonet\n"
 "for à slette valgt brukerkonto"
 
-#: ../panels/user-accounts/um-user-panel.c:1135
+#: ../panels/user-accounts/um-user-panel.c:1132
 msgid "My Account"
 msgstr "Min konto"
 
-#: ../panels/user-accounts/um-user-panel.c:1145
+#: ../panels/user-accounts/um-user-panel.c:1142
 msgid "Other Accounts"
 msgstr "Andre kontoer"
 
@@ -4295,6 +4414,10 @@ msgstr "Kalibrer â"
 msgid "Map Buttons..."
 msgstr "Tilegne knapper â"
 
+#: ../panels/wacom/gnome-wacom-properties.ui.h:13
+msgid "Display Mapping..."
+msgstr "Vis kobling â"
+
 #: ../panels/wacom/wacom-stylus-page.ui.h:1
 msgid "No Action"
 msgstr "Ingen handling"
@@ -4363,6 +4486,79 @@ msgstr "Ãverste knapp"
 msgid "Stylus"
 msgstr "Penn"
 
+#: ../panels/wacom/button-mapping.ui.h:1
+msgid "Map Buttons"
+msgstr "Tilegne knapper"
+
+#: ../panels/wacom/button-mapping.ui.h:2
+msgid "Map buttons to functions"
+msgstr "Koble knapper til funksjoner"
+
+#: ../panels/wacom/gsd-wacom-device.c:882
+#, c-format
+msgid "Left Ring Mode #%d"
+msgstr "Venstre ringmodus #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:889
+#, c-format
+msgid "Right Ring Mode #%d"
+msgstr "HÃyre ringmodus #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:917
+#, c-format
+msgid "Left Touchstrip Mode #%d"
+msgstr ""
+
+#: ../panels/wacom/gsd-wacom-device.c:924
+#, c-format
+msgid "Right Touchstrip Mode #%d"
+msgstr ""
+
+#: ../panels/wacom/gsd-wacom-device.c:939
+#, c-format
+msgid "Left Touchring Mode Switch"
+msgstr ""
+
+#: ../panels/wacom/gsd-wacom-device.c:941
+#, c-format
+msgid "Right Touchring Mode Switch"
+msgstr ""
+
+#: ../panels/wacom/gsd-wacom-device.c:944
+#, c-format
+msgid "Left Touchstrip Mode Switch"
+msgstr ""
+
+#: ../panels/wacom/gsd-wacom-device.c:946
+#, c-format
+msgid "Right Touchstrip Mode Switch"
+msgstr ""
+
+#: ../panels/wacom/gsd-wacom-device.c:951
+#, c-format
+msgid "Mode Switch #%d"
+msgstr "Modusbytte #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:1023
+#, c-format
+msgid "Left Button #%d"
+msgstr "Venstre knapp #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:1026
+#, c-format
+msgid "Right Button #%d"
+msgstr "HÃyre knapp #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:1029
+#, c-format
+msgid "Top Button #%d"
+msgstr "Ãverste knapp #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:1032
+#, c-format
+msgid "Bottom Button #%d"
+msgstr "Nederste knapp #%d"
+
 #. Text printed on screen
 #: ../panels/wacom/calibrator/gui_gtk.c:70
 msgid "Screen Calibration"
@@ -4386,31 +4582,40 @@ msgid "%d of %d"
 msgstr "%d av %d"
 
 #: ../panels/wacom/cc-wacom-stylus-page.c:374
+#: ../panels/wacom/cc-wacom-page.c:437
 msgid "Button"
 msgstr "Knapp"
 
-#: ../shell/control-center.c:54
+#: ../panels/wacom/cc-wacom-page.c:251
+msgid "Switch Modes"
+msgstr "Bytt modus"
+
+#: ../panels/wacom/cc-wacom-page.c:562
+msgid "Display Mapping"
+msgstr "Vis kobling"
+
+#: ../shell/control-center.c:58
 msgid "Enable verbose mode"
 msgstr "Vis mer informasjon"
 
-#: ../shell/control-center.c:55
+#: ../shell/control-center.c:59
 msgid "Show the overview"
 msgstr "Vis oversikt"
 
-#: ../shell/control-center.c:56 ../shell/control-center.c:57
-#: ../shell/control-center.c:58
+#: ../shell/control-center.c:60 ../shell/control-center.c:61
+#: ../shell/control-center.c:62
 msgid "Show help options"
 msgstr "Vis flagg for hjelp"
 
-#: ../shell/control-center.c:59
+#: ../shell/control-center.c:63
 msgid "Panel to display"
 msgstr "Panel som skal vises"
 
-#: ../shell/control-center.c:81
+#: ../shell/control-center.c:85
 msgid "- System Settings"
 msgstr "- Systeminnstillinger"
 
-#: ../shell/control-center.c:89
+#: ../shell/control-center.c:93
 #, c-format
 msgid ""
 "%s\n"