[gnome-control-center] Updated Norwegian bokmål transl ation



commit 1c180d306b1e62c9f057cc14bdc1070b4d5f8670
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Mon Feb 25 19:03:43 2013 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 2680 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 1742 insertions(+), 938 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index a96c03b..23d9be9 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: 2013-01-29 18:27+0100\n"
-"PO-Revision-Date: 2013-01-29 18:28+0100\n"
+"POT-Creation-Date: 2013-02-25 18:39+0100\n"
+"PO-Revision-Date: 2013-02-25 19:03+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb lister ping uio no>\n"
 "Language: \n"
@@ -81,22 +81,22 @@ msgstr "Flickr"
 msgid "Select"
 msgstr "Velg"
 
-#: ../panels/background/cc-background-item.c:148
+#: ../panels/background/cc-background-item.c:150
 msgid "multiple sizes"
 msgstr "flere størrelser"
 
 #. translators: 100 × 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: ../panels/background/cc-background-item.c:152
+#: ../panels/background/cc-background-item.c:154
 #, c-format
 msgid "%d × %d"
 msgstr "%d x %d"
 
-#: ../panels/background/cc-background-item.c:281
+#: ../panels/background/cc-background-item.c:283
 msgid "No Desktop Background"
 msgstr "Ingen skrivebordsbakgrunn"
 
-#: ../panels/background/cc-background-panel.c:449
+#: ../panels/background/cc-background-panel.c:453
 msgid "Current background"
 msgstr "Nåværende bakgrunn"
 
@@ -105,84 +105,80 @@ msgid "Background"
 msgstr "Bakgrunn"
 
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:2
-msgid "Change the background"
-msgstr "Endre bakgrunnen"
+msgid "Change your background image to a wallpaper or photo"
+msgstr "Bytt bakgrunnsbilde"
 
 #. Translators: those are keywords for the background control-center panel
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:4
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Bakgrunn;Skjerm;Skrivebord;"
 
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
-msgid "Bluetooth"
-msgstr "Blåtann"
-
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
-msgid "Configure Bluetooth settings"
-msgstr "Konfigurer innstillinger for Bluetooth"
-
-#. Translator: This string appears next to a toggle switch which controls enabling/disabling Bluetooth 
radio's on the device.
-#: ../panels/bluetooth/bluetooth.ui.h:2
-msgctxt "Power"
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
-#: ../panels/bluetooth/bluetooth.ui.h:3
+#: ../panels/bluetooth/bluetooth.ui.h:1
 msgid "Set Up New Device"
 msgstr "Sett opp ny enhet"
 
-#: ../panels/bluetooth/bluetooth.ui.h:4 ../panels/network/network.ui.h:9
+#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
 msgid "Remove Device"
 msgstr "Fjern enhet"
 
-#: ../panels/bluetooth/bluetooth.ui.h:5
+#: ../panels/bluetooth/bluetooth.ui.h:3
 msgid "Connection"
 msgstr "Tilkobling"
 
-#: ../panels/bluetooth/bluetooth.ui.h:6 ../panels/printers/printers.ui.h:14
-#: ../panels/region/gnome-region-panel.ui.h:3
+#: ../panels/bluetooth/bluetooth.ui.h:4
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
+#: ../panels/network/connection-editor/security-page.ui.h:2
+#: ../panels/printers/printers.ui.h:14
 msgid "page 1"
 msgstr "side 1"
 
-#: ../panels/bluetooth/bluetooth.ui.h:7 ../panels/printers/printers.ui.h:16
-#: ../panels/region/gnome-region-panel.ui.h:5
+#: ../panels/bluetooth/bluetooth.ui.h:5
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
+#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/printers/printers.ui.h:16
 msgid "page 2"
 msgstr "side 2"
 
-#: ../panels/bluetooth/bluetooth.ui.h:8
+#: ../panels/bluetooth/bluetooth.ui.h:6
 msgid "Paired"
 msgstr "Koblet"
 
-#: ../panels/bluetooth/bluetooth.ui.h:9 ../panels/wacom/cc-wacom-page.c:789
+#: ../panels/bluetooth/bluetooth.ui.h:7 ../panels/wacom/cc-wacom-page.c:789
 msgid "Type"
 msgstr "Type:"
 
-#: ../panels/bluetooth/bluetooth.ui.h:10
+#: ../panels/bluetooth/bluetooth.ui.h:8
+#: ../panels/network/connection-editor/ce-page-ip4.c:189
+#: ../panels/network/connection-editor/ce-page-ip4.c:441
+#: ../panels/network/connection-editor/ce-page-ip6.c:191
+#: ../panels/network/connection-editor/ce-page-ip6.c:445
 msgid "Address"
 msgstr "Adresse"
 
-#: ../panels/bluetooth/bluetooth.ui.h:11
+#: ../panels/bluetooth/bluetooth.ui.h:9
 msgid "Mouse & Touchpad Settings"
 msgstr "Innstillinger for mus og pekeplate"
 
-#: ../panels/bluetooth/bluetooth.ui.h:12
+#: ../panels/bluetooth/bluetooth.ui.h:10
 #: ../panels/universal-access/uap.ui.h:38
 msgid "Sound Settings"
 msgstr "Innstillinger for lyd"
 
-#: ../panels/bluetooth/bluetooth.ui.h:13
+#: ../panels/bluetooth/bluetooth.ui.h:11
 msgid "Keyboard Settings"
 msgstr "Innstillinger for tastatur"
 
-#: ../panels/bluetooth/bluetooth.ui.h:14
+#: ../panels/bluetooth/bluetooth.ui.h:12
 msgid "Send Files…"
 msgstr "Send filer …"
 
 #: ../panels/bluetooth/cc-bluetooth-panel.c:355
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
 msgid "Yes"
 msgstr "Ja"
 
 #: ../panels/bluetooth/cc-bluetooth-panel.c:355
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
 msgid "No"
 msgstr "Nei"
 
@@ -219,6 +215,14 @@ msgstr ""
 "Hvis du fjerner enheten vil du måtte sette den opp på nytt før du bruker den "
 "igjen."
 
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
+msgid "Bluetooth"
+msgstr "Blåtann"
+
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+msgid "Turn Bluetooth on and off and connect your devices"
+msgstr "Slå av/på blåtann og koble til dine enheter"
+
 #. TRANSLATORS: The user has to attach the sensor to the screen
 #: ../panels/color/cc-color-calibrate.c:360
 msgid "Place your calibration device over the square and press 'Start'"
@@ -335,64 +339,75 @@ msgstr "%s skriver"
 msgid "%s Webcam"
 msgstr "%s webkamera"
 
+#: ../panels/color/cc-color-device.c:89
+#, c-format
+msgid "Enable color management for %s"
+msgstr "Slå på fargehåndtering for %s"
+
+#: ../panels/color/cc-color-device.c:93
+#, c-format
+msgid "Show color profiles for %s"
+msgstr "Vis fargeprofiler for %s"
+
 #. not calibrated
-#: ../panels/color/cc-color-device.c:303
+#: ../panels/color/cc-color-device.c:322
 msgid "Not calibrated"
 msgstr "Ikke kalibrert"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: ../panels/color/cc-color-panel.c:131
+#: ../panels/color/cc-color-panel.c:133
 msgid "Default: "
 msgstr "Forvalg: "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile his a standard space like AdobeRGB
-#: ../panels/color/cc-color-panel.c:139
+#: ../panels/color/cc-color-panel.c:141
 msgid "Colorspace: "
 msgstr "Fargeområde: "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:146
+#: ../panels/color/cc-color-panel.c:148
 msgid "Test profile: "
 msgstr "Testprofil:"
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:214
+#: ../panels/color/cc-color-panel.c:216
 msgid "Select ICC Profile File"
 msgstr "Velg fil for ICC-profil"
 
-#: ../panels/color/cc-color-panel.c:217
+#: ../panels/color/cc-color-panel.c:219
 msgid "_Import"
 msgstr "_Importer"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:228
+#: ../panels/color/cc-color-panel.c:230
 msgid "Supported ICC profiles"
 msgstr "Støttede ICC-profiler"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:235
+#: ../panels/color/cc-color-panel.c:237
+#: ../panels/network/wireless-security/eap-method-fast.c:410
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../panels/color/cc-color-panel.c:506
+#: ../panels/color/cc-color-panel.c:581
 msgid "Screen"
 msgstr "Skjerm"
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: ../panels/color/cc-color-panel.c:776
+#: ../panels/color/cc-color-panel.c:853
 msgid "Save Profile"
 msgstr "Lagre profil"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:1137
+#: ../panels/color/cc-color-panel.c:1214
 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:1152 ../panels/color/cc-color-panel.c:1176
+#: ../panels/color/cc-color-panel.c:1229 ../panels/color/cc-color-panel.c:1253
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
@@ -401,12 +416,12 @@ msgstr ""
 "tilkoblet."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1186
+#: ../panels/color/cc-color-panel.c:1263
 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:1197
+#: ../panels/color/cc-color-panel.c:1274
 msgid "The device type is not currently supported."
 msgstr "Enhetstypen er ikke støttet."
 
@@ -491,6 +506,7 @@ msgid "Display Calibration"
 msgstr "Kalibrering av skjerm"
 
 #: ../panels/color/color-calibrate.ui.h:2
+#: ../panels/printers/authentication-dialog.ui.h:2
 #: ../panels/printers/ppd-selection-dialog.ui.h:2
 #: ../panels/user-accounts/data/photo-dialog.ui.h:8
 #: ../panels/user-accounts/um-account-dialog.c:1067
@@ -547,20 +563,20 @@ msgid "Calibration Quality"
 msgstr "Kvalitet på kalibrering"
 
 #: ../panels/color/color.ui.h:9
-msgid "Select the type of display that is connected."
-msgstr "Velg type skjerm som er koblet til."
+msgid "Select the sensor device you want to use for calibration."
+msgstr "Velg sensorenhet du vil bruke for kalibreringen."
 
 #: ../panels/color/color.ui.h:10
-msgid "Display Type"
-msgstr "Type skjerm"
+msgid "Calibration Device"
+msgstr "Kalibreringsenhet"
 
 #: ../panels/color/color.ui.h:11
-msgid "Select the sensor device you want to use for calibration."
-msgstr "Velg sensorenhet du vil bruke for kalibreringen."
+msgid "Select the type of display that is connected."
+msgstr "Velg type skjerm som er koblet til."
 
 #: ../panels/color/color.ui.h:12
-msgid "Calibration Device"
-msgstr "Kalibreringsenhet"
+msgid "Display Type"
+msgstr "Type skjerm"
 
 #: ../panels/color/color.ui.h:13
 msgid ""
@@ -729,117 +745,202 @@ msgid "Projector"
 msgstr "Prosjektor"
 
 #: ../panels/color/color.ui.h:48
+msgid "Plasma"
+msgstr "Plasma"
+
+#: ../panels/color/color.ui.h:49
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "Høy"
 
-#: ../panels/color/color.ui.h:49
+#: ../panels/color/color.ui.h:50
 msgid "40 minutes"
 msgstr "40 minutter"
 
-#: ../panels/color/color.ui.h:50
+#: ../panels/color/color.ui.h:51
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "Middels"
 
-#: ../panels/color/color.ui.h:51 ../panels/power/power.ui.h:5
+#: ../panels/color/color.ui.h:52 ../panels/power/power.ui.h:4
 #: ../panels/privacy/privacy.ui.h:7
 msgid "30 minutes"
 msgstr "30 minutter"
 
-#: ../panels/color/color.ui.h:52
+#: ../panels/color/color.ui.h:53
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "Lav"
 
-#: ../panels/color/color.ui.h:53
+#: ../panels/color/color.ui.h:54 ../panels/power/power.ui.h:3
 msgid "15 minutes"
 msgstr "15 minutter"
 
-#: ../panels/color/color.ui.h:54
-#, fuzzy
+#: ../panels/color/color.ui.h:55
 msgid "Native to display"
-msgstr "Panel som skal vises"
+msgstr ""
 
-#: ../panels/color/color.ui.h:55
+#: ../panels/color/color.ui.h:56
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (Utskrift og trykking)"
 
-#: ../panels/color/color.ui.h:56
+#: ../panels/color/color.ui.h:57
 msgid "D55"
 msgstr "D55"
 
-#: ../panels/color/color.ui.h:57
+#: ../panels/color/color.ui.h:58
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (fotografi og grafikk)"
 
-#: ../panels/color/color.ui.h:58
+#: ../panels/color/color.ui.h:59
 msgid "D75"
 msgstr "D75"
 
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
-msgid "Color management settings"
-msgstr "Innstillinger for fargestyring"
+msgid ""
+"Calibrate the color of your devices, such as displays, cameras or printers"
+msgstr "Kalibrer fargene for dine enheter som f.eks. skjermer, kamera eller skrivere"
 
 #. Translators: those are keywords for the color control-center panel
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:4
 msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
 msgstr "Farge;ICC;Profil;Kalibrer;Skriver;Skjerm;"
 
-#: ../panels/common/cc-common-language.c:639
-msgid "British English"
-msgstr "Britisk engelsk"
-
-#: ../panels/common/cc-common-language.c:642
-msgid "Spanish"
-msgstr "Spansk"
-
-#: ../panels/common/cc-common-language.c:643
-msgid "Chinese (simplified)"
-msgstr "Kinesisk (forenklet)"
-
 #. Add some common regions
-#: ../panels/common/cc-common-language.c:687
+#: ../panels/common/cc-common-language.c:677
 msgid "United States"
 msgstr "USA"
 
-#: ../panels/common/cc-common-language.c:688
+#: ../panels/common/cc-common-language.c:678
 msgid "Germany"
 msgstr "Tyskland"
 
-#: ../panels/common/cc-common-language.c:689
+#: ../panels/common/cc-common-language.c:679
 msgid "France"
 msgstr "Frankrike"
 
-#: ../panels/common/cc-common-language.c:690
+#: ../panels/common/cc-common-language.c:680
 msgid "Spain"
 msgstr "Spania"
 
-#: ../panels/common/cc-common-language.c:691
+#: ../panels/common/cc-common-language.c:681
 msgid "China"
 msgstr "Kina"
 
-#: ../panels/common/cc-language-chooser.c:120
+#: ../panels/common/cc-common-language.c:747
 msgid "Other…"
 msgstr "Annet …"
 
-#: ../panels/common/cc-language-chooser.c:292
-msgid "Select a region"
-msgstr "Velg en region"
+#: ../panels/common/cc-language-chooser.c:165
+#: ../panels/region/cc-format-chooser.c:256
+#: ../panels/region/cc-input-chooser.c:171
+msgid "More…"
+msgstr "Mer …"
 
-#: ../panels/common/language-chooser.ui.h:1
-msgid "Select a language"
-msgstr "Velg et språk"
+#: ../panels/common/cc-language-chooser.c:174
+msgid "No languages found"
+msgstr "Ingen språk funnet"
 
-#: ../panels/common/language-chooser.ui.h:2
-#: ../panels/printers/new-printer-dialog.ui.h:1
-#: ../panels/user-accounts/um-user-panel.c:467
-msgid "_Cancel"
-msgstr "A_vbryt"
+#. translators:
+#. * The device has been disabled
+#: ../panels/common/cc-util.c:28 ../panels/keyboard/cc-keyboard-option.c:276
+#: ../panels/keyboard/cc-keyboard-option.c:408
+#: ../panels/keyboard/keyboard-shortcuts.c:1160
+#: ../panels/network/network-wifi.ui.h:30
+#: ../panels/sound/gvc/gvc-mixer-control.c:1828
+#: ../panels/user-accounts/um-fingerprint-dialog.c:215
+#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+msgid "Disabled"
+msgstr "Slått av"
+
+#: ../panels/common/cc-util.c:29
+msgid "Left Shift"
+msgstr "Venstre Shift"
+
+#: ../panels/common/cc-util.c:30
+msgid "Left Alt"
+msgstr "Venstre Alt"
+
+#: ../panels/common/cc-util.c:31
+msgid "Left Ctrl"
+msgstr "Venstre Ctrl"
+
+#: ../panels/common/cc-util.c:32
+msgid "Right Shift"
+msgstr "Høyre Shift"
+
+#: ../panels/common/cc-util.c:33
+msgid "Right Alt"
+msgstr "Høyre Alt"
+
+#: ../panels/common/cc-util.c:34
+msgid "Right Ctrl"
+msgstr "Høyre Ctrl"
+
+#: ../panels/common/cc-util.c:35
+msgid "Left Alt+Shift"
+msgstr "Venstre Alt+Shift"
+
+#: ../panels/common/cc-util.c:36
+msgid "Right Alt+Shift"
+msgstr "Høyre Alt+Shift"
+
+#: ../panels/common/cc-util.c:37
+msgid "Left Ctrl+Shift"
+msgstr "Venstre Ctrl+Shift"
+
+#: ../panels/common/cc-util.c:38
+msgid "Right Ctrl+Shift"
+msgstr "Høyre Ctrl+Shift"
+
+#: ../panels/common/cc-util.c:39
+msgid "Left+Right Shift"
+msgstr "Venstre+høyre Shift"
+
+#: ../panels/common/cc-util.c:40 ../panels/region/input-options.ui.h:11
+msgid "Left+Right Alt"
+msgstr "Venstre+høyre Alt"
+
+#: ../panels/common/cc-util.c:41
+msgid "Left+Right Ctrl"
+msgstr "Venstre+høyre Ctrl"
+
+#: ../panels/common/cc-util.c:42
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
+
+#: ../panels/common/cc-util.c:43
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
+
+#: ../panels/common/cc-util.c:44
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
+
+#: ../panels/common/cc-util.c:45
+msgid "Caps"
+msgstr "Caps"
+
+#: ../panels/common/cc-util.c:46
+msgid "Shift+Caps"
+msgstr "Shift+Caps"
+
+#: ../panels/common/cc-util.c:47
+msgid "Alt+Caps"
+msgstr "Alt+Caps"
+
+#: ../panels/common/cc-util.c:48
+msgid "Ctrl+Caps"
+msgstr "Ctrl+Caps"
+
+#: ../panels/common/language-chooser.ui.h:1 ../panels/region/region.ui.h:1
+msgid "Language"
+msgstr "Språk"
 
-#: ../panels/common/language-chooser.ui.h:3
-msgid "_Select"
-msgstr "_Velg"
+#: ../panels/common/language-chooser.ui.h:2
+#: ../panels/region/format-chooser.ui.h:2
+msgid "_Done"
+msgstr "Fer_dig"
 
 #: ../panels/datetime/datetime.ui.h:1
 msgid "_Region:"
@@ -951,8 +1052,8 @@ msgid "Date & Time"
 msgstr "Dato og klokkeslett"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
-msgid "Date and Time preferences panel"
-msgstr "Brukervalgpanel for dato og klokkeslett"
+msgid "Change the date and time, including time zone"
+msgstr "Endra dato og klokkeslett - inklusive tidssone"
 
 #. Translators: those are keywords for the date and time control-center panel
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4
@@ -1000,7 +1101,7 @@ msgstr "180 grader"
 #. * the Spanish translation could be "Pantallas en Espejo".
 #.
 #: ../panels/display/cc-display-panel.c:625
-#: ../panels/display/cc-rr-labeler.c:449
+#: ../panels/display/cc-rr-labeler.c:418
 msgid "Mirrored Displays"
 msgstr "Speilede skjermer"
 
@@ -1073,8 +1174,8 @@ msgid "Displays"
 msgstr "Skjermer"
 
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-msgid "Change resolution and position of monitors and projectors"
-msgstr "Bytt oppløsing og posisjon for skjermer og prosjektorer"
+msgid "Choose how to use connected monitors and projectors"
+msgstr "Velg hvordan tilkoblede skjermer og prosjektorer skal brukes"
 
 #. Translators: those are keywords for the display control-center panel
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:4
@@ -1082,53 +1183,53 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "Panel;Prosjektor;xrandr;Skjerm;Oppløsning;Oppdater;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:441 ../panels/network/panel-common.c:120
+#: ../panels/info/cc-info-panel.c:440 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../panels/info/cc-info-panel.c:542
+#: ../panels/info/cc-info-panel.c:541
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %d-bit"
 
-#: ../panels/info/cc-info-panel.c:544
+#: ../panels/info/cc-info-panel.c:543
 #, c-format
 msgid "%d-bit"
 msgstr "%d-bit"
 
-#: ../panels/info/cc-info-panel.c:1219
+#: ../panels/info/cc-info-panel.c:1218
 msgid "Ask what to do"
 msgstr "Spør hvs som skal gjøres"
 
-#: ../panels/info/cc-info-panel.c:1223
+#: ../panels/info/cc-info-panel.c:1222
 msgid "Do nothing"
 msgstr "Ikke gjør noe"
 
-#: ../panels/info/cc-info-panel.c:1227
+#: ../panels/info/cc-info-panel.c:1226
 msgid "Open folder"
 msgstr "Åpne mappe"
 
-#: ../panels/info/cc-info-panel.c:1318
+#: ../panels/info/cc-info-panel.c:1317
 msgid "Other Media"
 msgstr "Annet medie"
 
-#: ../panels/info/cc-info-panel.c:1349
+#: ../panels/info/cc-info-panel.c:1348
 msgid "Select an application for audio CDs"
 msgstr "Velg et program for lyd-CDer"
 
-#: ../panels/info/cc-info-panel.c:1350
+#: ../panels/info/cc-info-panel.c:1349
 msgid "Select an application for video DVDs"
 msgstr "Velg et program for video-DVDer"
 
-#: ../panels/info/cc-info-panel.c:1351
+#: ../panels/info/cc-info-panel.c:1350
 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:1352
+#: ../panels/info/cc-info-panel.c:1351
 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:1353
+#: ../panels/info/cc-info-panel.c:1352
 msgid "Select an application for software CDs"
 msgstr "Velg et program for programvare-CDer"
 
@@ -1137,109 +1238,108 @@ 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:1365
+#: ../panels/info/cc-info-panel.c:1364
 msgid "audio DVD"
 msgstr "Lyd-DVD"
 
-#: ../panels/info/cc-info-panel.c:1366
+#: ../panels/info/cc-info-panel.c:1365
 msgid "blank Blu-ray disc"
 msgstr "Tom Blu-ray-plate"
 
-#: ../panels/info/cc-info-panel.c:1367
+#: ../panels/info/cc-info-panel.c:1366
 msgid "blank CD disc"
 msgstr "Tom CD-plate"
 
-#: ../panels/info/cc-info-panel.c:1368
+#: ../panels/info/cc-info-panel.c:1367
 msgid "blank DVD disc"
 msgstr "Tom DVD-plate"
 
-#: ../panels/info/cc-info-panel.c:1369
+#: ../panels/info/cc-info-panel.c:1368
 msgid "blank HD DVD disc"
 msgstr "tom HD-DVD plate"
 
-#: ../panels/info/cc-info-panel.c:1370
+#: ../panels/info/cc-info-panel.c:1369
 msgid "Blu-ray video disc"
 msgstr "Blu-ray videoplate"
 
-#: ../panels/info/cc-info-panel.c:1371
+#: ../panels/info/cc-info-panel.c:1370
 msgid "e-book reader"
 msgstr "E-bokleser"
 
-#: ../panels/info/cc-info-panel.c:1372
+#: ../panels/info/cc-info-panel.c:1371
 msgid "HD DVD video disc"
 msgstr "HD-DVD-videoplate"
 
-#: ../panels/info/cc-info-panel.c:1373
+#: ../panels/info/cc-info-panel.c:1372
 msgid "Picture CD"
 msgstr "Bilde-CD"
 
-#: ../panels/info/cc-info-panel.c:1374
+#: ../panels/info/cc-info-panel.c:1373
 msgid "Super Video CD"
 msgstr "Super Video CD"
 
-#: ../panels/info/cc-info-panel.c:1375
+#: ../panels/info/cc-info-panel.c:1374
 msgid "Video CD"
 msgstr "Video-CD"
 
-#: ../panels/info/cc-info-panel.c:1376
+#: ../panels/info/cc-info-panel.c:1375
 msgid "Windows software"
 msgstr "Windows programvare"
 
-#: ../panels/info/cc-info-panel.c:1377
+#: ../panels/info/cc-info-panel.c:1376
 msgid "Software"
 msgstr "Programvare"
 
-#: ../panels/info/cc-info-panel.c:1500
+#: ../panels/info/cc-info-panel.c:1499
 #: ../panels/keyboard/keyboard-shortcuts.c:1697
 msgid "Section"
 msgstr "Seksjon"
 
-#: ../panels/info/cc-info-panel.c:1509 ../panels/info/info.ui.h:13
+#: ../panels/info/cc-info-panel.c:1508 ../panels/info/info.ui.h:13
 msgid "Overview"
 msgstr "Oversikt"
 
-#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:20
+#: ../panels/info/cc-info-panel.c:1514 ../panels/info/info.ui.h:20
 msgid "Default Applications"
 msgstr "Forvalgte programmer"
 
-#: ../panels/info/cc-info-panel.c:1520 ../panels/info/info.ui.h:28
+#: ../panels/info/cc-info-panel.c:1519 ../panels/info/info.ui.h:28
 msgid "Removable Media"
 msgstr "Avtagbare medier"
 
-#: ../panels/info/cc-info-panel.c:1545
+#: ../panels/info/cc-info-panel.c:1544
 #, c-format
 msgid "Version %s"
 msgstr "Versjon %s"
 
-#: ../panels/info/cc-info-panel.c:1595
+#: ../panels/info/cc-info-panel.c:1594
 msgid "Install Updates"
 msgstr "Installer oppdateringer"
 
-#: ../panels/info/cc-info-panel.c:1599
+#: ../panels/info/cc-info-panel.c:1598
 msgid "System Up-To-Date"
 msgstr "Systemet er oppdatert"
 
-#: ../panels/info/cc-info-panel.c:1603
+#: ../panels/info/cc-info-panel.c:1602
 msgid "Checking for Updates"
 msgstr "Ser etter oppdateringer"
 
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:1
+#: ../panels/network/connection-editor/ce-page-details.c:240
+#: ../panels/network/network-wifi.ui.h:58
 msgid "Details"
 msgstr "Detaljer"
 
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "System Information"
-msgstr "Systeminformasjon"
+msgid "View information about your system"
+msgstr "Vis informasjon om systemet"
 
 #. sure that you use the same "translation" for those keywords
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:4
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
-"fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
-msgstr ""
-"enhet;system;informasjon;minne;prosessor;versjon;forvalg;program;"
-"reserveløsning;foretrukket;cd;dvd;usb;lyd;video;plate;avtagbar;medie;"
-"automatisk kjøring;"
+"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
+msgstr 
"enhet;system;informasjon;minne;prosessor;versjon;forvalg;program;foretrukket;cd;dvd;usb;lyd;video;plate;avtagbar;medie;automatisk
 kjøring;"
 
 #: ../panels/info/info.ui.h:1
 msgid "Select how other media should be handled"
@@ -1389,14 +1489,12 @@ msgid "Typing"
 msgstr "Skriving"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:2
-#: ../panels/region/gnome-region-panel.ui.h:27
-msgid "Switch to next source"
-msgstr "Bytt til neste kilde"
+msgid "Switch to next input source"
+msgstr "Bytt til neste inndatakilde"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:3
-#: ../panels/region/gnome-region-panel.ui.h:25
-msgid "Switch to previous source"
-msgstr "Bytt til forrige kilde"
+msgid "Switch to previous input source"
+msgstr "Bytt til forrige inndatakilde"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:1
 msgid "Launchers"
@@ -1459,7 +1557,6 @@ msgid "Copy a screenshot of an area to clipboard"
 msgstr "Kopier et skjermdump av et område til utklippstavlen"
 
 #: ../panels/keyboard/01-system.xml.in.h:1
-#: ../panels/region/gnome-region-panel.ui.h:43
 msgid "System"
 msgstr "System"
 
@@ -1508,107 +1605,15 @@ msgstr "Mindre tekststørrelse"
 msgid "High contrast on or off"
 msgstr "Høy kontrast på eller av"
 
-#. translators:
-#. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:254
-#: ../panels/keyboard/cc-keyboard-option.c:304
-#: ../panels/keyboard/cc-keyboard-option.c:436
-#: ../panels/keyboard/keyboard-shortcuts.c:1160
-#: ../panels/sound/gvc/gvc-mixer-control.c:1828
-#: ../panels/user-accounts/um-fingerprint-dialog.c:215
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
-msgid "Disabled"
-msgstr "Slått av"
-
-#: ../panels/keyboard/cc-keyboard-option.c:255
-msgid "Left Shift"
-msgstr "Venstre Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:256
-msgid "Left Alt"
-msgstr "Venstre Alt"
-
-#: ../panels/keyboard/cc-keyboard-option.c:257
-msgid "Left Ctrl"
-msgstr "Venstre Ctrl"
-
-#: ../panels/keyboard/cc-keyboard-option.c:258
-msgid "Right Shift"
-msgstr "Høyre Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:259
-msgid "Right Alt"
-msgstr "Høyre Alt"
-
-#: ../panels/keyboard/cc-keyboard-option.c:260
-msgid "Right Ctrl"
-msgstr "Høyre Ctrl"
-
-#: ../panels/keyboard/cc-keyboard-option.c:261
-msgid "Left Alt+Shift"
-msgstr "Venstre Alt+Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:262
-msgid "Right Alt+Shift"
-msgstr "Høyre Alt+Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:263
-msgid "Left Ctrl+Shift"
-msgstr "Venstre Ctrl+Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:264
-msgid "Right Ctrl+Shift"
-msgstr "Høyre Ctrl+Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:265
-msgid "Left+Right Shift"
-msgstr "Venstre+høyre Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:266
-msgid "Left+Right Alt"
-msgstr "Venstre+høyre Alt"
-
-#: ../panels/keyboard/cc-keyboard-option.c:267
-msgid "Left+Right Ctrl"
-msgstr "Venstre+høyre Ctrl"
-
-#: ../panels/keyboard/cc-keyboard-option.c:268
-msgid "Alt+Shift"
-msgstr "Alt+Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:269
-msgid "Ctrl+Shift"
-msgstr "Ctrl+Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:270
-msgid "Alt+Ctrl"
-msgstr "Alt+Ctrl"
-
-#: ../panels/keyboard/cc-keyboard-option.c:271
-msgid "Caps"
-msgstr "Caps"
-
-#: ../panels/keyboard/cc-keyboard-option.c:272
-msgid "Shift+Caps"
-msgstr "Shift+Caps"
-
-#: ../panels/keyboard/cc-keyboard-option.c:273
-msgid "Alt+Caps"
-msgstr "Alt+Caps"
-
-#: ../panels/keyboard/cc-keyboard-option.c:274
-msgid "Ctrl+Caps"
-msgstr "Ctrl+Caps"
-
-#: ../panels/keyboard/cc-keyboard-option.c:390
+#: ../panels/keyboard/cc-keyboard-option.c:362
 msgid "Alternative Characters Key"
 msgstr "Tast for alternative tegn"
 
-#: ../panels/keyboard/cc-keyboard-option.c:395
+#: ../panels/keyboard/cc-keyboard-option.c:367
 msgid "Compose Key"
 msgstr "Komponeringstast"
 
-#: ../panels/keyboard/cc-keyboard-option.c:399
+#: ../panels/keyboard/cc-keyboard-option.c:371
 msgid "Modifiers-only switch to next source"
 msgstr "Bytt til neste kilde kun med endringstaster"
 
@@ -1618,8 +1623,8 @@ msgid "Keyboard"
 msgstr "Tastatur"
 
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-msgid "Change keyboard settings"
-msgstr "Endre innstillinger for tastatur"
+msgid "View and change keyboard shortcuts and set your typing preferences"
+msgstr "Vis og bytt tastatursnarveier og sett brukervalg for skriving"
 
 #. Translators: those are keywords for the keyboard control-center panel
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4
@@ -1695,8 +1700,9 @@ msgid "Cursor blink speed"
 msgstr "Hastighet for blinkende markør"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
-msgid "Layout Settings"
-msgstr "Innstillinger for utforming"
+#: ../panels/region/region.ui.h:5
+msgid "Input Sources"
+msgstr "Inndatakilder"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 msgid "Add Shortcut"
@@ -1716,7 +1722,6 @@ msgstr ""
 "en snarveitast, eller trykk slettetast for å fjerne den."
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
-#: ../panels/region/gnome-region-panel.ui.h:30
 msgid "Shortcuts"
 msgstr "Snarveier"
 
@@ -1770,8 +1775,9 @@ msgid "Mouse & Touchpad"
 msgstr "Mus og pekeplate"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
-msgid "Set your mouse and touchpad preferences"
-msgstr "Sett dine brukervalg for mus og pekeplate"
+msgid ""
+"Change your mouse or touchpad sensitivity and select right or left-handed"
+msgstr "Endre sensitivitet for mus eller pekeplate og velg om du er høyrehendt eller venstrehendt"
 
 #. Translators: those are keywords for the mouse and touchpad control-center panel
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4
@@ -1881,153 +1887,649 @@ msgstr "Enkeltklikk, sekundærknapp"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:333
+#: ../panels/network/cc-network-panel.c:341
 msgid "Air_plane Mode"
 msgstr "_Flymodus"
 
-#: ../panels/network/cc-network-panel.c:836
+#: ../panels/network/cc-network-panel.c:904
 msgid "Network proxy"
 msgstr "Nettverksproxy"
 
-#: ../panels/network/cc-network-panel.c:1012 ../panels/network/net-vpn.c:278
+#: ../panels/network/cc-network-panel.c:1083 ../panels/network/net-vpn.c:280
 #, 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:1076
+#: ../panels/network/cc-network-panel.c:1217
 msgid "The system network services are not compatible with this version."
 msgstr ""
 "Nettverkstjenesten for dette systemet er ikke kompatibelt med denne "
 "versjonen."
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-#: ../panels/network/network-mobile.ui.h:7
-msgid "Network"
-msgstr "Nettverk"
-
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "Network settings"
-msgstr "Innstillinger for nettverk"
-
-#. Translators: those are keywords for the network control-center panel
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
-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:283
-#: ../panels/network/net-device-wifi.c:725
-#, c-format
-msgid "%d Mb/s"
-msgstr "%d Mb/s"
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:1
+msgid "802.1x _Security"
+msgstr "802.1x sikkerhet"
+
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:3
+#: ../panels/network/connection-editor/security-page.ui.h:3
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
+msgid "Anony_mous identity"
+msgstr "Anony_m identitet"
+
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:4
+#: ../panels/network/connection-editor/security-page.ui.h:4
+msgid "Inner _authentication"
+msgstr "Indre _autentisering"
+
+#: ../panels/network/connection-editor/ce-page-8021x-security.c:108
+#: ../panels/network/connection-editor/ce-page-security.c:455
+#: ../panels/network/connection-editor/details-page.ui.h:3
+#: ../panels/network/network-wifi.ui.h:4
+msgid "Security"
+msgstr "Sikkerhet"
 
-#: ../panels/network/net-device-mobile.c:225
-msgid "Add new connection"
-msgstr "Legg til ny tilkobling"
+#: ../panels/network/connection-editor/ce-page.c:502
+msgid "automatic"
+msgstr "automatisk"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/net-device-wifi.c:258
-#: ../panels/network/net-device-wifi.c:437
+#: ../panels/network/connection-editor/ce-page-details.c:52
+#: ../panels/network/net-device-wifi.c:224
+#: ../panels/network/net-device-wifi.c:385
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/net-device-wifi.c:262
-#: ../panels/network/net-device-wifi.c:441
+#: ../panels/network/connection-editor/ce-page-details.c:56
+#: ../panels/network/net-device-wifi.c:228
+#: ../panels/network/net-device-wifi.c:390
+#: ../panels/network/network-wifi.ui.h:17
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/net-device-wifi.c:266
+#: ../panels/network/connection-editor/ce-page-details.c:60
+#: ../panels/network/net-device-wifi.c:232
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/net-device-wifi.c:271
+#: ../panels/network/connection-editor/ce-page-details.c:65
+#: ../panels/network/net-device-wifi.c:237
 msgid "Enterprise"
 msgstr "Bedrift"
 
-#: ../panels/network/net-device-wifi.c:276
-#: ../panels/network/net-device-wifi.c:432
+#: ../panels/network/connection-editor/ce-page-details.c:70
+#: ../panels/network/net-device-wifi.c:242
+#: ../panels/network/net-device-wifi.c:375
 msgctxt "Wifi security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../panels/network/net-device-wifi.c:652
-msgid "never"
-msgstr "aldri"
+#: ../panels/network/connection-editor/ce-page-details.c:91
+#: ../panels/power/power.ui.h:19
+msgid "Never"
+msgstr "Aldri"
 
-#: ../panels/network/net-device-wifi.c:662
-msgid "today"
-msgstr "i dag"
+#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/user-accounts/um-utils.c:770
+msgid "Today"
+msgstr "I dag"
 
-#: ../panels/network/net-device-wifi.c:664
-msgid "yesterday"
-msgstr "i går"
+#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/user-accounts/um-utils.c:773
+msgid "Yesterday"
+msgstr "I går"
 
-#: ../panels/network/net-device-wifi.c:666
+#: ../panels/network/connection-editor/ce-page-details.c:106
+#: ../panels/network/net-device-ethernet.c:126
+#: ../panels/network/net-device-wifi.c:479
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i dag siden"
 msgstr[1] "%i dager siden"
 
-#. TRANSLATORS: VPN status
-#: ../panels/network/net-device-wifi.c:735
-#: ../panels/network/panel-common.c:235
-msgid "Not connected"
-msgstr "Ikke tilkoblet"
-
-#: ../panels/network/net-device-wifi.c:737
-#: ../panels/network/net-device-wifi.c:2101
-msgid "Out of range"
-msgstr "Utenfor rekkevidde"
+#. Translators: network device speed
+#: ../panels/network/connection-editor/ce-page-details.c:155
+#: ../panels/network/net-device-ethernet.c:54
+#: ../panels/network/net-device-wifi.c:537
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
 
-#: ../panels/network/net-device-wifi.c:768
+#: ../panels/network/connection-editor/ce-page-details.c:181
+#: ../panels/network/net-device-wifi.c:566
 msgctxt "Signal strength"
 msgid "None"
 msgstr "Ingen"
 
-#: ../panels/network/net-device-wifi.c:770
+#: ../panels/network/connection-editor/ce-page-details.c:183
+#: ../panels/network/net-device-wifi.c:568
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Svak"
 
-#: ../panels/network/net-device-wifi.c:772
+#: ../panels/network/connection-editor/ce-page-details.c:185
+#: ../panels/network/net-device-wifi.c:570
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "Ok"
 
-#: ../panels/network/net-device-wifi.c:774
+#: ../panels/network/connection-editor/ce-page-details.c:187
+#: ../panels/network/net-device-wifi.c:572
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "God"
 
-#: ../panels/network/net-device-wifi.c:776
+#: ../panels/network/connection-editor/ce-page-details.c:189
+#: ../panels/network/net-device-wifi.c:574
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Utmerket"
 
-#: ../panels/network/net-device-wifi.c:960
+#: ../panels/network/connection-editor/ce-page-ethernet.c:200
+#: ../panels/network/connection-editor/ce-page-vpn.c:172
+#: ../panels/network/connection-editor/ce-page-wifi.c:243
+#: ../panels/network/network-wifi.ui.h:59
+msgid "Identity"
+msgstr "Identitet"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:202
+#: ../panels/network/connection-editor/ce-page-ip4.c:454
+msgid "Netmask"
+msgstr "Nettverksmaske"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:216
+#: ../panels/network/connection-editor/ce-page-ip4.c:467
+#: ../panels/network/connection-editor/ce-page-ip6.c:217
+#: ../panels/network/connection-editor/ce-page-ip6.c:475
+#: ../panels/network/network-vpn.ui.h:3
+msgid "Gateway"
+msgstr "Gateway"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:233
+#: ../panels/network/connection-editor/ce-page-ip6.c:234
+msgid "Delete Address"
+msgstr "Slett adresse"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:285
+#: ../panels/network/connection-editor/ce-page-ip6.c:286
+msgid "Add"
+msgstr "Legg til"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:350
+#: ../panels/network/connection-editor/ce-page-ip6.c:354
+msgid "Server"
+msgstr "Tjener"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:367
+#: ../panels/network/connection-editor/ce-page-ip6.c:371
+msgid "Delete DNS Server"
+msgstr "Slett DNS-tjener"
+
+#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
+#: ../panels/network/connection-editor/ce-page-ip4.c:481
+#: ../panels/network/connection-editor/ce-page-ip6.c:489
+msgctxt "network parameters"
+msgid "Metric"
+msgstr "Metrisk"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:502
+#: ../panels/network/connection-editor/ce-page-ip6.c:510
+msgid "Delete Route"
+msgstr "Slett rute"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:616
+#: ../panels/network/network-wifi.ui.h:26
+msgid "Automatic (DHCP)"
+msgstr "Automatisk (DHCP)"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:620
+#: ../panels/network/connection-editor/ce-page-ip6.c:622
+#: ../panels/network/network-wifi.ui.h:25
+msgid "Manual"
+msgstr "Manuell"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:624
+#: ../panels/network/connection-editor/ce-page-ip6.c:626
+msgid "Link-Local Only"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:925
+#: ../panels/network/network-wifi.ui.h:60
+msgid "IPv4"
+msgstr "IPv4"
+
+#: ../panels/network/connection-editor/ce-page-ip6.c:204
+#: ../panels/network/connection-editor/ce-page-ip6.c:458
+msgid "Prefix"
+msgstr "Prefiks"
+
+#: ../panels/network/connection-editor/ce-page-ip6.c:614
+#: ../panels/network/connection-editor/ethernet-page.ui.h:1
+#: ../panels/network/connection-editor/ip4-page.ui.h:4
+#: ../panels/network/connection-editor/ip6-page.ui.h:4
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
+msgid "Automatic"
+msgstr "Automatisk"
+
+#: ../panels/network/connection-editor/ce-page-ip6.c:618
+msgid "Automatic, DHCP only"
+msgstr "Automatisk. Kun DHCP"
+
+#: ../panels/network/connection-editor/ce-page-ip6.c:886
+#: ../panels/network/network-wifi.ui.h:61
+msgid "IPv6"
+msgstr "IPv6"
+
+#: ../panels/network/connection-editor/ce-page-reset.c:91
+#: ../panels/network/network-wifi.ui.h:63
+msgid "Reset"
+msgstr "Nullstill"
+
+#: ../panels/network/connection-editor/ce-page-security.c:250
+msgctxt "Wi-Fi/Ethernet security"
+msgid "None"
+msgstr "Ingen"
+
+#: ../panels/network/connection-editor/ce-page-security.c:273
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-security.c:283
+msgid "WEP 128-bit Passphrase"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-security.c:296
+#: ../panels/network/wireless-security/wireless-security.c:409
+msgid "LEAP"
+msgstr "LEAP"
+
+#: ../panels/network/connection-editor/ce-page-security.c:309
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamisk WEP (802.1x)"
+
+#: ../panels/network/connection-editor/ce-page-security.c:323
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 personlig"
+
+#: ../panels/network/connection-editor/ce-page-security.c:337
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA & WPA2 bedrift"
+
+#: ../panels/network/connection-editor/connection-editor.ui.h:1
+msgid "_Apply"
+msgstr "_Bruk"
+
+#: ../panels/network/connection-editor/details-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:2
+msgid "Signal Strength"
+msgstr "Signalstyrke"
+
+#: ../panels/network/connection-editor/details-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:3
+msgid "Link speed"
+msgstr "Hastighet for tilkobling"
+
+#: ../panels/network/connection-editor/details-page.ui.h:4
+#: ../panels/network/net-device-ethernet.c:159
+#: ../panels/network/network-simple.ui.h:2
+#: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
+msgid "IPv4 Address"
+msgstr "IPv4-adresse"
+
+#: ../panels/network/connection-editor/details-page.ui.h:5
+#: ../panels/network/net-device-ethernet.c:160
+#: ../panels/network/net-device-ethernet.c:164
+#: ../panels/network/network-mobile.ui.h:4
+#: ../panels/network/network-simple.ui.h:3
+#: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
+msgid "IPv6 Address"
+msgstr "IPv6-adresse"
+
+#: ../panels/network/connection-editor/details-page.ui.h:6
+#: ../panels/network/net-device-ethernet.c:167
+#: ../panels/network/network-simple.ui.h:1
+#: ../panels/network/network-wifi.ui.h:7
+msgid "Hardware Address"
+msgstr "Maskinvareadresse"
+
+#: ../panels/network/connection-editor/details-page.ui.h:7
+#: ../panels/network/net-device-ethernet.c:171
+#: ../panels/network/network-mobile.ui.h:5
+#: ../panels/network/network-simple.ui.h:4
+#: ../panels/network/network-wifi.ui.h:8
+msgid "Default Route"
+msgstr "Forvalgt rute"
+
+#: ../panels/network/connection-editor/details-page.ui.h:8
+#: ../panels/network/connection-editor/ip4-page.ui.h:3
+#: ../panels/network/connection-editor/ip6-page.ui.h:3
+#: ../panels/network/net-device-ethernet.c:173
+#: ../panels/network/network-mobile.ui.h:6
+#: ../panels/network/network-simple.ui.h:5
+#: ../panels/network/network-wifi.ui.h:9
+msgid "DNS"
+msgstr "DNS"
+
+#: ../panels/network/connection-editor/details-page.ui.h:9
+msgid "Last Used"
+msgstr "Sist brukt"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "Tvunnet par (TP)"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "Attachment Unit Interface (AUI)"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "Media Independent Interface (MII)"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:10
+#: ../panels/network/connection-editor/vpn-page.ui.h:1
+msgid "_Name"
+msgstr "_Navn"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:11
+#: ../panels/network/connection-editor/wifi-page.ui.h:4
+#: ../panels/network/network-wifi.ui.h:49
+msgid "_MAC Address"
+msgstr "_MAC-adresse"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:12
+msgid "M_TU"
+msgstr "M_TU"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:13
+#: ../panels/network/connection-editor/wifi-page.ui.h:5
+msgid "_Cloned Address"
+msgstr "_Klonet adresse"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:14
+#: ../panels/network/connection-editor/wifi-page.ui.h:6
+msgid "Connect _automatically"
+msgstr "Koble til _automatisk"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:15
+msgid "Make available to other _users"
+msgstr "Gjør tilgjengelig for andre br_ukere"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:16
+msgid "bytes"
+msgstr "bytes"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:23
+msgid "IPv_4"
+msgstr "IPv_4"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:2
+#: ../panels/network/connection-editor/ip6-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:24
+msgid "_Addresses"
+msgstr "_Adresser"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:5
+#: ../panels/network/connection-editor/ip6-page.ui.h:5
+msgid "Automatic DNS"
+msgstr "Automatisk DNS"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:6
+#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: ../panels/network/network-wifi.ui.h:39
+msgid "Routes"
+msgstr "Ruter"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:7
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
+msgid "Automatic Routes"
+msgstr "Automatiske ruter"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:8
+#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#: ../panels/network/network-wifi.ui.h:45
+msgid "Use this connection _only for resources on its network"
+msgstr "Bruk denne tilkoblingen _kun for ressurser på dette nettverket"
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:47
+msgid "IPv_6"
+msgstr "IPv_6"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:267
+msgid "Unable to open connection editor"
+msgstr "Kan ikke åpne redigering av tilkobling"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:282
+msgid "New Profile"
+msgstr "Ny profil"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:504
+#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/user-accounts/um-account-dialog.c:1068
+msgid "_Add"
+msgstr "_Legg til"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:586
+#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
+msgid "VPN"
+msgstr "VPN"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:587
+msgid "Bond"
+msgstr "Bundet"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:588
+msgid "Bridge"
+msgstr "Bro"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:589
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:739
+msgid "Could not load VPN plugins"
+msgstr "Klarte ikke å laste VPN-tillegg"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:803
+msgid "Import from file…"
+msgstr "Importer fil …"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:870
+msgid "Add Network Connection"
+msgstr "Legg til nettverkstilkobling"
+
+#: ../panels/network/connection-editor/reset-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:53
+msgid "_Reset"
+msgstr "N_ullstill"
+
+#: ../panels/network/connection-editor/reset-page.ui.h:2
+#: ../panels/network/net-device-wifi.c:1411
+#: ../panels/network/network-wifi.ui.h:54
+msgid "_Forget"
+msgstr "_Glem"
+
+#: ../panels/network/connection-editor/reset-page.ui.h:3
+msgid ""
+"Reset the settings for this network, including passwords, but remember it as "
+"a preferred network"
+msgstr ""
+
+#: ../panels/network/connection-editor/reset-page.ui.h:4
+msgid ""
+"Remove all details relating to this network and do not try to automatically "
+"connect"
+msgstr ""
+
+#: ../panels/network/connection-editor/security-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:14
+msgid "S_ecurity"
+msgstr "Sikk_erhet"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:205
+msgid "Cannot import VPN connection"
+msgstr "Kan ikke importere VPN-forbindelse"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:207
+#, c-format
+msgid ""
+"The file '%s' could not be read or does not contain recognized VPN "
+"connection information\n"
+"\n"
+"Error: %s."
+msgstr ""
+
+#: ../panels/network/connection-editor/vpn-helpers.c:242
+msgid "Select file to import"
+msgstr "Velg fil som skal importeres"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:294
+#, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "En fil med navn «%s» eksisterer allerede."
+
+#: ../panels/network/connection-editor/vpn-helpers.c:296
+msgid "_Replace"
+msgstr "E_rstatt"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:298
+#, c-format
+msgid "Do you want to replace %s with the VPN connection you are saving?"
+msgstr ""
+
+#: ../panels/network/connection-editor/vpn-helpers.c:334
+msgid "Cannot export VPN connection"
+msgstr "Kan ikke eksportere VPN-forbindelse"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:336
 #, c-format
 msgid ""
-"Network details for %s including password and any custom configuration will "
-"be lost."
+"The VPN connection '%s' could not be exported to %s.\n"
+"\n"
+"Error: %s."
+msgstr ""
+
+#: ../panels/network/connection-editor/vpn-helpers.c:371
+msgid "Export VPN connection..."
+msgstr "Eksporter VPN-forbindelse …"
+
+#: ../panels/network/connection-editor/vpn-page.ui.h:2
+msgid "(Error: unable to load VPN connection editor)"
 msgstr ""
-"Nettverksdetaljer for %s inkludert passord og egendefinert konfigurasjon vil "
-"gå tapt."
 
-#: ../panels/network/net-device-wifi.c:971
-msgid "Forget"
-msgstr "Glem"
+#: ../panels/network/connection-editor/wifi-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:12
+msgid "_SSID"
+msgstr "_SSID"
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:13
+msgid "_BSSID"
+msgstr "_BSSID"
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:3
+#: ../panels/network/network-wifi.ui.h:16
+msgid "My Home Network"
+msgstr "Mitt hjemme nettverk"
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:7
+msgid "Make available to _other users"
+msgstr "Gjør tilgjengelig for _andre brukere"
+
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
+#: ../panels/network/network-mobile.ui.h:7
+msgid "Network"
+msgstr "Nettverk"
+
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+msgid "Control how you connect to the Internet"
+msgstr "Kontroller hvordan du kobler til internett"
+
+#. Translators: those are keywords for the network control-center panel
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
+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:77
+msgid "Bond slaves"
+msgstr "Koble sammen slaver"
+
+#: ../panels/network/net-device-bridge.c:77
+msgid "Bridge slaves"
+msgstr "Lag bro mellom slaver"
+
+#: ../panels/network/net-device-ethernet.c:112
+#: ../panels/network/net-device-wifi.c:465
+msgid "never"
+msgstr "aldri"
+
+#: ../panels/network/net-device-ethernet.c:122
+#: ../panels/network/net-device-wifi.c:475
+msgid "today"
+msgstr "i dag"
+
+#: ../panels/network/net-device-ethernet.c:124
+#: ../panels/network/net-device-wifi.c:477
+msgid "yesterday"
+msgstr "i går"
+
+#: ../panels/network/net-device-ethernet.c:162
+#: ../panels/network/network-mobile.ui.h:3
+#: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
+#: ../panels/printers/printers.ui.h:13
+msgid "IP Address"
+msgstr "IP-adresse"
+
+#: ../panels/network/net-device-ethernet.c:178
+#: ../panels/network/network-wifi.ui.h:10
+msgid "Last used"
+msgstr "Sist brukt"
+
+#: ../panels/network/net-device-ethernet.c:337
+#: ../panels/network/net-device-wifi.c:1549
+#: ../panels/network/network-ethernet.ui.h:2
+#: ../panels/network/network-vpn.ui.h:8 ../panels/universal-access/uap.ui.h:23
+msgid "Options…"
+msgstr "Alternativer …"
 
-#: ../panels/network/net-device-wifi.c:1556
+#: ../panels/network/net-device-ethernet.c:472
+#, c-format
+msgid "Profile %d"
+msgstr "Profil %d"
+
+#: ../panels/network/net-device-mobile.c:239
+msgid "Add new connection"
+msgstr "Legg til ny tilkobling"
+
+#: ../panels/network/net-device-wifi.c:1120
 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."
@@ -2035,12 +2537,12 @@ 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:1560
+#: ../panels/network/net-device-wifi.c:1124
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
 msgstr "Hvis du slår på trådløst aksesspunkt vil du bli koblet fra <b>%s</b>."
 
-#: ../panels/network/net-device-wifi.c:1564
+#: ../panels/network/net-device-wifi.c:1128
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2048,14 +2550,40 @@ msgstr ""
 "Det er ikke mulig å aksessere internett via trådløst nettverk mens trådløst "
 "aksesspunkt er aktivt."
 
-#: ../panels/network/net-device-wifi.c:1630
+#: ../panels/network/net-device-wifi.c:1202
 msgid "Stop hotspot and disconnect any users?"
 msgstr "Stopp trådløst aksesspunkt og koble fra brukere?"
 
-#: ../panels/network/net-device-wifi.c:1633
+#: ../panels/network/net-device-wifi.c:1205
 msgid "_Stop Hotspot"
 msgstr "_Stopp hotspot"
 
+#: ../panels/network/net-device-wifi.c:1277
+#, fuzzy
+msgid "System policy prohibits use as a Hotspot"
+msgstr "System"
+
+#: ../panels/network/net-device-wifi.c:1280
+msgid "Wireless device does not support Hotspot mode"
+msgstr "Trådløs enhet støtter ikke hotspotmodus"
+
+#: ../panels/network/net-device-wifi.c:1407
+msgid ""
+"Network details for the selected networks, including passwords and any "
+"custom configuration will be lost."
+msgstr "Nettverksdetaljer for valgte nettverk, inkludert passord og egendefinert konfigurasjon vil gå tapt."
+
+#: ../panels/network/net-device-wifi.c:1714
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
+msgid "History"
+msgstr "Historikk"
+
+#. translators: This is the label for the "Forget wireless network" functionality
+#: ../panels/network/net-device-wifi.c:1726
+msgctxt "Wi-Fi Network"
+msgid "_Forget"
+msgstr "_Glem"
+
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
 #: ../panels/network/net-proxy.c:67
 msgid ""
@@ -2072,10 +2600,14 @@ 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:406
+#: ../panels/network/net-proxy.c:408
 msgid "Proxy"
 msgstr "Proxy"
 
+#: ../panels/network/network-ethernet.ui.h:1
+msgid "_Add Profile…"
+msgstr "_Legg til profil …"
+
 #: ../panels/network/network-mobile.ui.h:1
 msgid "IMEI"
 msgstr "IMEI"
@@ -2084,32 +2616,8 @@ msgstr "IMEI"
 msgid "Provider"
 msgstr "Tilbyder"
 
-#: ../panels/network/network-mobile.ui.h:3
-#: ../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:642
-msgid "IPv6 Address"
-msgstr "IPv6-adresse"
-
-#: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-simple.ui.h:4
-#: ../panels/network/network-wifi.ui.h:15
-msgid "Default Route"
-msgstr "Forvalgt rute"
-
-#: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-simple.ui.h:5
-#: ../panels/network/network-wifi.ui.h:16
-msgid "DNS"
-msgstr "DNS"
-
 #: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:6
+#: ../panels/network/network-simple.ui.h:7
 msgid "_Options…"
 msgstr "_Alternativer …"
 
@@ -2156,15 +2664,25 @@ msgstr "_Socks-vert"
 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-proxy.ui.h:11
+msgid "HTTP proxy port"
+msgstr "Port for HTTP-proxy"
 
-#: ../panels/network/network-simple.ui.h:2
-#: ../panels/network/network-wifi.ui.h:13 ../panels/network/panel-common.c:641
-msgid "IPv4 Address"
-msgstr "IPv4-adresse"
+#: ../panels/network/network-proxy.ui.h:12
+msgid "HTTPS proxy port"
+msgstr "Port for HTTPS-proxy"
+
+#: ../panels/network/network-proxy.ui.h:13
+msgid "FTP proxy port"
+msgstr "Port for FTP-proxy"
+
+#: ../panels/network/network-proxy.ui.h:14
+msgid "Socks proxy port"
+msgstr "Port for Socks-proxy"
+
+#: ../panels/network/network-simple.ui.h:6
+msgid "Turn device off"
+msgstr "Slå enhet av"
 
 #: ../panels/network/network.ui.h:1
 msgid "Select the interface to use for the new service"
@@ -2178,10 +2696,6 @@ msgstr "_Lag …"
 msgid "_Interface"
 msgstr "Grensesn_itt"
 
-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
-msgid "VPN"
-msgstr "VPN"
-
 #: ../panels/network/network.ui.h:8
 msgid "Add Device"
 msgstr "Legg til enhet"
@@ -2190,10 +2704,6 @@ msgstr "Legg til enhet"
 msgid "VPN Type"
 msgstr "Type VPN"
 
-#: ../panels/network/network-vpn.ui.h:3
-msgid "Gateway"
-msgstr "Gateway"
-
 #: ../panels/network/network-vpn.ui.h:4
 msgid "Group Name"
 msgstr "Gruppenavn"
@@ -2203,373 +2713,711 @@ msgid "Group Password"
 msgstr "Gruppepassord"
 
 #: ../panels/network/network-vpn.ui.h:6
+#: ../panels/printers/authentication-dialog.ui.h:4
 msgid "Username"
 msgstr "Brukernavn"
 
 #: ../panels/network/network-vpn.ui.h:7
-msgid "_Configure…"
-msgstr "_Konfigurer …"
+msgid "Turn VPN connection off"
+msgstr "Slå av VPN-forbindelse"
 
 #: ../panels/network/network-wifi.ui.h:1
+msgid "Automatic _Connect"
+msgstr "_Koble til automatisk"
+
+#: ../panels/network/network-wifi.ui.h:11
+msgid "details"
+msgstr "detaljer"
+
+#: ../panels/network/network-wifi.ui.h:15
+#: ../panels/network/wireless-security/eap-method-leap.ui.h:2
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:2
+#: ../panels/network/wireless-security/ws-leap.ui.h:2
+#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
+#: ../panels/user-accounts/data/account-dialog.ui.h:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+msgid "_Password"
+msgstr "_Passord"
+
+#: ../panels/network/network-wifi.ui.h:18
+#: ../panels/universal-access/uap.ui.h:8
+msgid "None"
+msgstr "Ingen"
+
+#: ../panels/network/network-wifi.ui.h:19
+msgid "blablabla"
+msgstr "blablabla"
+
+#: ../panels/network/network-wifi.ui.h:20
+msgid "Show P_assword"
+msgstr "Vis p_assord"
+
+#: ../panels/network/network-wifi.ui.h:21
+msgid "Make available to other users"
+msgstr "Gjør tilgjengelig for andre brukere"
+
+#: ../panels/network/network-wifi.ui.h:22
+msgid "identity"
+msgstr "identitet"
+
+#: ../panels/network/network-wifi.ui.h:27
+msgid "Automatic (DHCP) addresses only"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:28
+msgid "Link-local only"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:29
+msgid "Shared with other computers"
+msgstr "Delt med andre datamaskiner"
+
+#: ../panels/network/network-wifi.ui.h:31
+msgid ""
+"Address\n"
+"section\n"
+"goes\n"
+"here"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:35
+msgid ""
+"DNS\n"
+"section\n"
+"goes\n"
+"here"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:40
+msgid ""
+"Routes\n"
+"section\n"
+"goes\n"
+"here"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:44
+msgid "_Ignore automatically obtained routes"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:46
+msgid "ipv4"
+msgstr "ipv4"
+
+#: ../panels/network/network-wifi.ui.h:48
+msgid "ipv6"
+msgstr "ipv6"
+
+#: ../panels/network/network-wifi.ui.h:50
+msgid "_Cloned MAC Address"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:51
+msgid "00:24:16:31:8G:7A"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:52
+msgid "hardware"
+msgstr "maskinvare"
+
+#: ../panels/network/network-wifi.ui.h:55
+msgid ""
+"Reset the settings for this connection to their defaults, but remember as a "
+"preferred connection."
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:56
+msgid ""
+"Remove all details relating to this network and do not try to automatically "
+"connect to it."
+msgstr "Fjern alle detaljer relatert til dette nettverket og ikke prøv å koble til det automatisk."
+
+#: ../panels/network/network-wifi.ui.h:57
+msgid "reset"
+msgstr "nullstill"
+
+#: ../panels/network/network-wifi.ui.h:62
+msgid "Hardware"
+msgstr "Maskinvare"
+
+#: ../panels/network/network-wifi.ui.h:64
 msgid "Wi-Fi Hotspot"
 msgstr "Trådløst aksesspunkt"
 
-#: ../panels/network/network-wifi.ui.h:2
+#: ../panels/network/network-wifi.ui.h:65
 msgid "_Turn On"
 msgstr "_Slå på"
 
-#: ../panels/network/network-wifi.ui.h:3
+#: ../panels/network/network-wifi.ui.h:66
 msgid "Wi-Fi"
 msgstr "Trådløs"
 
-#: ../panels/network/network-wifi.ui.h:4
+#: ../panels/network/network-wifi.ui.h:67
+msgid "Turn Wi-Fi off"
+msgstr "Slå trådløs av"
+
+#: ../panels/network/network-wifi.ui.h:68
 msgid "_Use as Hotspot…"
 msgstr "Br_uk som trådløst aksesspunkt …"
 
-#: ../panels/network/network-wifi.ui.h:5
+#: ../panels/network/network-wifi.ui.h:69
 msgid "_Connect to Hidden Network…"
 msgstr "_Koble til skjult nettverk …"
 
-#: ../panels/network/network-wifi.ui.h:6
-msgid "_Disconnect"
-msgstr "Koble _fra"
-
-#: ../panels/network/network-wifi.ui.h:7
-msgid "_Connect"
-msgstr "_Koble til"
-
-#: ../panels/network/network-wifi.ui.h:8
-msgid "Last used"
-msgstr "Sist brukt"
+#: ../panels/network/network-wifi.ui.h:70
+msgid "_History"
+msgstr "_Historikk"
 
-#: ../panels/network/network-wifi.ui.h:10
-msgid "Security"
-msgstr "Sikkerhet"
-
-#: ../panels/network/network-wifi.ui.h:11
-msgid "Strength"
-msgstr "Styrke"
-
-#: ../panels/network/network-wifi.ui.h:12
-msgid "Link speed"
-msgstr "Hastighet for tilkobling"
-
-#: ../panels/network/network-wifi.ui.h:17
-msgid "_Forget Network"
-msgstr "_Glem nettverk"
-
-#: ../panels/network/network-wifi.ui.h:18
-msgid "_Settings…"
-msgstr "Inn_stillinger …"
-
-#: ../panels/network/network-wifi.ui.h:19
+#: ../panels/network/network-wifi.ui.h:71
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "Slå av for å koble til et trådløst nettverk"
 
-#: ../panels/network/network-wifi.ui.h:20
+#: ../panels/network/network-wifi.ui.h:72
 msgid "Network Name"
 msgstr "Nettverksnavn"
 
-#: ../panels/network/network-wifi.ui.h:21
+#: ../panels/network/network-wifi.ui.h:73
 msgid "Connected Devices"
 msgstr "Tilkoblede enheter"
 
-#: ../panels/network/network-wifi.ui.h:22
+#: ../panels/network/network-wifi.ui.h:74
 msgid "Security type"
 msgstr "Type sikkerhet"
 
-#: ../panels/network/network-wifi.ui.h:23
+#: ../panels/network/network-wifi.ui.h:75
 msgid "Security key"
 msgstr "Sikkerhetsnøkkel"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:124
+#: ../panels/network/panel-common.c:131
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:128
+#: ../panels/network/panel-common.c:135
 msgid "Infrastructure"
 msgstr "Infrastruktur"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:152 ../panels/network/panel-common.c:213
+#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205
 msgid "Status unknown"
 msgstr "Ukjent status"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:156
+#: ../panels/network/panel-common.c:155
 msgid "Unmanaged"
 msgstr "Ikke administrert"
 
-#: ../panels/network/panel-common.c:161
-msgid "Firmware missing"
-msgstr "Fastvare mangler"
-
-#: ../panels/network/panel-common.c:164
-msgid "Cable unplugged"
-msgstr "Kabel koblet fra"
-
-#: ../panels/network/panel-common.c:166
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:159
 msgid "Unavailable"
 msgstr "Ikke tilgjengelig"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:170
-msgid "Disconnected"
-msgstr "Frakoblet"
-
-#. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
+#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
 msgid "Connecting"
 msgstr "Kobler til"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:223
+#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
 msgid "Authentication required"
 msgstr "Autentisering kreves"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227
+#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
 msgid "Connected"
 msgstr "Tilkoblet"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:189
+#: ../panels/network/panel-common.c:181
 msgid "Disconnecting"
 msgstr "Kobler fra"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:193 ../panels/network/panel-common.c:231
+#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223
 msgid "Connection failed"
 msgstr "Tilkobling feilet"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:197 ../panels/network/panel-common.c:239
+#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231
 msgid "Status unknown (missing)"
 msgstr "Ukjent status (mangler)"
 
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:227
+msgid "Not connected"
+msgstr "Ikke tilkoblet"
+
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:259
+#: ../panels/network/panel-common.c:252
 msgid "Configuration failed"
 msgstr "Konfigurering feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:263
+#: ../panels/network/panel-common.c:256
 msgid "IP configuration failed"
 msgstr "IP-konfigurering feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:267
+#: ../panels/network/panel-common.c:260
 msgid "IP configuration expired"
 msgstr "IP-konfigurasjon har utløpt"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:271
+#: ../panels/network/panel-common.c:264
 msgid "Secrets were required, but not provided"
 msgstr "Hemmeligheter kreves men ble ikke oppgitt"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:275
+#: ../panels/network/panel-common.c:268
 msgid "802.1x supplicant disconnected"
 msgstr "802.1x-hjelper frakoblet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:279
+#: ../panels/network/panel-common.c:272
 msgid "802.1x supplicant configuration failed"
 msgstr "Konfigurering av 802.1x-hjelper feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:283
+#: ../panels/network/panel-common.c:276
 msgid "802.1x supplicant failed"
 msgstr "802.1x-hjelper feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:287
+#: ../panels/network/panel-common.c:280
 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:291
+#: ../panels/network/panel-common.c:284
 msgid "PPP service failed to start"
 msgstr "Start av PPP-tjeneste feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:295
+#: ../panels/network/panel-common.c:288
 msgid "PPP service disconnected"
 msgstr "PPP-tjeneste koblet fra"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:299
+#: ../panels/network/panel-common.c:292
 msgid "PPP failed"
 msgstr "PPP feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:303
+#: ../panels/network/panel-common.c:296
 msgid "DHCP client failed to start"
 msgstr "DHCP-klient startet ikke"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:307
+#: ../panels/network/panel-common.c:300
 msgid "DHCP client error"
 msgstr "Feil i DHCP-klient"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:311
+#: ../panels/network/panel-common.c:304
 msgid "DHCP client failed"
 msgstr "DHCP-klient feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:315
+#: ../panels/network/panel-common.c:308
 msgid "Shared connection service failed to start"
 msgstr "Tjeneste for delt tilkobling startet ikke"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:319
+#: ../panels/network/panel-common.c:312
 msgid "Shared connection service failed"
 msgstr "Tjeneste for delt tilkobling feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:323
+#: ../panels/network/panel-common.c:316
 msgid "AutoIP service failed to start"
 msgstr "AutoIP-tjeneste startet ikke"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:327
+#: ../panels/network/panel-common.c:320
 msgid "AutoIP service error"
 msgstr "Feil i AutoIP-tjeneste"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:331
+#: ../panels/network/panel-common.c:324
 msgid "AutoIP service failed"
 msgstr "AutoIP-tjeneste feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:335
+#: ../panels/network/panel-common.c:328
 msgid "Line busy"
 msgstr "Linjen er opptatt"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:339
+#: ../panels/network/panel-common.c:332
 msgid "No dial tone"
 msgstr "Ingen summetone"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:343
+#: ../panels/network/panel-common.c:336
 msgid "No carrier could be established"
 msgstr "Klarte ikke å etablere bærekanal"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:347
+#: ../panels/network/panel-common.c:340
 msgid "Dialing request timed out"
 msgstr "Tidsavbrudd for oppringing"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:351
+#: ../panels/network/panel-common.c:344
 msgid "Dialing attempt failed"
 msgstr "Oppringingsforsøk feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:355
+#: ../panels/network/panel-common.c:348
 msgid "Modem initialization failed"
 msgstr "Initiering av modem feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:359
+#: ../panels/network/panel-common.c:352
 msgid "Failed to select the specified APN"
 msgstr "Klarte ikke å velge angitt APN"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:363
+#: ../panels/network/panel-common.c:356
 msgid "Not searching for networks"
 msgstr "Søker ikke etter nettverk"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:367
+#: ../panels/network/panel-common.c:360
 msgid "Network registration denied"
 msgstr "Nettverksregistrering nektet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:371
+#: ../panels/network/panel-common.c:364
 msgid "Network registration timed out"
 msgstr "Tidsavbrudd for nettverksregistrering"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:375
+#: ../panels/network/panel-common.c:368
 msgid "Failed to register with the requested network"
 msgstr "Klarte ikke å registrere med forespurt nettverk"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:379
+#: ../panels/network/panel-common.c:372
 msgid "PIN check failed"
 msgstr "PIN-sjekk feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:383
+#: ../panels/network/panel-common.c:376
 msgid "Firmware for the device may be missing"
 msgstr "Fastvare for enheten mangler kanskje"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:387
+#: ../panels/network/panel-common.c:380
 msgid "Connection disappeared"
 msgstr "Tilkobling forsvant"
 
 #. TRANSLATORS: device status reason
-#: ../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:395
+#: ../panels/network/panel-common.c:384
 msgid "Existing connection was assumed"
 msgstr "Eksisterende tilkobling ble antatt"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:399
+#: ../panels/network/panel-common.c:388
 msgid "Modem not found"
 msgstr "Modem ble ikke funnet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:403
+#: ../panels/network/panel-common.c:392
 msgid "Bluetooth connection failed"
 msgstr "Tilkobling med Bluetooth feilet"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:407
+#: ../panels/network/panel-common.c:396
 msgid "SIM Card not inserted"
 msgstr "SIM-kort ikke satt inn"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:411
+#: ../panels/network/panel-common.c:400
 msgid "SIM Pin required"
 msgstr "Pin for SIM kreves"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:415
+#: ../panels/network/panel-common.c:404
 msgid "SIM Puk required"
 msgstr "Puk for SIM kreves"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:419
+#: ../panels/network/panel-common.c:408
 msgid "SIM wrong"
 msgstr "Feil SIM"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:423
+#: ../panels/network/panel-common.c:412
 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:427
+#: ../panels/network/panel-common.c:416
 msgid "Connection dependency failed"
 msgstr "Tilkoblingsavhengighet feilet"
 
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:440
+msgid "Firmware missing"
+msgstr "Fastvare mangler"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447
+msgid "Cable unplugged"
+msgstr "Kabel koblet fra"
+
+#: ../panels/network/wireless-security/eap-method.c:275
+msgid "No Certificate Authority certificate chosen"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method.c:276
+msgid ""
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
+"Authority certificate?"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method.c:281
+msgid "Ignore"
+msgstr "Ignorer"
+
+#: ../panels/network/wireless-security/eap-method.c:285
+msgid "Choose CA Certificate"
+msgstr "Velg CA-sertifikat"
+
+#: ../panels/network/wireless-security/eap-method.c:645
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method.c:648
+msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.c:261
+#: ../panels/network/wireless-security/eap-method-peap.c:280
+msgid "GTC"
+msgstr "GTC"
+
+#: ../panels/network/wireless-security/eap-method-fast.c:277
+#: ../panels/network/wireless-security/eap-method-peap.c:246
+#: ../panels/network/wireless-security/eap-method-ttls.c:263
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#: ../panels/network/wireless-security/eap-method-fast.c:399
+msgid "Choose a PAC file..."
+msgstr "Velg en PAC-fil …"
+
+#: ../panels/network/wireless-security/eap-method-fast.c:406
+msgid "PAC files (*.pac)"
+msgstr "PAC-filer (*.pac)"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
+msgid "PAC _file"
+msgstr "PAC-_fil"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+msgid "_Inner authentication"
+msgstr "_Indre autentisering"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+msgid "PAC pro_visioning"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
+#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
+#: ../panels/printers/authentication-dialog.ui.h:1
+msgid " "
+msgstr " "
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+msgid "Anonymous"
+msgstr "Anonym"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+msgid "Authenticated"
+msgstr "Autentisert"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+msgid "Both"
+msgstr "Begge"
+
+#: ../panels/network/wireless-security/eap-method-leap.ui.h:1
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:1
+#: ../panels/network/wireless-security/ws-leap.ui.h:1
+#: ../panels/user-accounts/data/account-dialog.ui.h:6
+msgid "_Username"
+msgstr "Br_ukernavn"
+
+#: ../panels/network/wireless-security/eap-method-leap.ui.h:3
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:4
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
+#: ../panels/network/wireless-security/ws-leap.ui.h:3
+#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
+msgid "Sho_w password"
+msgstr "Vi_s passord"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:263
+#: ../panels/network/wireless-security/wireless-security.c:385
+msgid "MD5"
+msgstr "MD5"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:350
+#: ../panels/network/wireless-security/eap-method-tls.c:434
+#: ../panels/network/wireless-security/eap-method-ttls.c:350
+msgid "Choose a Certificate Authority certificate..."
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr "Versjon 0"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+msgid "Version 1"
+msgstr "Versjon 1"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:3
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
+msgid "C_A certificate"
+msgstr "C_A-sertifikat"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+msgid "PEAP _version"
+msgstr "PEAP-_versjon"
+
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
+msgid "As_k for this password every time"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:260
+msgid "Unencrypted private keys are insecure"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:263
+msgid ""
+"The selected private key does not appear to be protected by a password.  "
+"This could allow your security credentials to be compromised.  Please select "
+"a password-protected private key.\n"
+"\n"
+"(You can password-protect your private key with openssl)"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:428
+msgid "Choose your personal certificate..."
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:440
+msgid "Choose your private key..."
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:1
+msgid "I_dentity"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate"
+msgstr "Br_ukersertifikat"
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+msgid "Private _key"
+msgstr "Privat nø_kkel"
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+msgid "_Private key password"
+msgstr "_Passord for privat nøkkel"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:230
+msgid "PAP"
+msgstr "PAP"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:247
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:280
+msgid "CHAP"
+msgstr "CHAP"
+
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1
+msgid "Don't _warn me again"
+msgstr "Ikke vis ad_varsel igjen"
+
+#: ../panels/network/wireless-security/wireless-security.c:397
+msgid "TLS"
+msgstr "TLS"
+
+#: ../panels/network/wireless-security/wireless-security.c:421
+msgid "FAST"
+msgstr "FAST"
+
+#: ../panels/network/wireless-security/wireless-security.c:432
+msgid "Tunneled TLS"
+msgstr "Tunnelert TLS"
+
+#: ../panels/network/wireless-security/wireless-security.c:443
+msgid "Protected EAP (PEAP)"
+msgstr "Beskyttet EAP (PEAP)"
+
+#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:2
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:9
+#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:2
+msgid "Au_thentication"
+msgstr "Au_tentisering"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:1
+msgid "1 (Default)"
+msgstr "1 (forvalg)"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
+msgid "Open System"
+msgstr "Åpent system"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr "Delt nøkkel"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key"
+msgstr "Nø_kkel"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:8
+msgid "Sho_w key"
+msgstr "_Vis nøkkel"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:10
+msgid "WEP inde_x"
+msgstr "WEP-indeks"
+
+#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type"
+msgstr "_Type"
+
 #. TRANSLATORS: this is the per application switch for message tray usage.
 #: ../panels/notifications/cc-edit-dialog.c:39
 msgctxt "notifications"
@@ -2604,16 +3452,16 @@ msgid "Show Details in Lock Screen"
 msgstr "Vis detaljer ved låsing av skjerm"
 
 #: ../panels/notifications/cc-notifications-panel.c:203
-#: ../panels/power/cc-power-panel.c:1628 ../panels/power/cc-power-panel.c:1635
-#: ../panels/privacy/cc-privacy-panel.c:77
-#: ../panels/privacy/cc-privacy-panel.c:144
+#: ../panels/power/cc-power-panel.c:1637 ../panels/power/cc-power-panel.c:1644
+#: ../panels/privacy/cc-privacy-panel.c:78
+#: ../panels/privacy/cc-privacy-panel.c:145
 msgid "On"
 msgstr "På"
 
 #: ../panels/notifications/cc-notifications-panel.c:203
-#: ../panels/power/cc-power-panel.c:1622 ../panels/power/cc-power-panel.c:1633
-#: ../panels/privacy/cc-privacy-panel.c:77
-#: ../panels/privacy/cc-privacy-panel.c:144
+#: ../panels/power/cc-power-panel.c:1631 ../panels/power/cc-power-panel.c:1642
+#: ../panels/privacy/cc-privacy-panel.c:78
+#: ../panels/privacy/cc-privacy-panel.c:145
 msgid "Off"
 msgstr "Av"
 
@@ -2622,8 +3470,8 @@ msgid "Notifications"
 msgstr "Varslinger"
 
 #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
-msgid "Manage notifications"
-msgstr "Håndter varslinger"
+msgid "Control which notifications are displayed and what they show"
+msgstr ""
 
 #. Translators: those are keywords for the notifications control-center panel
 #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4
@@ -2681,8 +3529,8 @@ msgid "Online Accounts"
 msgstr "Kontoer på nettet"
 
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
-msgid "Manage online accounts"
-msgstr "Håndter kontoer på nettet"
+msgid "Connect to your online accounts and decide what to use them for"
+msgstr ""
 
 #. Translators: those are keywords for the online-accounts control-center panel
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
@@ -2790,159 +3638,159 @@ msgstr "Lader ut"
 msgid "Estimated battery capacity: %s"
 msgstr "Estimerer batterikapasitet: %s"
 
-#: ../panels/power/cc-power-panel.c:400
+#: ../panels/power/cc-power-panel.c:404
 msgctxt "Battery name"
 msgid "Main"
 msgstr "Hoved"
 
-#: ../panels/power/cc-power-panel.c:402
+#: ../panels/power/cc-power-panel.c:406
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "Ekstra"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:484
+#: ../panels/power/cc-power-panel.c:493
 msgid "Wireless mouse"
 msgstr "Trådløs mus"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:488
+#: ../panels/power/cc-power-panel.c:497
 msgid "Wireless keyboard"
 msgstr "Trådløst tastatur"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:492
+#: ../panels/power/cc-power-panel.c:501
 msgid "Uninterruptible power supply"
 msgstr "Avbruddsfri strømforsyning"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:497
+#: ../panels/power/cc-power-panel.c:506
 msgid "Personal digital assistant"
 msgstr "Personlig digital assistent"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:501
+#: ../panels/power/cc-power-panel.c:510
 msgid "Cellphone"
 msgstr "Mobiltelefon"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:505
+#: ../panels/power/cc-power-panel.c:514
 msgid "Media player"
 msgstr "Musikkavspiller"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:509
+#: ../panels/power/cc-power-panel.c:518
 msgid "Tablet"
 msgstr "Tegnebrett"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:513
+#: ../panels/power/cc-power-panel.c:522
 msgid "Computer"
 msgstr "Datamaskin"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:517 ../panels/power/cc-power-panel.c:725
-#: ../panels/power/cc-power-panel.c:1929
+#: ../panels/power/cc-power-panel.c:526 ../panels/power/cc-power-panel.c:734
+#: ../panels/power/cc-power-panel.c:1938
 msgid "Battery"
 msgstr "Batteri"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:526
+#: ../panels/power/cc-power-panel.c:535
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "Lader"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:533
+#: ../panels/power/cc-power-panel.c:542
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "Advarsel"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:538
+#: ../panels/power/cc-power-panel.c:547
 msgctxt "Battery power"
 msgid "Low"
 msgstr "Lav"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:543
+#: ../panels/power/cc-power-panel.c:552
 msgctxt "Battery power"
 msgid "Good"
 msgstr "God"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:548
+#: ../panels/power/cc-power-panel.c:557
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "Fullt ladet"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:552
+#: ../panels/power/cc-power-panel.c:561
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "Tom"
 
-#: ../panels/power/cc-power-panel.c:723
+#: ../panels/power/cc-power-panel.c:732
 msgid "Batteries"
 msgstr "Batterier"
 
-#: ../panels/power/cc-power-panel.c:1065
+#: ../panels/power/cc-power-panel.c:1074
 msgid "When _idle"
 msgstr "Når led_ig"
 
-#: ../panels/power/cc-power-panel.c:1392
+#: ../panels/power/cc-power-panel.c:1401
 msgid "Power Saving"
 msgstr "Strømsparing"
 
-#: ../panels/power/cc-power-panel.c:1421
+#: ../panels/power/cc-power-panel.c:1430
 msgid "_Screen Brightness"
 msgstr "Lysstyrke for _skjerm"
 
-#: ../panels/power/cc-power-panel.c:1449
+#: ../panels/power/cc-power-panel.c:1458
 msgid "_Dim Screen when Inactive"
 msgstr "_Demp skjermen av når inaktiv"
 
-#: ../panels/power/cc-power-panel.c:1472
-msgid "_Mark As Inactive After"
-msgstr "_Merk som inaktiv etter"
+#: ../panels/power/cc-power-panel.c:1481
+msgid "_Blank Screen"
+msgstr "_Slå av skjerm"
 
-#: ../panels/power/cc-power-panel.c:1507
+#: ../panels/power/cc-power-panel.c:1516
 msgid "_Wi-Fi"
-msgstr "_Wi-Fi"
+msgstr "_Trådløs"
 
-#: ../panels/power/cc-power-panel.c:1535
+#: ../panels/power/cc-power-panel.c:1544
 msgid "_Mobile Broadband"
 msgstr "_Mobilt bredbånd"
 
-#: ../panels/power/cc-power-panel.c:1573
+#: ../panels/power/cc-power-panel.c:1582
 msgid "_Bluetooth"
 msgstr "_Blåtann"
 
-#: ../panels/power/cc-power-panel.c:1624
+#: ../panels/power/cc-power-panel.c:1633
 msgid "When on battery power"
 msgstr "På batteristrøm"
 
-#: ../panels/power/cc-power-panel.c:1626
+#: ../panels/power/cc-power-panel.c:1635
 msgid "When plugged in"
 msgstr "Når den er koblet til strøm"
 
-#: ../panels/power/cc-power-panel.c:1753
+#: ../panels/power/cc-power-panel.c:1762
 msgid "Suspend & Power Off"
 msgstr "Hvilemodus og slå av"
 
-#: ../panels/power/cc-power-panel.c:1784
+#: ../panels/power/cc-power-panel.c:1793
 msgid "_Automatic Suspend"
 msgstr "_Automatisk hvilemodus"
 
-#: ../panels/power/cc-power-panel.c:1806
+#: ../panels/power/cc-power-panel.c:1815
 msgid "When Battery Power is _Critical"
 msgstr "Når batterikapasiteten er kritisk lav"
 
-#: ../panels/power/cc-power-panel.c:1839
+#: ../panels/power/cc-power-panel.c:1848
 msgid "Power Off"
 msgstr "Slå av"
 
-#: ../panels/power/cc-power-panel.c:1981
+#: ../panels/power/cc-power-panel.c:1990
 msgid "Devices"
 msgstr "Enheter"
 
@@ -2951,8 +3799,8 @@ msgid "Power"
 msgstr "Strøm"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:2
-msgid "Power management settings"
-msgstr "Innstillinger for strømstyring"
+msgid "View your battery status and change power saving settings"
+msgstr ""
 
 #. Translators: those are keywords for the power control-center panel
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:4
@@ -2968,50 +3816,95 @@ msgstr "Sett i dvalemodus"
 msgid "Power off"
 msgstr "Slå av"
 
-#: ../panels/power/power.ui.h:3 ../panels/privacy/privacy.ui.h:6
-msgid "5 minutes"
-msgstr "5 minutter"
-
-#: ../panels/power/power.ui.h:4
-msgid "10 minutes"
-msgstr "10 minutter"
+#: ../panels/power/power.ui.h:5
+msgid "45 minutes"
+msgstr "45 minutter"
 
 #: ../panels/power/power.ui.h:6 ../panels/privacy/privacy.ui.h:8
 msgid "1 hour"
 msgstr "1 time"
 
-#: ../panels/power/power.ui.h:7 ../panels/privacy/privacy.ui.h:3
+#: ../panels/power/power.ui.h:7
+msgid "80 minutes"
+msgstr "80 minutter"
+
+#: ../panels/power/power.ui.h:8
+msgid "90 minutes"
+msgstr "90 minutter"
+
+#: ../panels/power/power.ui.h:9
+msgid "100 minutes"
+msgstr "100 minutter"
+
+#: ../panels/power/power.ui.h:10
+msgid "2 hours"
+msgstr "2 timer"
+
+#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:3
 msgid "1 minute"
 msgstr "1 minutt"
 
-#: ../panels/power/power.ui.h:8 ../panels/privacy/privacy.ui.h:4
+#: ../panels/power/power.ui.h:12 ../panels/privacy/privacy.ui.h:4
 msgid "2 minutes"
 msgstr "2 minutter"
 
-#: ../panels/power/power.ui.h:9
-msgid "Never"
-msgstr "Aldri"
+#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:5
+msgid "3 minutes"
+msgstr "3 minutter"
 
-#: ../panels/power/power.ui.h:10
+#: ../panels/power/power.ui.h:14
+msgid "4 minutes"
+msgstr "4 minutter"
+
+#: ../panels/power/power.ui.h:15 ../panels/privacy/privacy.ui.h:6
+msgid "5 minutes"
+msgstr "5 minutter"
+
+#: ../panels/power/power.ui.h:16
+msgid "8 minutes"
+msgstr "8 minutter"
+
+#: ../panels/power/power.ui.h:17
+msgid "10 minutes"
+msgstr "10 minutter"
+
+#: ../panels/power/power.ui.h:18
+msgid "12 minutes"
+msgstr "12 minutter"
+
+#: ../panels/power/power.ui.h:20
 msgid "Automatic Suspend"
 msgstr "Automatisk hvilemodus"
 
-#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:10
+#: ../panels/power/power.ui.h:21 ../panels/privacy/privacy.ui.h:10
 msgid "_Close"
 msgstr "_Lukk"
 
-#: ../panels/power/power.ui.h:12
-msgid "When on _Battery Power"
-msgstr "På _batteristrøm"
-
-#: ../panels/power/power.ui.h:13
-msgid "When _Plugged In"
+#: ../panels/power/power.ui.h:22
+msgid "_Plugged In"
 msgstr "Når den er _koblet til strøm"
 
-#: ../panels/power/power.ui.h:14
+#: ../panels/power/power.ui.h:23
+msgid "On _Battery Power"
+msgstr "På _batteristrøm"
+
+#: ../panels/power/power.ui.h:24
 msgid "Delay"
 msgstr "Pause"
 
+#: ../panels/printers/authentication-dialog.ui.h:3
+msgid "Authenticate"
+msgstr "Autentiser"
+
+#: ../panels/printers/authentication-dialog.ui.h:5
+#: ../panels/sharing/sharing.ui.h:21
+msgid "Password"
+msgstr "Passord"
+
+#: ../panels/printers/authentication-dialog.ui.h:6
+msgid "Authentication Required"
+msgstr "Autentisering kreves"
+
 #. Translators: The printer is low on toner
 #: ../panels/printers/cc-printers-panel.c:591
 msgid "Low on toner"
@@ -3161,11 +4054,11 @@ msgstr[1] "%u aktive"
 msgid "Failed to add new printer."
 msgstr "Klarte ikke å legge til ny skriver."
 
-#: ../panels/printers/cc-printers-panel.c:1938
+#: ../panels/printers/cc-printers-panel.c:1940
 msgid "Select PPD File"
 msgstr "Velg PPD-fil"
 
-#: ../panels/printers/cc-printers-panel.c:1947
+#: ../panels/printers/cc-printers-panel.c:1949
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
@@ -3173,30 +4066,30 @@ msgstr ""
 "PostScript Printer Description filer (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 
-#: ../panels/printers/cc-printers-panel.c:2252
+#: ../panels/printers/cc-printers-panel.c:2254
 msgid "No suitable driver found"
 msgstr "Ingen passende driver funnet"
 
-#: ../panels/printers/cc-printers-panel.c:2321
+#: ../panels/printers/cc-printers-panel.c:2323
 msgid "Searching for preferred drivers…"
 msgstr "Søker etter foretrukne drivere …"
 
-#: ../panels/printers/cc-printers-panel.c:2336
+#: ../panels/printers/cc-printers-panel.c:2338
 msgid "Select from database…"
 msgstr "Velg fra database …"
 
-#: ../panels/printers/cc-printers-panel.c:2345
+#: ../panels/printers/cc-printers-panel.c:2347
 msgid "Provide PPD File…"
 msgstr "Oppgi en PPD-fil …"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2496
-#: ../panels/printers/cc-printers-panel.c:2519
+#: ../panels/printers/cc-printers-panel.c:2498
+#: ../panels/printers/cc-printers-panel.c:2521
 msgid "Test page"
 msgstr "Testside"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2923
+#: ../panels/printers/cc-printers-panel.c:2929
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Klarte ikke å laste brukergrensesnitt: %s"
@@ -3206,73 +4099,62 @@ msgid "Printers"
 msgstr "Skrivere"
 
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
-msgid "Change printer settings"
-msgstr "Endre innstillinger for skriver"
+msgid "Add printers, view printer jobs and decide how you want to print"
+msgstr ""
 
 #. Translators: those are keywords for the printing control-center panel
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr "Skriver;Kø;Utskrift;Papir;Blekk;Toner;"
 
-#: ../panels/printers/jobs-dialog.ui.h:1
-#: ../panels/printers/options-dialog.ui.h:1
-#: ../panels/printers/ppd-selection-dialog.ui.h:1
-msgid " "
-msgstr " "
-
+#. Translators: This dialog contains list of active print jobs of the selected printer
 #: ../panels/printers/jobs-dialog.ui.h:2
-#: ../panels/printers/options-dialog.ui.h:4
+msgid "Active Jobs"
+msgstr "Aktive jobber"
+
+#: ../panels/printers/jobs-dialog.ui.h:3
+#: ../panels/printers/options-dialog.ui.h:2
 #: ../panels/user-accounts/data/history-dialog.ui.h:1
 msgid "Close"
 msgstr "Lukk"
 
-#. Translators: This tab contains list of active print jobs of the selected printer
 #: ../panels/printers/jobs-dialog.ui.h:4
-msgid "Active Jobs"
-msgstr "Aktive jobber"
-
-#: ../panels/printers/jobs-dialog.ui.h:5
 msgid "Resume Printing"
 msgstr "Gjenoppta utskrift"
 
-#: ../panels/printers/jobs-dialog.ui.h:6
+#: ../panels/printers/jobs-dialog.ui.h:5
 msgid "Pause Printing"
 msgstr "Sett utskrift på pause"
 
-#: ../panels/printers/jobs-dialog.ui.h:7
+#: ../panels/printers/jobs-dialog.ui.h:6
 msgid "Cancel Print Job"
 msgstr "Avbryt utskriftsjobb"
 
-#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-dialog.c:1068
-msgid "_Add"
-msgstr "_Legg til"
-
-#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/printers/new-printer-dialog.ui.h:1
 msgid "Add a New Printer"
 msgstr "Legg til ny skriver"
 
+#: ../panels/printers/new-printer-dialog.ui.h:2
+#: ../panels/user-accounts/um-user-panel.c:467
+msgid "_Cancel"
+msgstr "A_vbryt"
+
 #: ../panels/printers/new-printer-dialog.ui.h:4
 msgid "Search for network printers or filter result"
 msgstr "Søk etter nettverksskrivere eller filtrer resultat"
 
-#: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/region/gnome-region-panel.ui.h:33
-msgid "Options"
-msgstr "Alternativer"
-
-#: ../panels/printers/options-dialog.ui.h:3
+#: ../panels/printers/options-dialog.ui.h:1
 msgid "Loading options…"
 msgstr "Laster alternativer …"
 
+#: ../panels/printers/ppd-selection-dialog.ui.h:1
+msgid "Select Printer Driver"
+msgstr "Velger skriverdriver"
+
 #: ../panels/printers/ppd-selection-dialog.ui.h:4
 msgid "Loading drivers database..."
 msgstr "Laster driverdatabase …"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:5
-msgid "Select Printer Driver"
-msgstr "Velger skriverdriver"
-
 #. Translators: this is an option of "Two Sided"
 #: ../panels/printers/pp-ipp-option-widget.c:65
 #: ../panels/printers/pp-ppd-option-widget.c:69
@@ -3368,13 +4250,13 @@ msgstr "Tilstand for jobb"
 msgid "Time"
 msgstr "Tid"
 
-#: ../panels/printers/pp-jobs-dialog.c:498
+#: ../panels/printers/pp-jobs-dialog.c:496
 #, c-format
 msgid "%s Active Jobs"
 msgstr "%s aktive jobber"
 
 #. Translators: No printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1291
+#: ../panels/printers/pp-new-printer-dialog.c:1465
 msgid "No printers detected."
 msgstr "Ingen skrivere funnet."
 
@@ -3465,12 +4347,6 @@ msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "Avansert"
 
-#. Translators: Options of given printer (e.g. "MyPrinter Options")
-#: ../panels/printers/pp-options-dialog.c:936
-#, c-format
-msgid "%s Options"
-msgstr "Alternativer for %s"
-
 #. Translators: this is an option of "Paper Source"
 #: ../panels/printers/pp-ppd-option-widget.c:75
 #: ../panels/printers/pp-ppd-option-widget.c:77
@@ -3508,14 +4384,20 @@ msgid "No pre-filtering"
 msgstr "Ingen forhåndsfiltrering"
 
 #. Translators: Name of column showing printer manufacturers
-#: ../panels/printers/pp-ppd-selection-dialog.c:230
-msgid "Manufacturers"
-msgstr "Produsenter"
+#: ../panels/printers/pp-ppd-selection-dialog.c:233
+msgid "Manufacturer"
+msgstr "Produsent"
 
 #. Translators: Name of column showing printer drivers
-#: ../panels/printers/pp-ppd-selection-dialog.c:242
-msgid "Drivers"
-msgstr "Drivere"
+#: ../panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
+msgstr "Driver"
+
+#. Translators: Samba server needs authentication of the user to show list of its printers.
+#: ../panels/printers/pp-samba.c:247
+#, c-format
+msgid "Enter your username and password to view printers available on %s."
+msgstr "Oppgi brukernavn og passord for å vise skrivere som er tilgjengelig på %s."
 
 #: ../panels/printers/printers.ui.h:1
 msgid "Add Printer"
@@ -3589,27 +4471,27 @@ msgstr ""
 "Beklager! Systemets utskriftstjeneste\n"
 "ser ikke ut til å være tilgjengelig."
 
-#: ../panels/privacy/cc-privacy-panel.c:104
+#: ../panels/privacy/cc-privacy-panel.c:105
 msgid "Hidden"
 msgstr "Skjult"
 
-#: ../panels/privacy/cc-privacy-panel.c:104
+#: ../panels/privacy/cc-privacy-panel.c:105
 msgid "Visible"
 msgstr "Synlig"
 
-#: ../panels/privacy/cc-privacy-panel.c:270 ../panels/privacy/privacy.ui.h:32
+#: ../panels/privacy/cc-privacy-panel.c:271 ../panels/privacy/privacy.ui.h:31
 msgid "Screen Lock"
 msgstr "Lås skjerm"
 
-#: ../panels/privacy/cc-privacy-panel.c:337 ../panels/privacy/privacy.ui.h:9
+#: ../panels/privacy/cc-privacy-panel.c:338 ../panels/privacy/privacy.ui.h:9
 msgid "Name & Visibility"
 msgstr "Navn og synlighet"
 
-#: ../panels/privacy/cc-privacy-panel.c:445 ../panels/privacy/privacy.ui.h:27
+#: ../panels/privacy/cc-privacy-panel.c:446 ../panels/privacy/privacy.ui.h:26
 msgid "Usage & History"
 msgstr "Bruk og historikk"
 
-#: ../panels/privacy/cc-privacy-panel.c:575 ../panels/privacy/privacy.ui.h:37
+#: ../panels/privacy/cc-privacy-panel.c:576 ../panels/privacy/privacy.ui.h:36
 msgid "Purge Trash & Temporary Files"
 msgstr "Tøm papirkurv og midlertidige filer"
 
@@ -3618,8 +4500,8 @@ msgid "Privacy"
 msgstr "Personvern"
 
 #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
-msgid "Privacy settings"
-msgstr "Innstillinger for personvern"
+msgid "Protect your personal information and control what others might see"
+msgstr ""
 
 #. Translators: those are keywords for the privacy control-center panel
 #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4
@@ -3638,10 +4520,6 @@ msgstr "Skjermen slår seg av"
 msgid "30 seconds"
 msgstr "30 sekunder"
 
-#: ../panels/privacy/privacy.ui.h:5
-msgid "3 minutes"
-msgstr "3 minutter"
-
 #: ../panels/privacy/privacy.ui.h:11
 msgid "Control how you appear on the screen and the network."
 msgstr "Kontroller hvordan du vises på skjermen og nettverket."
@@ -3699,14 +4577,10 @@ msgid "30 days"
 msgstr "Tredve dager"
 
 #: ../panels/privacy/privacy.ui.h:25
-msgid "Don't retain history"
-msgstr "Ikke behold historikk"
-
-#: ../panels/privacy/privacy.ui.h:26
 msgid "Forever"
 msgstr "For alltid"
 
-#: ../panels/privacy/privacy.ui.h:28
+#: ../panels/privacy/privacy.ui.h:27
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
@@ -3714,43 +4588,43 @@ msgstr ""
 "Hvis du bevarer din historikk blir det enklere å finne ting. Disse "
 "oppføringene deles aldri over nettverket."
 
-#: ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/privacy.ui.h:28
 msgid "Cl_ear Recent History"
 msgstr "_Tøm nylig historikk"
 
-#: ../panels/privacy/privacy.ui.h:30
+#: ../panels/privacy/privacy.ui.h:29
 msgid "_Recently Used"
 msgstr "_Nylig brukt"
 
-#: ../panels/privacy/privacy.ui.h:31
+#: ../panels/privacy/privacy.ui.h:30
 msgid "Retain _History"
 msgstr "Behold _historikk"
 
-#: ../panels/privacy/privacy.ui.h:33
+#: ../panels/privacy/privacy.ui.h:32
 msgid "The Screen Lock protects your privacy when you are away."
 msgstr "Låsing av skjermen hjelper deg med personvernet når du er borte."
 
-#: ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/privacy.ui.h:33
 msgid "Automatic Screen _Lock"
 msgstr "Automatisk _låsing av skjerm"
 
-#: ../panels/privacy/privacy.ui.h:35
-msgid "Lock Screen _After"
-msgstr "_Lås skjermen etter"
+#: ../panels/privacy/privacy.ui.h:34
+msgid "Lock Screen _After Blank For"
+msgstr "_Lås skjermen etter at den er slått av i"
 
-#: ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/privacy.ui.h:35
 msgid "Show _Notifications"
 msgstr "Vis varsli_nger"
 
-#: ../panels/privacy/privacy.ui.h:38
+#: ../panels/privacy/privacy.ui.h:37
 msgid "_Empty Trash"
 msgstr "_Tøm papirkurv"
 
-#: ../panels/privacy/privacy.ui.h:39
+#: ../panels/privacy/privacy.ui.h:38
 msgid "_Purge Temporary Files"
 msgstr "_Fjern midlertidige filer"
 
-#: ../panels/privacy/privacy.ui.h:40
+#: ../panels/privacy/privacy.ui.h:39
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
@@ -3758,204 +4632,172 @@ msgstr ""
 "Tøm papirkurv og midlertidige filer automatisk for å hjelpe med å holde "
 "datamaskinen fri for unødvendig sensitiv informasjon."
 
-#: ../panels/privacy/privacy.ui.h:41
+#: ../panels/privacy/privacy.ui.h:40
 msgid "Automatically Empty _Trash"
 msgstr "Tøm _papirkurven automatisk"
 
-#: ../panels/privacy/privacy.ui.h:42
+#: ../panels/privacy/privacy.ui.h:41
 msgid "Automatically Purge Temporary _Files"
 msgstr "Tøm _midlertidige filer automatisk"
 
-#: ../panels/privacy/privacy.ui.h:43
+#: ../panels/privacy/privacy.ui.h:42
 msgid "Purge _After"
 msgstr "Tøm _etter"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
-msgid "Region & Language"
-msgstr "Region og språk"
-
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
-msgid "Change your region and language settings"
-msgstr "Bytt region og språkinnstillinger"
-
-#. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
-msgid "Language;Layout;Keyboard;Input;"
-msgstr "Språk;Utforming;Tastatur;Inndata;"
-
-#: ../panels/region/gnome-region-panel-formats.c:144
+#: ../panels/region/cc-format-chooser.c:122
+msgctxt "measurement format"
 msgid "Imperial"
 msgstr "Imperisk"
 
-#: ../panels/region/gnome-region-panel-formats.c:146
+#: ../panels/region/cc-format-chooser.c:124
+msgctxt "measurement format"
 msgid "Metric"
 msgstr "Metrisk"
 
-#: ../panels/region/gnome-region-panel-input-chooser.ui.h:1
-msgid "Select an input source"
-msgstr "Velg en inndatakilde"
-
-#: ../panels/region/gnome-region-panel-lang.c:115
-#: ../panels/region/gnome-region-panel.ui.h:4
-msgid "Log out for changes to take effect"
-msgstr "Logg ut for at endringene skal tre i kraft"
+#: ../panels/region/cc-format-chooser.c:265
+msgid "No regions found"
+msgstr "Ingen regioner funnet"
 
-#: ../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."
-msgstr ""
-"Innloggingsskjermen, systemkontoene og nye brukerkontoer bruker systemets "
-"innstillinger for område og språk."
+#: ../panels/region/cc-input-chooser.c:179
+msgid "No input sources found"
+msgstr "Ingen inndatakilder funnet"
 
-#: ../panels/region/gnome-region-panel-system.c:476
-#: ../panels/region/gnome-region-panel.ui.h:35
-msgid ""
-"The login screen, system accounts and new user accounts use the system-wide "
-"Region and Language settings. You may change the system settings to match "
-"yours."
-msgstr ""
-"Innloggingsskjermen, systemkontoene og nye brukerkontoer bruker systemets "
-"innstillinger for område og språk. Du kan sette systeminnstillingene slik du "
-"ønsker."
+#: ../panels/region/cc-input-chooser.c:997
+#: ../panels/search/cc-search-locations-dialog.c:479
+msgid "Other"
+msgstr "Annet"
 
-#: ../panels/region/gnome-region-panel-system.c:479
-msgid "Copy Settings"
-msgstr "Kopier innstillinger"
+#: ../panels/region/cc-region-panel.c:225
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr "Økten må startes på nytt for at endringene skal tre i kraft"
 
-#: ../panels/region/gnome-region-panel-system.c:482
-#: ../panels/region/gnome-region-panel.ui.h:42
-msgid "Copy Settings…"
-msgstr "Kopier innstillinger …"
+#: ../panels/region/cc-region-panel.c:226
+msgid "Restart Now"
+msgstr "Start på nytt nå"
 
-#: ../panels/region/gnome-region-panel.ui.h:1
-msgid "Region and Language"
-msgstr "Region og språk"
+#: ../panels/region/cc-region-panel.c:436
+msgctxt "Language"
+msgid "None"
+msgstr "Ingen"
 
-#: ../panels/region/gnome-region-panel.ui.h:2
-msgid "Select a display language"
-msgstr "Velg et visningsspråk"
+#: ../panels/region/cc-region-panel.c:898
+msgid "Sorry"
+msgstr "Beklager"
 
-#: ../panels/region/gnome-region-panel.ui.h:6
-msgid "Add Language"
-msgstr "Legg til språk"
+#: ../panels/region/cc-region-panel.c:900
+msgid "Input methods can't be used on the login screen"
+msgstr "Inndatametoder kan ikke brukes i påloggingsskjermen"
 
-#: ../panels/region/gnome-region-panel.ui.h:7
-msgid "Language"
-msgstr "Språk"
+#: ../panels/region/cc-region-panel.c:1345
+msgctxt "Input source"
+msgid "None"
+msgstr "Ingen"
 
-#: ../panels/region/gnome-region-panel.ui.h:8
-msgid "Select a region (change will be applied the next time you log in)"
-msgstr "Velg en region. Endringen vil tas i bruk neste gang du logger inn"
+#: ../panels/region/cc-region-panel.c:1502
+msgid "Login Screen"
+msgstr "Påloggingsskjerm"
 
-#: ../panels/region/gnome-region-panel.ui.h:9
-msgid "Add Region"
-msgstr "Legg til region"
+#: ../panels/region/format-chooser.ui.h:1 ../panels/region/region.ui.h:3
+msgid "Formats"
+msgstr "Formater"
 
-#: ../panels/region/gnome-region-panel.ui.h:10
-msgid "Remove Region"
-msgstr "Fjern region"
+#: ../panels/region/format-chooser.ui.h:3
+msgid "Preview"
+msgstr "Forhåndvisning"
 
-#: ../panels/region/gnome-region-panel.ui.h:11
+#: ../panels/region/format-chooser.ui.h:4
 msgid "Dates"
 msgstr "Datoer"
 
-#: ../panels/region/gnome-region-panel.ui.h:12
+#: ../panels/region/format-chooser.ui.h:5
 msgid "Times"
 msgstr "Tid"
 
-#: ../panels/region/gnome-region-panel.ui.h:13
+#: ../panels/region/format-chooser.ui.h:6
 msgid "Numbers"
 msgstr "Tall"
 
-#: ../panels/region/gnome-region-panel.ui.h:14
-msgid "Currency"
-msgstr "Valuta"
-
-#: ../panels/region/gnome-region-panel.ui.h:15
+#: ../panels/region/format-chooser.ui.h:7
 msgid "Measurement"
 msgstr "Måleenheter"
 
-#: ../panels/region/gnome-region-panel.ui.h:16
-msgid "Examples"
-msgstr "Eksempler"
-
-#: ../panels/region/gnome-region-panel.ui.h:17
-msgid "Formats"
-msgstr "Formater"
+#: ../panels/region/format-chooser.ui.h:8
+msgid "Paper"
+msgstr "Papir"
 
-#: ../panels/region/gnome-region-panel.ui.h:18
-msgid "Select keyboards or other input sources"
-msgstr "Velg tastatur eller andre inndatakilder"
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
+msgid "Region & Language"
+msgstr "Region og språk"
 
-#: ../panels/region/gnome-region-panel.ui.h:19
-msgid "Add Input Source"
-msgstr "Legg til inndatakilde"
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+msgid ""
+"Select your display language, formats, keyboard layouts and input sources"
+msgstr "Velg språk for visning, formater, tastaturutforminger og inndatakilder"
 
-#: ../panels/region/gnome-region-panel.ui.h:20
-msgid "Remove Input Source"
-msgstr "Fjern inndatakilde"
+#. Translators: those are keywords for the region control-center panel
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
+msgid "Language;Layout;Keyboard;Input;"
+msgstr "Språk;Utforming;Tastatur;Inndata;"
 
-#: ../panels/region/gnome-region-panel.ui.h:21
-msgid "Move Input Source Up"
-msgstr "Flytt inndatakilde opp"
+#: ../panels/region/input-chooser.ui.h:1
+msgid "Add an Input Source"
+msgstr "Legg til en inndatakilde"
 
-#: ../panels/region/gnome-region-panel.ui.h:22
-msgid "Move Input Source Down"
-msgstr "Flytt inndatakilde ned"
+#: ../panels/region/input-options.ui.h:1
+msgid "Input Source Options"
+msgstr "Alternativer for inndatakilde"
 
-#: ../panels/region/gnome-region-panel.ui.h:23
-msgid "Input Source Settings"
-msgstr "Innstillinger for inndatakilder"
+#: ../panels/region/input-options.ui.h:2
+msgid "Use the _same source for all windows"
+msgstr "Bruk _samme kilde for alle vinduer"
 
-#: ../panels/region/gnome-region-panel.ui.h:24
-msgid "Show Keyboard Layout"
-msgstr "Vis tastaturutforming"
+#: ../panels/region/input-options.ui.h:3
+msgid "Allow _different sources for each window"
+msgstr "Tillat _forskjellige kilder for hvert vindu"
 
-#: ../panels/region/gnome-region-panel.ui.h:26
-msgid "Ctrl+Alt+Space"
-msgstr "Ctrl+Alt+Mellomrom"
+#: ../panels/region/input-options.ui.h:4
+msgid "Keyboard Shortcuts"
+msgstr "Tastatursnarveier"
 
-#: ../panels/region/gnome-region-panel.ui.h:28
-msgid "Ctrl+Alt+Shift+Space"
-msgstr "Ctrl+Alt+Shift+Mellomrom"
+#: ../panels/region/input-options.ui.h:5
+msgid "Switch to previous source"
+msgstr "Bytt til forrige kilde"
 
-#: ../panels/region/gnome-region-panel.ui.h:29
-msgid "Shortcut Settings"
-msgstr "Innstillinger for snarvei"
+#: ../panels/region/input-options.ui.h:6
+msgid "Super+Shift+Space"
+msgstr "Super+Shift+Mellomrom"
 
-#: ../panels/region/gnome-region-panel.ui.h:31
-msgid "Use the same source for all windows"
-msgstr "Bruk samme kilde for alle vinduer"
+#: ../panels/region/input-options.ui.h:7
+msgid "Switch to next source"
+msgstr "Bytt til neste kilde"
 
-#: ../panels/region/gnome-region-panel.ui.h:32
-msgid "Allow different sources for each window"
-msgstr "Tillat forskjellige kilder for hvert vindu"
+#: ../panels/region/input-options.ui.h:8
+msgid "Super+Space"
+msgstr "Super+Mellomrom"
 
-#: ../panels/region/gnome-region-panel.ui.h:34
-msgid "Input Sources"
-msgstr "Inndatakilder"
+#: ../panels/region/input-options.ui.h:9
+msgid "You can change these shortcuts in the keyboard settings"
+msgstr "Du kan endre disse snarveiene i innstillinger for tastatur"
 
-#. 'display' means 'output' here, as in 'translated messages that are displayed to the user'
-#: ../panels/region/gnome-region-panel.ui.h:37
-msgid "Display language:"
-msgstr "Vis språk:"
+#: ../panels/region/input-options.ui.h:10
+msgid "Alternative switch to next source"
+msgstr "Alternativ bytt til neste kilde"
 
-#: ../panels/region/gnome-region-panel.ui.h:38
-msgid "Input source:"
-msgstr "Inngangskilde:"
+#: ../panels/region/region.ui.h:2
+msgid "English (United Kingdom)"
+msgstr "Engelsk (Storbritannia)"
 
-#: ../panels/region/gnome-region-panel.ui.h:39
-msgid "Format:"
-msgstr "Format:"
+#: ../panels/region/region.ui.h:4
+msgid "United Kingdom"
+msgstr "Storbritannia"
 
-#: ../panels/region/gnome-region-panel.ui.h:40
-msgid "Your settings"
-msgstr "Dine innstillinger"
+#: ../panels/region/region.ui.h:6
+msgid "Options"
+msgstr "Alternativer"
 
-#: ../panels/region/gnome-region-panel.ui.h:41
-msgid "System settings"
-msgstr "Systeminnstillinger"
+#: ../panels/region/region.ui.h:7
+msgid "Login settings are used by all users when logging into the system"
+msgstr "Innstillinger for pålogging brukes av alle brukere når de logger på systemet"
 
 #: ../panels/search/cc-search-locations-dialog.c:275
 msgid "Home"
@@ -3969,10 +4811,6 @@ msgstr "Steder"
 msgid "Bookmarks"
 msgstr "Bokmerker"
 
-#: ../panels/search/cc-search-locations-dialog.c:479
-msgid "Other"
-msgstr "Annet"
-
 #: ../panels/search/cc-search-locations-dialog.c:675
 msgid "Select Location"
 msgstr "Velg lokasjon"
@@ -3981,19 +4819,14 @@ msgstr "Velg lokasjon"
 msgid "No applications found"
 msgstr "Ingen programmer funnet"
 
-#: ../panels/search/cc-search-panel.c:551
-#: ../panels/user-accounts/um-fingerprint-dialog.c:219
-#: ../panels/user-accounts/um-fingerprint-dialog.c:220
-msgid "Enabled"
-msgstr "Slått på"
-
 #: ../panels/search/gnome-search-panel.desktop.in.in.h:1
 msgid "Search"
 msgstr "Søk"
 
 #: ../panels/search/gnome-search-panel.desktop.in.in.h:2
-msgid "Search settings"
-msgstr "Innstillinger for søk"
+msgid ""
+"Control which applications show search results in the Activities Overview"
+msgstr "Kontroller hvilke programmer som viser resultater i aktivitetsoversikten"
 
 #. Translators: those are keywords for the search control-center panel
 #: ../panels/search/gnome-search-panel.desktop.in.in.h:4
@@ -4016,21 +4849,21 @@ msgstr "Flytt ned"
 msgid "Preferences"
 msgstr "Brukervalg"
 
-#: ../panels/sharing/cc-sharing-panel.c:213
+#: ../panels/sharing/cc-sharing-panel.c:259
 msgctxt "service is enabled"
 msgid "On"
 msgstr "På"
 
-#: ../panels/sharing/cc-sharing-panel.c:215
+#: ../panels/sharing/cc-sharing-panel.c:261
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "Av"
 
-#: ../panels/sharing/cc-sharing-panel.c:355
+#: ../panels/sharing/cc-sharing-panel.c:407
 msgid "Choose a Folder"
 msgstr "Velg en mappe"
 
-#: ../panels/sharing/cc-sharing-panel.c:533
+#: ../panels/sharing/cc-sharing-panel.c:585
 msgid "Copy"
 msgstr "Kopier"
 
@@ -4038,8 +4871,12 @@ msgstr "Kopier"
 msgid "Sharing"
 msgstr "Deling"
 
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
+msgid "Control what you want to share with others"
+msgstr "Kontroller hva du vil dele med andre"
+
 #. Translators: those are keywords for the sharing control-center panel
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4
 msgid ""
 "share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;"
 "pictures;photos;movies;server;renderer;"
@@ -4139,10 +4976,6 @@ msgstr "Del offentlig mappe på dette nettverket"
 msgid "Require Password"
 msgstr "Krev passord"
 
-#: ../panels/sharing/sharing.ui.h:21
-msgid "Password"
-msgstr "Passord"
-
 #: ../panels/sharing/sharing.ui.h:22
 msgid "Remote Login"
 msgstr "Ekstern pålogging"
@@ -4190,8 +5023,8 @@ msgid "Sound"
 msgstr "Lyd"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2
-msgid "Change sound volume and event sounds"
-msgstr "Endre lydvolum og lyder for hendelser"
+msgid "Change sound levels, inputs, outputs, and alert sounds"
+msgstr "Endre lydvolum, innganger, utganger og lyder for hendelser"
 
 #. Translators: those are keywords for the sound control-center panel
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
@@ -4309,65 +5142,65 @@ msgstr "_Test høyttalere"
 msgid "Peak detect"
 msgstr "Bestem høyeste nivå"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1511
+#: ../panels/sound/gvc-mixer-dialog.c:1508
 #: ../panels/sound/gvc-sound-theme-chooser.c:595
 msgid "Name"
 msgstr "Navn"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1530
+#: ../panels/sound/gvc-mixer-dialog.c:1527
 msgid "Device"
 msgstr "Enhet"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1593
+#: ../panels/sound/gvc-mixer-dialog.c:1590
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "Test av høyttaler for %s"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1647
+#: ../panels/sound/gvc-mixer-dialog.c:1644
 msgid "_Output volume:"
 msgstr "_Utgangsvolum:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1661
+#: ../panels/sound/gvc-mixer-dialog.c:1658
 msgid "Output"
 msgstr "Utgang"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1666
+#: ../panels/sound/gvc-mixer-dialog.c:1663
 msgid "C_hoose a device for sound output:"
 msgstr "_Velg en enhet som lydutgang:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1691
+#: ../panels/sound/gvc-mixer-dialog.c:1688
 msgid "Settings for the selected device:"
 msgstr "Innstillinger for valgt enhet:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1702
+#: ../panels/sound/gvc-mixer-dialog.c:1699
 msgid "Input"
 msgstr "Inngang"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1709
+#: ../panels/sound/gvc-mixer-dialog.c:1706
 msgid "_Input volume:"
 msgstr "_Inngangsvolum:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1732
+#: ../panels/sound/gvc-mixer-dialog.c:1729
 msgid "Input level:"
 msgstr "Inngangsnivå:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1760
+#: ../panels/sound/gvc-mixer-dialog.c:1757
 msgid "C_hoose a device for sound input:"
 msgstr "_Velg en enhet som lydinngang:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1787
+#: ../panels/sound/gvc-mixer-dialog.c:1784
 msgid "Sound Effects"
 msgstr "Lydeffekter"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1794
+#: ../panels/sound/gvc-mixer-dialog.c:1791
 msgid "_Alert volume:"
 msgstr "V_arselvolum:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1807
+#: ../panels/sound/gvc-mixer-dialog.c:1804
 msgid "Applications"
 msgstr "Programmer"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1811
+#: ../panels/sound/gvc-mixer-dialog.c:1808
 msgid "No application is currently playing or recording audio."
 msgstr "Ingen programmer spiller av eller tar opp lyd."
 
@@ -4422,8 +5255,8 @@ msgid "No shortcut set"
 msgstr "Ingen snarvei satt"
 
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
-msgid "Universal Access Preferences"
-msgstr "Brukervalg for universal tilgang"
+msgid "Make it easier to see, hear, type, point and click"
+msgstr "Gjør det lettere å se, høre, skrive og peke og klikke"
 
 #. Translators: those are keywords for the universal access control-center panel
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
@@ -4468,10 +5301,6 @@ msgstr "GOK"
 msgid "OnBoard"
 msgstr "OnBoard"
 
-#: ../panels/universal-access/uap.ui.h:8
-msgid "None"
-msgstr "Ingen"
-
 #: ../panels/universal-access/uap.ui.h:10
 #, no-c-format
 msgid "75%"
@@ -4520,10 +5349,6 @@ msgstr "Høy kontrast"
 msgid "Beep on Caps and Num Lock"
 msgstr "Pip når Caps og Num Lock er aktiv"
 
-#: ../panels/universal-access/uap.ui.h:23
-msgid "Options…"
-msgstr "Alternativer …"
-
 #: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
 msgstr "Skjermleser"
@@ -4930,10 +5755,6 @@ msgstr "_Lokal konto"
 msgid "_Enterprise Login"
 msgstr "Innlogging for b_edrifter"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
-msgid "_Username"
-msgstr "Br_ukernavn"
-
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
 msgid "_Full name"
 msgstr "_Fullt navn"
@@ -4951,11 +5772,6 @@ msgstr "_Domene"
 msgid "_Login Name"
 msgstr "_Brukernavn"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
-msgid "_Password"
-msgstr "_Passord"
-
 #: ../panels/user-accounts/data/account-dialog.ui.h:12
 msgid "Tip: Enterprise domain or realm name"
 msgstr "Tips: Domene eller områdenavn for bedriften"
@@ -5048,14 +5864,26 @@ msgid "Users"
 msgstr "Brukere"
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:2
-msgid "Add or remove users"
-msgstr "Legg til eller fjern brukere"
+msgid "Add or remove users and change your password"
+msgstr "Legg til eller fjern brukere og bytt passord"
 
 #. Translators: those are keywords for the user accounts control-center panel
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
 msgstr "Login;Navn;Fingeravtrykk;Avatar;Logo;Ansikt;Passord;"
 
+#: ../panels/user-accounts/data/history-dialog.ui.h:2
+msgid "Previous Week"
+msgstr "Forrige uke"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:3
+msgid "Next Week"
+msgstr "Neste uke"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:4
+msgid "Next week"
+msgstr "Neste uke"
+
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
 msgid "Set a password now"
 msgstr "Sett et passord nå"
@@ -5077,54 +5905,38 @@ msgid "Enable this account"
 msgstr "Aktiver denne kontoen"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:6
-msgid "_Hint"
-msgstr "_Hint"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:7
-msgid ""
-"This hint may be displayed at the login screen.  It will be visible to all "
-"users of this system.  Do <b>not</b> include the password here."
-msgstr ""
-"Dette hintet kan vises på innloggingsskjermen. Det vil være synlig for alle "
-"brukere på dette systemet. <b>Ikke</b> ta med passord her."
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "C_onfirm password"
 msgstr "B_ekreft passord"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:9
+#: ../panels/user-accounts/data/password-dialog.ui.h:7
 msgid "_New password"
 msgstr "_Nytt passord"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:10
+#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "Generate a password"
 msgstr "Generer et passord"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:11
-msgid "Fair"
-msgstr "Bra"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:12
+#: ../panels/user-accounts/data/password-dialog.ui.h:9
 msgid "Current _password"
 msgstr "Gjeldende _passord"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:13
+#: ../panels/user-accounts/data/password-dialog.ui.h:10
 msgid "_Action"
 msgstr "H_andling"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:14
+#: ../panels/user-accounts/data/password-dialog.ui.h:11
 msgid "Changing password for"
 msgstr "Bytter passord for"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:15
+#: ../panels/user-accounts/data/password-dialog.ui.h:12
 msgid "_Show password"
 msgstr "Vi_s passord"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:16
+#: ../panels/user-accounts/data/password-dialog.ui.h:13
 msgid "How to choose a strong password"
 msgstr "Hvordan velge et sterkt passord"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:17
+#: ../panels/user-accounts/data/password-dialog.ui.h:14
 msgid "Ch_ange"
 msgstr "_Bytt"
 
@@ -5194,10 +6006,6 @@ msgstr "_Språk"
 msgid "Last Login"
 msgstr "Siste pålogging"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
-msgid "History"
-msgstr "Historikk"
-
 #: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
 msgid "Manage user accounts"
 msgstr "Håndter brukerkontoer"
@@ -5207,7 +6015,7 @@ msgid "Authentication is required to change user data"
 msgstr "Autentisering kreves for å endre brukerdata"
 
 #: ../panels/user-accounts/pw-utils.c:94
-#: ../panels/user-accounts/um-password-dialog.c:601
+#: ../panels/user-accounts/um-password-dialog.c:597
 msgctxt "Password strength"
 msgid "Too short"
 msgstr "For kort"
@@ -5218,25 +6026,25 @@ msgid "Not good enough"
 msgstr "Ikke bra nok"
 
 #: ../panels/user-accounts/pw-utils.c:108
-#: ../panels/user-accounts/um-password-dialog.c:602
+#: ../panels/user-accounts/um-password-dialog.c:598
 msgctxt "Password strength"
 msgid "Weak"
 msgstr "Svakt"
 
 #: ../panels/user-accounts/pw-utils.c:111
-#: ../panels/user-accounts/um-password-dialog.c:603
+#: ../panels/user-accounts/um-password-dialog.c:599
 msgctxt "Password strength"
 msgid "Fair"
 msgstr "Bra"
 
 #: ../panels/user-accounts/pw-utils.c:114
-#: ../panels/user-accounts/um-password-dialog.c:604
+#: ../panels/user-accounts/um-password-dialog.c:600
 msgctxt "Password strength"
 msgid "Good"
 msgstr "God"
 
 #: ../panels/user-accounts/pw-utils.c:117
-#: ../panels/user-accounts/um-password-dialog.c:605
+#: ../panels/user-accounts/um-password-dialog.c:601
 msgctxt "Password strength"
 msgid "Strong"
 msgstr "Sterk"
@@ -5246,7 +6054,6 @@ msgid "Authentication failed"
 msgstr "Autentisering feilet"
 
 #: ../panels/user-accounts/run-passwd.c:504
-#: ../panels/user-accounts/um-password-dialog.c:273
 #, c-format
 msgid "The new password is too short"
 msgstr "Det nye passordet er for kort"
@@ -5325,6 +6132,11 @@ msgstr "Enheten er allerede i bruk."
 msgid "An internal error occurred."
 msgstr "En intern feil har oppstått."
 
+#: ../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:268
 msgid "Delete registered fingerprints?"
 msgstr "Slett registrerte fingeravtrykk?"
@@ -5400,47 +6212,51 @@ msgstr "Denne uken"
 msgid "Last Week"
 msgstr "Forrige uke"
 
-#: ../panels/user-accounts/um-password-dialog.c:105
+#: ../panels/user-accounts/um-password-dialog.c:128
 msgid "_Generate a password"
 msgstr "_Generer et passord"
 
-#: ../panels/user-accounts/um-password-dialog.c:159
+#: ../panels/user-accounts/um-password-dialog.c:181
 msgid "Please choose another password."
 msgstr "Vennligst velg et annet passord."
 
-#: ../panels/user-accounts/um-password-dialog.c:168
+#: ../panels/user-accounts/um-password-dialog.c:190
 msgid "Please type your current password again."
 msgstr "Vennligst skriv inn nåværende passord igjen."
 
-#: ../panels/user-accounts/um-password-dialog.c:174
+#: ../panels/user-accounts/um-password-dialog.c:196
 msgid "Password could not be changed"
 msgstr "Passordet kunne ikke endres"
 
-#: ../panels/user-accounts/um-password-dialog.c:270
+#: ../panels/user-accounts/um-password-dialog.c:301
 msgid "You need to enter a new password"
 msgstr "Du må skrive inn et nytt passord"
 
-#: ../panels/user-accounts/um-password-dialog.c:279
+#: ../panels/user-accounts/um-password-dialog.c:304
+msgid "The new password is not strong enough"
+msgstr "Det nye passordet er ikke sterkt nok"
+
+#: ../panels/user-accounts/um-password-dialog.c:310
 msgid "You need to confirm the password"
 msgstr "Du må bekrefte passordet"
 
-#: ../panels/user-accounts/um-password-dialog.c:282
+#: ../panels/user-accounts/um-password-dialog.c:313
 msgid "The passwords do not match"
 msgstr "Passordene er for like"
 
-#: ../panels/user-accounts/um-password-dialog.c:288
+#: ../panels/user-accounts/um-password-dialog.c:319
 msgid "You need to enter your current password"
 msgstr "Du må oppgi ditt nåværende passord"
 
-#: ../panels/user-accounts/um-password-dialog.c:291
+#: ../panels/user-accounts/um-password-dialog.c:322
 msgid "The current password is not correct"
 msgstr "Nåværende passord er ikke korrekt"
 
-#: ../panels/user-accounts/um-password-dialog.c:381
+#: ../panels/user-accounts/um-password-dialog.c:385
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../panels/user-accounts/um-password-dialog.c:443
+#: ../panels/user-accounts/um-password-dialog.c:439
 msgid "Wrong password"
 msgstr "Feil passord"
 
@@ -5545,15 +6361,15 @@ msgstr "Ingen"
 msgid "Logged in"
 msgstr "Logget inn"
 
-#: ../panels/user-accounts/um-user-panel.c:941
+#: ../panels/user-accounts/um-user-panel.c:942
 msgid "Failed to contact the accounts service"
 msgstr "Klarte ikke å kontakte kontotjenesten"
 
-#: ../panels/user-accounts/um-user-panel.c:943
+#: ../panels/user-accounts/um-user-panel.c:944
 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:984
+#: ../panels/user-accounts/um-user-panel.c:985
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -5561,12 +6377,12 @@ msgstr ""
 "Klikk på *-ikonet\n"
 "for å gjøre endringer"
 
-#: ../panels/user-accounts/um-user-panel.c:1022
+#: ../panels/user-accounts/um-user-panel.c:1023
 msgid "Create a user account"
 msgstr "Lag en ny brukerkonto"
 
-#: ../panels/user-accounts/um-user-panel.c:1033
-#: ../panels/user-accounts/um-user-panel.c:1319
+#: ../panels/user-accounts/um-user-panel.c:1034
+#: ../panels/user-accounts/um-user-panel.c:1320
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -5574,12 +6390,12 @@ msgstr ""
 "Klikk på *-ikonet\n"
 "for å lage en brukerkonto"
 
-#: ../panels/user-accounts/um-user-panel.c:1042
+#: ../panels/user-accounts/um-user-panel.c:1043
 msgid "Delete the selected user account"
 msgstr "Slett valgt brukerkonto"
 
-#: ../panels/user-accounts/um-user-panel.c:1054
-#: ../panels/user-accounts/um-user-panel.c:1324
+#: ../panels/user-accounts/um-user-panel.c:1055
+#: ../panels/user-accounts/um-user-panel.c:1325
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -5587,11 +6403,11 @@ msgstr ""
 "Klikk på *-ikonet\n"
 "for å slette valgt brukerkonto"
 
-#: ../panels/user-accounts/um-user-panel.c:1228
+#: ../panels/user-accounts/um-user-panel.c:1229
 msgid "My Account"
 msgstr "Min konto"
 
-#: ../panels/user-accounts/um-user-panel.c:1237
+#: ../panels/user-accounts/um-user-panel.c:1238
 msgid "Other Accounts"
 msgstr "Andre kontoer"
 
@@ -5621,14 +6437,6 @@ msgstr ""
 " ➣ tall\n"
 " ➣ tegnene «.», «-» og «_»"
 
-#: ../panels/user-accounts/um-utils.c:770
-msgid "Today"
-msgstr "I dag"
-
-#: ../panels/user-accounts/um-utils.c:773
-msgid "Yesterday"
-msgstr "I går"
-
 #: ../panels/wacom/button-mapping.ui.h:1
 msgid "Map Buttons"
 msgstr "Tilegne knapper"
@@ -5721,8 +6529,8 @@ msgid "Wacom Tablet"
 msgstr "Wacom pekeplate"
 
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
-msgid "Set your Wacom tablet preferences"
-msgstr "Sett dine brukervalg for Wacom tegnebrett"
+msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
+msgstr "Sett tilegning av knapper og juster sensitivitet for penn for grafiske tegnebrett"
 
 #. Translators: those are keywords for the wacom tablet control-center panel
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4
@@ -5926,40 +6734,40 @@ msgstr "Nedre knapp"
 msgid "Tip Pressure Feel"
 msgstr "Følelse av trykk på tuppen"
 
-#: ../shell/control-center.c:66
+#: ../shell/cc-application.c:67
 msgid "Enable verbose mode"
 msgstr "Vis mer informasjon"
 
-#: ../shell/control-center.c:67
+#: ../shell/cc-application.c:68
 msgid "Show the overview"
 msgstr "Vis oversikt"
 
-#: ../shell/control-center.c:68
+#: ../shell/cc-application.c:69
 msgid "Search for the string"
 msgstr "Søk etter strengen"
 
-#: ../shell/control-center.c:69
+#: ../shell/cc-application.c:70
 msgid "List possible panel names and exit"
 msgstr "Vis mulige navn på paneler og avslutt"
 
-#: ../shell/control-center.c:70 ../shell/control-center.c:71
-#: ../shell/control-center.c:72
+#: ../shell/cc-application.c:71 ../shell/cc-application.c:72
+#: ../shell/cc-application.c:73
 msgid "Show help options"
 msgstr "Vis flagg for hjelp"
 
-#: ../shell/control-center.c:73
+#: ../shell/cc-application.c:74
 msgid "Panel to display"
 msgstr "Panel som skal vises"
 
-#: ../shell/control-center.c:73
+#: ../shell/cc-application.c:74
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[PANEL] [ARGUMENT …]"
 
-#: ../shell/control-center.c:95
+#: ../shell/cc-application.c:116
 msgid "- Settings"
 msgstr "- Innstillinger"
 
-#: ../shell/control-center.c:103
+#: ../shell/cc-application.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -5969,46 +6777,42 @@ msgstr ""
 "Kjøre «%s --help» for å se en full liste med tilgjengelige "
 "kommandolinjeflagg.\n"
 
-#: ../shell/control-center.c:133
+#: ../shell/cc-application.c:154
 msgid "Available panels:"
 msgstr "Tilgjengelige paneler:"
 
-#: ../shell/control-center.c:244
+#: ../shell/cc-application.c:273
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../shell/control-center.c:245
+#: ../shell/cc-application.c:274
 msgid "Quit"
 msgstr "Avslutt"
 
+#: ../shell/cc-window.c:61 ../shell/gnome-control-center.desktop.in.in.h:1
+msgid "Settings"
+msgstr "Innstillinger"
+
 #. Add categories
-#: ../shell/gnome-control-center.c:881
+#: ../shell/cc-window.c:845
 msgctxt "category"
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../shell/gnome-control-center.c:882
+#: ../shell/cc-window.c:846
 msgctxt "category"
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: ../shell/gnome-control-center.c:883
+#: ../shell/cc-window.c:847
 msgctxt "category"
 msgid "System"
 msgstr "System"
 
-#: ../shell/gnomecc.directory.in.h:1
-msgid "Control Center"
-msgstr "Kontrollsenter"
-
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/shell.ui.h:1
-msgid "Settings"
-msgstr "Innstillinger"
+#: ../shell/cc-window.c:1401
+msgid "All Settings"
+msgstr "Alle innstillinger"
 
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
 msgstr "Brukervalg;Innstillinger"
-
-#: ../shell/shell.ui.h:2
-msgid "All Settings"
-msgstr "Alle innstillinger"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]