[gnome-control-center] Updated Norwegian bokmål translation.



commit 3f319eee77bbd98ee4fdc2dabe27675bbef91c4f
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Mon Nov 6 11:53:16 2017 +0100

    Updated Norwegian bokmål translation.

 po/nb.po | 1308 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 655 insertions(+), 653 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 5794599..cfe264a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,9 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 3.26.x\n"
-"Report-Msgid-Bugs-To: 
https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center&keywords=I18N+L10N&component=general\n";
-"POT-Creation-Date: 2017-06-12 20:16+0000\n"
-"PO-Revision-Date: 2017-06-14 07:57+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"control-center&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-10-30 17:18+0000\n"
+"PO-Revision-Date: 2017-11-06 11:52+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb lister ping uio no>\n"
 "Language: nb\n"
@@ -64,62 +65,61 @@ msgctxt "background, style"
 msgid "Span"
 msgstr "Strekk"
 
-#: ../panels/background/cc-background-chooser-dialog.c:437
+#: ../panels/background/cc-background-chooser-dialog.c:430
 msgid "Wallpapers"
 msgstr "Bakgrunner"
 
-#: ../panels/background/cc-background-chooser-dialog.c:446
+#: ../panels/background/cc-background-chooser-dialog.c:439
 msgid "Colors"
 msgstr "Farger"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:483
+#: ../panels/background/cc-background-chooser-dialog.c:476
 msgid "Select Background"
 msgstr "Velg bakgrunn"
 
-#: ../panels/background/cc-background-chooser-dialog.c:511
+#: ../panels/background/cc-background-chooser-dialog.c:504
 msgid "Pictures"
 msgstr "Bilder"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:543
+#: ../panels/background/cc-background-chooser-dialog.c:536
 msgid "No Pictures Found"
 msgstr "Fant ingen bilder"
 
 #. translators: "Home" is used in place of the Pictures
 #. * directory in the string below when XDG_PICTURES_DIR is
 #. * undefined
-#: ../panels/background/cc-background-chooser-dialog.c:561
+#: ../panels/background/cc-background-chooser-dialog.c:554
 #: ../panels/search/cc-search-locations-dialog.c:302
 msgid "Home"
 msgstr "Hjem"
 
 #. translators: %s here is the name of the Pictures directory, the string should be translated in
 #. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:573
+#: ../panels/background/cc-background-chooser-dialog.c:566
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr "Du kan legge til bilder i mappen «%s» for å vise dem her"
 
-#: ../panels/background/cc-background-chooser-dialog.c:580
+#: ../panels/background/cc-background-chooser-dialog.c:573
 #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
 #: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:1437
-#: ../panels/display/cc-display-panel.c:2094
+#: ../panels/display/cc-display-panel.c:2697
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
 #: ../panels/network/connection-editor/vpn-helpers.c:181
 #: ../panels/network/connection-editor/vpn-helpers.c:310
-#: ../panels/network/net-device-wifi.c:1301
-#: ../panels/network/net-device-wifi.c:1381
-#: ../panels/network/net-device-wifi.c:1619
+#: ../panels/network/net-device-wifi.c:1325
+#: ../panels/network/net-device-wifi.c:1405
+#: ../panels/network/net-device-wifi.c:1641
 #: ../panels/network/network-wifi.ui.h:1
 #: ../panels/printers/new-printer-dialog.ui.h:3
 #: ../panels/printers/pp-details-dialog.c:319
 #: ../panels/privacy/cc-privacy-panel.c:1049
 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:637
-#: ../panels/sharing/cc-sharing-panel.c:375
+#: ../panels/search/cc-search-locations-dialog.c:642
+#: ../panels/sharing/cc-sharing-panel.c:382
 #: ../panels/user-accounts/data/account-dialog.ui.h:2
 #: ../panels/user-accounts/data/join-dialog.ui.h:2
 #: ../panels/user-accounts/data/password-dialog.ui.h:2
@@ -131,7 +131,7 @@ msgstr "Du kan legge til bilder i mappen «%s» for å vise dem her"
 msgid "_Cancel"
 msgstr "A_vbryt"
 
-#: ../panels/background/cc-background-chooser-dialog.c:581
+#: ../panels/background/cc-background-chooser-dialog.c:574
 msgid "_Select"
 msgstr "_Velg"
 
@@ -150,7 +150,7 @@ msgstr "%d × %d"
 msgid "No Desktop Background"
 msgstr "Ingen skrivebordsbakgrunn"
 
-#: ../panels/background/cc-background-panel.c:493
+#: ../panels/background/cc-background-panel.c:497
 msgid "Current background"
 msgstr "Gjeldende bakgrunn"
 
@@ -168,39 +168,39 @@ msgstr "Bytt bakgrunnsbilde"
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Bakgrunn;Skjerm;Skrivebord;"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:264
+#: ../panels/bluetooth/cc-bluetooth-panel.c:268
 msgid "Turn Off Airplane Mode"
 msgstr "Slå av flymodus"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#: ../panels/bluetooth/cc-bluetooth-panel.c:334
 msgid "No Bluetooth Found"
 msgstr "Fant ikke Bluetooth"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#: ../panels/bluetooth/cc-bluetooth-panel.c:334
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "Koble til en dongle for å bruke Bluetooth."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#: ../panels/bluetooth/cc-bluetooth-panel.c:335
 msgid "Bluetooth Turned Off"
 msgstr "Bluetooth er slått av"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#: ../panels/bluetooth/cc-bluetooth-panel.c:335
 msgid "Turn on to connect devices and receive file transfers."
 msgstr "Slå på for å koble til enheter og motta filer."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#: ../panels/bluetooth/cc-bluetooth-panel.c:336
 msgid "Airplane Mode is on"
 msgstr "Flymodus er på"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#: ../panels/bluetooth/cc-bluetooth-panel.c:336
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "Bluetooth er slått av når flymodus er på."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#: ../panels/bluetooth/cc-bluetooth-panel.c:337
 msgid "Hardware Airplane Mode is on"
 msgstr "Flymodus slått på med maskinvare"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#: ../panels/bluetooth/cc-bluetooth-panel.c:337
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "Slå av flymodus bryteren for å slå på Bluetooth."
 
@@ -693,7 +693,7 @@ msgid "_Import File…"
 msgstr "_Importer fil …"
 
 #: ../panels/color/color.ui.h:31
-#: ../panels/network/connection-editor/net-connection-editor.c:546
+#: ../panels/network/connection-editor/net-connection-editor.c:519
 #: ../panels/printers/new-printer-dialog.ui.h:4
 #: ../panels/region/input-chooser.ui.h:3
 #: ../panels/user-accounts/data/account-dialog.ui.h:3
@@ -874,12 +874,12 @@ msgid "No languages found"
 msgstr "Fant ingen språk"
 
 #: ../panels/common/cc-util.c:127
-#: ../panels/network/connection-editor/ce-page-details.c:100
+#: ../panels/network/connection-editor/ce-page-details.c:106
 msgid "Today"
 msgstr "I dag"
 
 #: ../panels/common/cc-util.c:131
-#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/network/connection-editor/ce-page-details.c:108
 msgid "Yesterday"
 msgstr "I går"
 
@@ -1085,144 +1085,104 @@ msgstr "Endre innstillinger for systemets klokke og dato"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "Du må autentisere deg for å endre innstillinger for tid og dato."
 
-#: ../panels/display/cc-display-panel.c:579
-msgid "Lid Closed"
-msgstr "Lokk lukket"
-
-#. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:582
-msgid "Mirrored"
-msgstr "Speilet"
-
-#: ../panels/display/cc-display-panel.c:584
-#: ../panels/display/cc-display-panel.c:2348
-msgid "Primary"
-msgstr "Primær"
-
-#: ../panels/display/cc-display-panel.c:586
-#: ../panels/display/cc-display-panel.c:2690
-#: ../panels/notifications/cc-notifications-panel.c:293
-#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:331
-#: ../panels/universal-access/cc-ua-panel.c:712
-#: ../panels/universal-access/cc-ua-panel.c:725
-#: ../panels/universal-access/cc-ua-panel.c:737
-#: ../panels/universal-access/cc-ua-panel.c:908
-#: ../panels/universal-access/uap.ui.h:7
-msgid "Off"
-msgstr "Av"
-
-#: ../panels/display/cc-display-panel.c:589
-msgid "Secondary"
-msgstr "Sekundær"
-
-#. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1434
-msgid "Arrange Combined Displays"
-msgstr "Organiser sammenslåtte skjermer"
-
-#: ../panels/display/cc-display-panel.c:1438
-#: ../panels/display/cc-display-panel.c:2095
-#: ../panels/network/connection-editor/connection-editor.ui.h:2
-#: ../panels/network/network-wifi.ui.h:2
-msgid "_Apply"
-msgstr "_Bruk"
-
-#: ../panels/display/cc-display-panel.c:1462
-msgid "Drag displays to rearrange them"
-msgstr "Dra skjermer for å omorganisere dem"
-
-#. translators: example string is "60 Hz (NTSC)"
-#. * NTSC is https://en.wikipedia.org/wiki/NTSC
-#: ../panels/display/cc-display-panel.c:1668
-#, c-format
-msgid "%d Hz (NTSC)"
-msgstr "%d Hz (NTSC)"
-
-#. translators: example string is "60 Hz"
-#: ../panels/display/cc-display-panel.c:1674
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
-
-#: ../panels/display/cc-display-panel.c:2147
-msgid "Rotate counterclockwise by 90°"
-msgstr "Roter mot klokken med 90°"
+#: ../panels/display/cc-display-panel.c:738
+msgctxt "Display rotation"
+msgid "Landscape"
+msgstr "Landskap"
 
-#: ../panels/display/cc-display-panel.c:2165
-msgid "Rotate by 180°"
-msgstr "Roter med 180°"
+#: ../panels/display/cc-display-panel.c:741
+msgctxt "Display rotation"
+msgid "Portrait Right"
+msgstr "Portrett høyre"
 
-#: ../panels/display/cc-display-panel.c:2183
-msgid "Rotate clockwise by 90°"
-msgstr "Roter med klokken med 90°"
+#: ../panels/display/cc-display-panel.c:744
+msgctxt "Display rotation"
+msgid "Portrait Left"
+msgstr "Portrett venstre"
 
-#: ../panels/display/cc-display-panel.c:2204
-msgid "Size"
-msgstr "Størrelse"
+#: ../panels/display/cc-display-panel.c:747
+msgctxt "Display rotation"
+msgid "Landscape (flipped)"
+msgstr "Landskap (vendt)"
 
-#. aspect ratio
-#: ../panels/display/cc-display-panel.c:2219
-msgid "Aspect Ratio"
-msgstr "Høyde-/breddeforhold"
+#. Translators: This option sets orientation of print (portrait, landscape...)
+#: ../panels/display/cc-display-panel.c:788
+#: ../panels/display/cc-display-panel.c:838
+#: ../panels/printers/pp-options-dialog.c:558
+msgid "Orientation"
+msgstr "Orientering"
 
-#: ../panels/display/cc-display-panel.c:2246
-#: ../panels/printers/pp-options-dialog.c:85
+#: ../panels/display/cc-display-panel.c:881
+#: ../panels/display/cc-display-panel.c:933
+#: ../panels/display/cc-display-panel.c:1751
+#: ../panels/display/cc-display-panel.c:1797
+#: ../panels/printers/pp-options-dialog.c:87
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: ../panels/display/cc-display-panel.c:2266
-msgid "Adjust for TV"
-msgstr "Juster for TV"
-
-#: ../panels/display/cc-display-panel.c:2290
+#: ../panels/display/cc-display-panel.c:978
+#: ../panels/display/cc-display-panel.c:1049
 msgid "Refresh Rate"
 msgstr "Oppfriskingshastighet"
 
-#: ../panels/display/cc-display-panel.c:2349
-msgid "Show the top bar and Activities Overview on this display"
-msgstr "Vis topplinjen og aktivitetsoversikten på denne skjermen"
+#: ../panels/display/cc-display-panel.c:1186
+msgid "Scale"
+msgstr "Skalering"
 
-#: ../panels/display/cc-display-panel.c:2355
-msgid "Secondary Display"
-msgstr "Sekundær skjerm"
+#: ../panels/display/cc-display-panel.c:1239
+msgid "Adjust for TV"
+msgstr "Juster for TV"
 
-#: ../panels/display/cc-display-panel.c:2356
-msgid "Join this display with another to create an extra workspace"
-msgstr ""
-"Slå sammen denne skjermen med en annen for å lage et ekstra arbeidsområde"
+#: ../panels/display/cc-display-panel.c:1451
+#: ../panels/display/cc-display-panel.c:1497
+msgid "Primary Display"
+msgstr "Primær skjerm"
+
+#: ../panels/display/cc-display-panel.c:1546
+msgid "Display Arrangement"
+msgstr "Plassering av skjerm"
+
+#: ../panels/display/cc-display-panel.c:1547
+msgid ""
+"Drag displays to match your setup. The top bar is placed on the primary "
+"display."
+msgstr "Dra skjermene for å tilpasse oppsettet. Topplinjen plasseres på primær skjerm."
 
-#: ../panels/display/cc-display-panel.c:2363
-msgid "Presentation"
-msgstr "Presentasjon"
+#: ../panels/display/cc-display-panel.c:1985
+msgid "Display Mode"
+msgstr "Skjermmodus"
 
-#: ../panels/display/cc-display-panel.c:2364
-msgid "Show slideshows and media only"
-msgstr "Vis kun lysbildeserier og medier"
+#: ../panels/display/cc-display-panel.c:2001
+msgid "Join Displays"
+msgstr "Slå sammen skjermer"
 
-#. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2369
+#: ../panels/display/cc-display-panel.c:2004
 msgid "Mirror"
 msgstr "Speil"
 
-#: ../panels/display/cc-display-panel.c:2370
-msgid "Show your existing view on both displays"
-msgstr "Vis eksisterende visning på begge skjermer"
+#: ../panels/display/cc-display-panel.c:2007
+msgid "Single Display"
+msgstr "Enkel skjerm"
 
-#: ../panels/display/cc-display-panel.c:2376
-msgid "Turn Off"
-msgstr "Slå av"
+#: ../panels/display/cc-display-panel.c:2693
+msgid "Apply Changes?"
+msgstr "Bruk endringer?"
 
-#: ../panels/display/cc-display-panel.c:2377
-msgid "Don’t use this display"
-msgstr "Ikke bruk denne skjermen"
+#: ../panels/display/cc-display-panel.c:2707
+#: ../panels/network/connection-editor/connection-editor.ui.h:2
+#: ../panels/network/network-wifi.ui.h:2
+msgid "_Apply"
+msgstr "_Bruk"
+
+#: ../panels/display/cc-display-panel.c:3083
+#, c-format
+msgid "%.2lf Hz"
+msgstr "%.2lf Hz"
 
 #. TRANSLATORS: the state of the night light setting
-#: ../panels/display/cc-display-panel.c:2690
-#: ../panels/notifications/cc-notifications-panel.c:293
-#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981
+#: ../panels/display/cc-display-panel.c:3299
+#: ../panels/notifications/cc-notifications-panel.c:292
+#: ../panels/power/cc-power-panel.c:1970 ../panels/power/cc-power-panel.c:1977
 #: ../panels/privacy/cc-privacy-panel.c:190
 #: ../panels/privacy/cc-privacy-panel.c:257
 #: ../panels/universal-access/cc-ua-panel.c:331
@@ -1233,18 +1193,28 @@ msgstr "Ikke bruk denne skjermen"
 msgid "On"
 msgstr "På"
 
-#: ../panels/display/cc-display-panel.c:2795
-msgid "Could not get screen information"
-msgstr "Fant ikke informasjon om skjermen"
-
-#: ../panels/display/cc-display-panel.c:2833
-msgid "_Arrange Combined Displays"
-msgstr "Org_aniser sammenslåtte skjermer"
+#: ../panels/display/cc-display-panel.c:3299 ../panels/network/net-proxy.c:54
+#: ../panels/notifications/cc-notifications-panel.c:292
+#: ../panels/power/cc-power-panel.c:1964 ../panels/power/cc-power-panel.c:1975
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:331
+#: ../panels/universal-access/cc-ua-panel.c:712
+#: ../panels/universal-access/cc-ua-panel.c:725
+#: ../panels/universal-access/cc-ua-panel.c:737
+#: ../panels/universal-access/cc-ua-panel.c:908
+#: ../panels/universal-access/uap.ui.h:7
+msgid "Off"
+msgstr "Av"
 
-#: ../panels/display/cc-display-panel.c:2854
+#: ../panels/display/cc-display-panel.c:3320
 msgid "_Night Light"
 msgstr "_Nattlys"
 
+#: ../panels/display/cc-display-panel.c:3385
+msgid "Could not get screen information"
+msgstr "Fant ikke informasjon om skjermen"
+
 #. This cancels the redshift inhibit.
 #: ../panels/display/display.ui.h:2
 msgid "Restart Filter"
@@ -1277,8 +1247,9 @@ msgid "Sunset to Sunrise"
 msgstr "Solnedgang til soloppgang"
 
 #: ../panels/display/display.ui.h:10
-#: ../panels/network/connection-editor/ce-page-ip4.c:630
-#: ../panels/network/connection-editor/ce-page-ip6.c:592
+#: ../panels/network/connection-editor/ip4-page.ui.h:4
+#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#: ../panels/network/net-proxy.c:56 ../panels/network/network-proxy.ui.h:3
 #: ../panels/network/network-wifi.ui.h:26
 #: ../panels/privacy/cc-privacy-panel.c:217
 msgid "Manual"
@@ -1352,7 +1323,7 @@ msgstr "64-bit"
 msgid "32-bit"
 msgstr "32-bit"
 
-#: ../panels/info/cc-info-overview-panel.c:800
+#: ../panels/info/cc-info-overview-panel.c:807
 #, c-format
 msgid "Version %s"
 msgstr "Versjon %s"
@@ -1463,15 +1434,31 @@ msgid "Windows software"
 msgstr "Windows programvare"
 
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "De­tails"
-msgstr "Detaljer"
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:2
+msgid "Defa­ult Applications"
+msgstr "Forva­lgte programmer"
+
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:3
+msgid "Configure Default Applications"
+msgstr "Konfigurer forvalgte programmer"
 
+#. Translators: those are keywords for the Default Applications panel
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:5
+msgid "default;application;preferred;media;"
+msgstr "forvalgt;program;foretrukket;medie;"
+
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:2
+msgid "Ab­out"
+msgstr "O­m"
+
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:3
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:3
 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-overview-panel.desktop.in.in.h:5
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:5
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
@@ -1480,6 +1467,27 @@ msgstr ""
 "enhet;system;informasjon;minne;prosessor;versjon;forvalg;program;foretrukket;"
 "cd;dvd;usb;lyd;video;plate;avtagbar;medie;automatisk kjøring;"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+msgid "De­tails"
+msgstr "De­taljer"
+
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:2
+msgid "Remo­vable Media"
+msgstr "Avta­gbare medier"
+
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:3
+msgid "Configure Removable Media settings"
+msgstr "Konfigurer innstillinger for avtagbare medier"
+
+#. Translators: those are keywords for the Removable Media panel
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:5
+msgid ""
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;"
+msgstr "enhet;system;forvalg;program;foretrukket;cd;dvd;usb;lyd;video;plate;avtagbar;medie;automatisk 
kjøring;"
+
 #: ../panels/info/info-default-apps.ui.h:1
 msgid "_Web"
 msgstr "_Nett"
@@ -1652,8 +1660,8 @@ msgstr "Oppstartere"
 msgid "Launch help browser"
 msgstr "Start hjelpleser"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:277
-#: ../shell/alt/cc-window.c:830 ../shell/cc-window.c:1590
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:1590
+#: ../shell/cc-window.c:251 ../shell/cc-window.c:831
 #: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
 msgid "Settings"
 msgstr "Innstillinger"
@@ -1762,9 +1770,9 @@ msgstr "Mindre tekststørrelse"
 msgid "High contrast on or off"
 msgstr "Høy kontrast på eller av"
 
-#: ../panels/keyboard/cc-keyboard-manager.c:512
-#: ../panels/keyboard/cc-keyboard-manager.c:520
-#: ../panels/keyboard/cc-keyboard-manager.c:828
+#: ../panels/keyboard/cc-keyboard-manager.c:506
+#: ../panels/keyboard/cc-keyboard-manager.c:514
+#: ../panels/keyboard/cc-keyboard-manager.c:822
 msgid "Custom Shortcuts"
 msgstr "Egendefinerte snarveier"
 
@@ -1775,8 +1783,9 @@ msgstr "Egendefinerte snarveier"
 #. * The device has been disabled
 #: ../panels/keyboard/cc-keyboard-option.c:276
 #: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:440
+#: ../panels/keyboard/keyboard-shortcuts.c:435
 #: ../panels/keyboard/shortcut-editor.ui.h:2
+#: ../panels/network/network-proxy.ui.h:4
 #: ../panels/network/network-wifi.ui.h:31
 #: ../panels/sound/gvc/gvc-mixer-control.c:1866
 #: ../panels/user-accounts/um-fingerprint-dialog.c:214
@@ -1803,11 +1812,11 @@ msgstr "Komponeringstast"
 msgid "Modifiers-only switch to next source"
 msgstr "Bytt til neste kilde kun med endringstaster"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:183
+#: ../panels/keyboard/cc-keyboard-panel.c:181
 msgid "Reset All Shortcuts?"
 msgstr "Nullstill alle snarveier?"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:186
+#: ../panels/keyboard/cc-keyboard-panel.c:184
 msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
@@ -1815,22 +1824,22 @@ msgstr ""
 "Hvis du nullstiller snarveiene kan dette påvirke dine egendefinerte "
 "snarveier. Dette kan ikke angres."
 
-#: ../panels/keyboard/cc-keyboard-panel.c:190
+#: ../panels/keyboard/cc-keyboard-panel.c:188
 #: ../panels/keyboard/shortcut-editor.ui.h:9
 #: ../panels/printers/authentication-dialog.ui.h:2
 #: ../panels/printers/ppd-selection-dialog.ui.h:2
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:191
+#: ../panels/keyboard/cc-keyboard-panel.c:189
 msgid "Reset All"
 msgstr "Nullstill alle"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:283
+#: ../panels/keyboard/cc-keyboard-panel.c:281
 msgid "Reset the shortcut to its default value"
 msgstr "Nullstill snarveien til sin forvalgte verdi"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:434
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:427
 #, c-format
 msgid ""
 "%s is already being used for <b>%s</b>. If you replace it, %s will be "
@@ -1838,21 +1847,21 @@ msgid ""
 msgstr ""
 "%s brukes allerede for <b>%s</b>. Hvis du erstatter den vil %s bli slått av"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:600
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
 msgid "Set Custom Shortcut"
 msgstr "Sett egendefinert snarvei"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:600
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
 msgid "Set Shortcut"
 msgstr "Sett snarvei"
 
 #. Setup the top label
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:609
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:606
 #, c-format
 msgid "Enter new shortcut to change <b>%s</b>."
 msgstr "Oppgi ny snarvei for å endre <b>%s</b>."
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1036
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1033
 msgid "Add Custom Shortcut"
 msgstr "Legg til egendefinert snarvei"
 
@@ -1869,7 +1878,7 @@ msgstr "Vis og bytt tastatursnarveier, og endre skriveoppsett"
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
 msgid ""
 "Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
-msgstr ""
+msgstr "snarvei;arbeidsområde;vindu;endre størrelse;zoom;kontrast;inndata;kilde;lås;volum"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
 #: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
@@ -1894,11 +1903,11 @@ msgstr "Prøv et annet søk"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:1
 msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
-msgstr ""
+msgstr "Trykk Esc for å avbryte eller Slett for å nullstille tastatursnarveien."
 
 #: ../panels/keyboard/shortcut-editor.ui.h:3
 #: ../panels/printers/details-dialog.ui.h:1
-#: ../panels/sound/gvc-mixer-dialog.c:1493
+#: ../panels/sound/gvc-mixer-dialog.c:1499
 #: ../panels/sound/gvc-sound-theme-chooser.c:564
 msgid "Name"
 msgstr "Navn"
@@ -1929,8 +1938,6 @@ msgid "Remove"
 msgstr "Fjern"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:11
-#: ../panels/network/connection-editor/ce-page-ip4.c:305
-#: ../panels/network/connection-editor/ce-page-ip6.c:277
 msgid "Add"
 msgstr "Legg til"
 
@@ -2057,13 +2064,8 @@ msgstr "Dobbeltklikk, sekundærknapp"
 msgid "Single click, secondary button"
 msgstr "Enkeltklikk, sekundærknapp"
 
-#. TRANSLATORS: this is to disable the radio hardware in the
-#. * network panel
-#: ../panels/network/cc-network-panel.c:347
-msgid "Air_plane Mode"
-msgstr "_Flymodus"
-
-#: ../panels/network/cc-network-panel.c:1014
+#. add proxy to device list
+#: ../panels/network/cc-network-panel.c:579
 msgid "Network proxy"
 msgstr "Nettverksmellomtjener"
 
@@ -2071,20 +2073,27 @@ msgstr "Nettverksmellomtjener"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1193 ../panels/network/net-vpn.c:283
-#: ../panels/network/net-vpn.c:440
+#: ../panels/network/cc-network-panel.c:715 ../panels/network/net-vpn.c:192
+#: ../panels/network/net-vpn.c:321
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: ../panels/network/cc-network-panel.c:1260
+#: ../panels/network/cc-network-panel.c:779 ../panels/network/wifi.ui.h:7
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "Oi! Noe gikk galt. Kontakt programvareleverandøren."
 
-#: ../panels/network/cc-network-panel.c:1266
+#: ../panels/network/cc-network-panel.c:785
 msgid "NetworkManager needs to be running."
 msgstr "NetworkManager må kjøre."
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/network/cc-wifi-panel.c:209
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:2
+#: ../panels/network/network-wifi.ui.h:58
+msgid "Wi-Fi"
+msgstr "Trådløs"
+
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:1
 msgid "802.1x _Security"
 msgstr "802.1x sikkerhet"
@@ -2131,47 +2140,47 @@ msgid "Profile %d"
 msgstr "Profil %d"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:50
-#: ../panels/network/net-device-wifi.c:214
-#: ../panels/network/net-device-wifi.c:390
+#: ../panels/network/connection-editor/ce-page-details.c:56
+#: ../panels/network/net-device-wifi.c:231
+#: ../panels/network/net-device-wifi.c:407
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:54
-#: ../panels/network/net-device-wifi.c:218
-#: ../panels/network/net-device-wifi.c:395
+#: ../panels/network/connection-editor/ce-page-details.c:60
+#: ../panels/network/net-device-wifi.c:235
+#: ../panels/network/net-device-wifi.c:412
 #: ../panels/network/network-wifi.ui.h:19
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:58
-#: ../panels/network/net-device-wifi.c:222
+#: ../panels/network/connection-editor/ce-page-details.c:64
+#: ../panels/network/net-device-wifi.c:239
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:63
-#: ../panels/network/net-device-wifi.c:227
+#: ../panels/network/connection-editor/ce-page-details.c:69
+#: ../panels/network/net-device-wifi.c:244
 msgid "Enterprise"
 msgstr "Bedrift"
 
-#: ../panels/network/connection-editor/ce-page-details.c:68
-#: ../panels/network/net-device-wifi.c:232
-#: ../panels/network/net-device-wifi.c:380
+#: ../panels/network/connection-editor/ce-page-details.c:74
+#: ../panels/network/net-device-wifi.c:249
+#: ../panels/network/net-device-wifi.c:397
 msgctxt "Wifi security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../panels/network/connection-editor/ce-page-details.c:89
+#: ../panels/network/connection-editor/ce-page-details.c:95
 #: ../panels/power/power.ui.h:17
 msgid "Never"
 msgstr "Aldri"
 
-#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/network/connection-editor/ce-page-details.c:110
 #: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:488
+#: ../panels/network/net-device-wifi.c:506
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2179,146 +2188,88 @@ msgstr[0] "%i dag siden"
 msgstr[1] "%i dager siden"
 
 #. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:153
+#: ../panels/network/connection-editor/ce-page-details.c:176
 #: ../panels/network/net-device-ethernet.c:50
-#: ../panels/network/net-device-wifi.c:544
+#: ../panels/network/net-device-wifi.c:562
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: ../panels/network/connection-editor/ce-page-details.c:179
-#: ../panels/network/net-device-wifi.c:573
+#: ../panels/network/connection-editor/ce-page-details.c:202
+#: ../panels/network/net-device-wifi.c:591
 msgctxt "Signal strength"
 msgid "None"
 msgstr "Ingen"
 
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:575
+#: ../panels/network/connection-editor/ce-page-details.c:204
+#: ../panels/network/net-device-wifi.c:593
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Svak"
 
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:577
+#: ../panels/network/connection-editor/ce-page-details.c:206
+#: ../panels/network/net-device-wifi.c:595
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "Ok"
 
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:579
+#: ../panels/network/connection-editor/ce-page-details.c:208
+#: ../panels/network/net-device-wifi.c:597
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "God"
 
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:581
+#: ../panels/network/connection-editor/ce-page-details.c:210
+#: ../panels/network/net-device-wifi.c:599
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Utmerket"
 
-#: ../panels/network/connection-editor/ce-page-details.c:225
-#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:269
+#: ../panels/network/connection-editor/ce-page-details.c:248
+msgid "Forget Connection"
+msgstr "Glem tilkobling"
+
+#: ../panels/network/connection-editor/ce-page-details.c:250
+msgid "Remove Connection Profile"
+msgstr "Fjern tilkoblingsprofil"
+
+#: ../panels/network/connection-editor/ce-page-details.c:252
+msgid "Remove VPN"
+msgstr "Fjern VPN"
+
+#: ../panels/network/connection-editor/ce-page-details.c:280
+#: ../panels/network/network-wifi.ui.h:46 ../shell/cc-window.c:243
 #: ../shell/panel-list.ui.h:2
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:205
-#: ../panels/network/connection-editor/ce-page-vpn.c:210
-#: ../panels/network/connection-editor/ce-page-wifi.c:225
+#: ../panels/network/connection-editor/ce-page-ethernet.c:173
+#: ../panels/network/connection-editor/ce-page-vpn.c:188
+#: ../panels/network/connection-editor/ce-page-wifi.c:194
 #: ../panels/network/network-wifi.ui.h:47
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:202
-#: ../panels/network/connection-editor/ce-page-ip4.c:461
-#: ../panels/network/connection-editor/ce-page-ip6.c:180
-#: ../panels/network/connection-editor/ce-page-ip6.c:427
-#: ../panels/printers/details-dialog.ui.h:3
-msgid "Address"
-msgstr "Adresse"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:215
-#: ../panels/network/connection-editor/ce-page-ip4.c:474
-msgid "Netmask"
-msgstr "Nettverksmaske"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:229
-#: ../panels/network/connection-editor/ce-page-ip4.c:487
-#: ../panels/network/connection-editor/ce-page-ip6.c:206
-#: ../panels/network/connection-editor/ce-page-ip6.c:453
-#: ../panels/network/network-vpn.ui.h:2
-msgid "Gateway"
-msgstr "Gateway"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:250
-#: ../panels/network/connection-editor/ce-page-ip6.c:223
+#: ../panels/network/connection-editor/ce-page-ip4.c:251
+#: ../panels/network/connection-editor/ce-page-ip6.c:230
 msgid "Delete Address"
 msgstr "Slett adresse"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:368
-#: ../panels/network/connection-editor/ce-page-ip6.c:334
-msgid "Server"
-msgstr "Tjener"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:385
-#: ../panels/network/connection-editor/ce-page-ip6.c:351
-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:501
-#: ../panels/network/connection-editor/ce-page-ip6.c:467
-msgctxt "network parameters"
-msgid "Metric"
-msgstr "Metrisk"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:522
-#: ../panels/network/connection-editor/ce-page-ip6.c:484
+#: ../panels/network/connection-editor/ce-page-ip4.c:422
+#: ../panels/network/connection-editor/ce-page-ip6.c:390
 msgid "Delete Route"
 msgstr "Slett rute"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:626
-#: ../panels/network/network-wifi.ui.h:27
-msgid "Automatic (DHCP)"
-msgstr "Automatisk (DHCP)"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:634
-#: ../panels/network/connection-editor/ce-page-ip6.c:596
-msgid "Link-Local Only"
-msgstr "Kun link-local"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:980
+#: ../panels/network/connection-editor/ce-page-ip4.c:896
 #: ../panels/network/network-wifi.ui.h:48
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:193
-#: ../panels/network/connection-editor/ce-page-ip6.c:440
-msgid "Prefix"
-msgstr "Prefiks"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:584
-#: ../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:1
-#: ../panels/privacy/cc-privacy-panel.c:217
-msgid "Automatic"
-msgstr "Automatisk"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:588
-msgid "Automatic, DHCP only"
-msgstr "Automatisk. Kun DHCP"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:898
+#: ../panels/network/connection-editor/ce-page-ip6.c:827
 #: ../panels/network/network-wifi.ui.h:49
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-reset.c:78
-msgid "Reset"
-msgstr "Nullstill"
-
 #: ../panels/network/connection-editor/ce-page-security.c:245
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
@@ -2333,7 +2284,7 @@ msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit passordfrase"
 
 #: ../panels/network/connection-editor/ce-page-security.c:291
-#: ../panels/network/wireless-security/wireless-security.c:463
+#: ../panels/network/wireless-security/wireless-security.c:465
 msgid "LEAP"
 msgstr "LEAP"
 
@@ -2361,7 +2312,6 @@ msgstr "Hastighet for tilkobling"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
 #: ../panels/network/net-device-ethernet.c:153
-#: ../panels/network/network-simple.ui.h:3
 #: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
 msgid "IPv4 Address"
 msgstr "IPv4-adresse"
@@ -2370,14 +2320,12 @@ msgstr "IPv4-adresse"
 #: ../panels/network/net-device-ethernet.c:154
 #: ../panels/network/net-device-ethernet.c:158
 #: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-simple.ui.h:4
 #: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
 msgid "IPv6 Address"
 msgstr "IPv6-adresse"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
 #: ../panels/network/net-device-ethernet.c:161
-#: ../panels/network/network-simple.ui.h:2
 #: ../panels/network/network-wifi.ui.h:9
 msgid "Hardware Address"
 msgstr "Maskinvareadresse"
@@ -2385,17 +2333,15 @@ msgstr "Maskinvareadresse"
 #: ../panels/network/connection-editor/details-page.ui.h:7
 #: ../panels/network/net-device-ethernet.c:165
 #: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:10
 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/connection-editor/ip4-page.ui.h:10
+#: ../panels/network/connection-editor/ip6-page.ui.h:11
 #: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:11
 msgid "DNS"
 msgstr "DNS"
@@ -2404,6 +2350,23 @@ msgstr "DNS"
 msgid "Last Used"
 msgstr "Sist brukt"
 
+#: ../panels/network/connection-editor/details-page.ui.h:10
+msgid "Connect _automatically"
+msgstr "Koble til _automatisk"
+
+#: ../panels/network/connection-editor/details-page.ui.h:11
+msgid "Make available to _other users"
+msgstr "Gjør tilgjengelig for _andre brukere"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:1
+#: ../panels/network/connection-editor/ip4-page.ui.h:11
+#: ../panels/network/connection-editor/ip6-page.ui.h:2
+#: ../panels/network/net-proxy.c:58 ../panels/network/network-proxy.ui.h:2
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
+#: ../panels/privacy/cc-privacy-panel.c:217
+msgid "Automatic"
+msgstr "Automatisk"
+
 #: ../panels/network/connection-editor/ethernet-page.ui.h:2
 msgid "Twisted Pair (TP)"
 msgstr "Tvunnet par (TP)"
@@ -2460,101 +2423,112 @@ msgstr "_Klonet adresse"
 msgid "bytes"
 msgstr "bytes"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:15
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
-msgid "Make available to other _users"
-msgstr "Gjør tilgjengelig for andre br_ukere"
-
-#: ../panels/network/connection-editor/ethernet-page.ui.h:16
-#: ../panels/network/connection-editor/wifi-page.ui.h:7
-msgid "Connect _automatically"
-msgstr "Koble til _automatisk"
-
 #: ../panels/network/connection-editor/ip4-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:24
-msgid "IPv_4"
-msgstr "IPv_4"
+msgid "IPv_4 Method"
+msgstr "IPv_4-metode"
 
 #: ../panels/network/connection-editor/ip4-page.ui.h:2
-#: ../panels/network/connection-editor/ip6-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:25
-msgid "_Addresses"
-msgstr "_Adresser"
+#: ../panels/network/network-wifi.ui.h:27
+msgid "Automatic (DHCP)"
+msgstr "Automatisk (DHCP)"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:3
+#: ../panels/network/connection-editor/ip6-page.ui.h:4
+msgid "Link-Local Only"
+msgstr "Kun link-local"
 
 #: ../panels/network/connection-editor/ip4-page.ui.h:5
-#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#: ../panels/network/connection-editor/ip6-page.ui.h:6
+msgid "Disable"
+msgstr "Slå av"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:6
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
+msgid "Addresses"
+msgstr "Adresser"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:7
+#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#: ../panels/printers/details-dialog.ui.h:3
+msgid "Address"
+msgstr "Adresse"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:8
+msgid "Netmask"
+msgstr "Nettverksmaske"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:9
+#: ../panels/network/connection-editor/ip6-page.ui.h:10
+msgid "Gateway"
+msgstr "Gateway"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:12
+#: ../panels/network/connection-editor/ip6-page.ui.h:12
 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/connection-editor/ip4-page.ui.h:13
+#: ../panels/network/connection-editor/ip6-page.ui.h:13
+msgid "Separate IP addresses with commas"
+msgstr "Separer IP-adresser med komma"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:14
+#: ../panels/network/connection-editor/ip6-page.ui.h:14
 #: ../panels/network/network-wifi.ui.h:32
 msgid "Routes"
 msgstr "Ruter"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:7
-#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#: ../panels/network/connection-editor/ip4-page.ui.h:15
+#: ../panels/network/connection-editor/ip6-page.ui.h:15
 msgid "Automatic Routes"
 msgstr "Automatiske ruter"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:8
-#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
+#: ../panels/network/connection-editor/ip4-page.ui.h:17
+#: ../panels/network/connection-editor/ip6-page.ui.h:17
+#, fuzzy
+msgid "Metric"
+msgstr "Metrisk"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:18
+#: ../panels/network/connection-editor/ip6-page.ui.h:18
 #: ../panels/network/network-wifi.ui.h:34
 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:36
-msgid "IPv_6"
-msgstr "IPv_6"
+msgid "IPv_6 Method"
+msgstr "IPv_6-metode"
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:3
+msgid "Automatic, DHCP only"
+msgstr "Automatisk. Kun DHCP"
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:9
+msgid "Prefix"
+msgstr "Prefiks"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:296
+#: ../panels/network/connection-editor/net-connection-editor.c:273
 msgid "Unable to open connection editor"
 msgstr "Klarte ikke å åpne tilkoblingsbehandler"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:314
+#: ../panels/network/connection-editor/net-connection-editor.c:291
 msgid "New Profile"
 msgstr "Ny profil"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:635
+#: ../panels/network/connection-editor/net-connection-editor.c:603
+#: ../panels/network/network.ui.h:2
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:783
+#: ../panels/network/connection-editor/net-connection-editor.c:751
 msgid "Import from file…"
 msgstr "Importer fil …"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:817
+#: ../panels/network/connection-editor/net-connection-editor.c:785
 msgid "Add VPN"
 msgstr "Legg til VPN"
 
-#: ../panels/network/connection-editor/reset-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:41
-msgid "_Reset"
-msgstr "N_ullstill"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1620
-#: ../panels/network/network-wifi.ui.h:42
-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 ""
-"Nullstill innstillingene for dette nettverket, inklusive passord, men husk "
-"det som et foretrukket nettverk"
-
-#: ../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 ""
-"Fjern alle detaljer relatert til dette nettverket og ikke prøv å koble til "
-"automatisk"
-
 #: ../panels/network/connection-editor/security-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:16
 msgid "S_ecurity"
@@ -2583,7 +2557,7 @@ msgstr "Velg fil som skal importeres"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:182
 #: ../panels/printers/pp-details-dialog.c:320
-#: ../panels/sharing/cc-sharing-panel.c:376
+#: ../panels/sharing/cc-sharing-panel.c:383
 #: ../panels/user-accounts/um-photo-dialog.c:222
 msgid "_Open"
 msgstr "_Åpne"
@@ -2621,7 +2595,7 @@ msgstr ""
 msgid "Export VPN connection"
 msgstr "Eksporter VPN-forbindelse"
 
-#: ../panels/network/connection-editor/vpn-page.ui.h:3
+#: ../panels/network/connection-editor/vpn-page.ui.h:2
 msgid "(Error: unable to load VPN connection editor)"
 msgstr "(Feil: klarte ikke å laste inn VPN-tilkoblingsbehandler)"
 
@@ -2640,10 +2614,6 @@ msgstr "_BSSID"
 msgid "My Home Network"
 msgstr "Hjemmenettverk"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:6
-msgid "Make available to _other users"
-msgstr "Gjør tilgjengelig for _andre brukere"
-
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:2
 msgid "Net­work"
@@ -2662,18 +2632,27 @@ msgstr ""
 "Nettverk;Trådløst;Wi-Fi;Wifi;IP;LAN;Mellomtjener;WAN;Bredbånd;Modem;Blåtann;"
 "vpn;DNS;"
 
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:3
+msgid "Control how you connect to Wi-Fi networks"
+msgstr "Kontroller hvordan du kobler til trådløse nettverk"
+
+#. Translators: those are keywords for the wi-fi control-center panel
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:5
+msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
+msgstr "Nettverk;Trådløst;Wi-Fi;Wifi;IP;LAN;Bredbånd;DNS;"
+
 #: ../panels/network/net-device-ethernet.c:106
-#: ../panels/network/net-device-wifi.c:474
+#: ../panels/network/net-device-wifi.c:492
 msgid "never"
 msgstr "aldri"
 
 #: ../panels/network/net-device-ethernet.c:116
-#: ../panels/network/net-device-wifi.c:484
+#: ../panels/network/net-device-wifi.c:502
 msgid "today"
 msgstr "i dag"
 
 #: ../panels/network/net-device-ethernet.c:118
-#: ../panels/network/net-device-wifi.c:486
+#: ../panels/network/net-device-wifi.c:504
 msgid "yesterday"
 msgstr "i går"
 
@@ -2693,17 +2672,17 @@ msgstr "Sist brukt"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:280
+#: ../panels/network/net-device-ethernet.c:275
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "Kablet"
 
-#: ../panels/network/net-device-ethernet.c:348
-#: ../panels/network/net-device-wifi.c:1778
-#: ../panels/network/network-ethernet.ui.h:3
+#: ../panels/network/net-device-ethernet.c:343
+#: ../panels/network/net-device-wifi.c:1800
+#: ../panels/network/network-ethernet.ui.h:2
 #: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
+#: ../panels/network/network-simple.ui.h:3 ../panels/network/network-vpn.ui.h:2
 msgid "Options…"
 msgstr "Valg …"
 
@@ -2711,12 +2690,12 @@ msgstr "Valg …"
 msgid "Add new connection"
 msgstr "Legg til ny tilkobling"
 
-#: ../panels/network/net-device-wifi.c:1258
+#: ../panels/network/net-device-wifi.c:1282
 #, 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, blir du koblet fra <b>%s</b>."
 
-#: ../panels/network/net-device-wifi.c:1262
+#: ../panels/network/net-device-wifi.c:1286
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2724,37 +2703,37 @@ 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:1269
+#: ../panels/network/net-device-wifi.c:1293
 msgid "Turn On Wi-Fi Hotspot?"
 msgstr "Slå på trådløst aksesspunkt?"
 
-#: ../panels/network/net-device-wifi.c:1291
+#: ../panels/network/net-device-wifi.c:1315
 msgid ""
 "Wi-Fi hotspots are usually used to share an additional Internet connection "
 "over Wi-Fi."
-msgstr ""
+msgstr "Wi-Fi aksesspunkt brukes vanligvis til å dele en internettforbindelse over Wi-Fi."
 
-#: ../panels/network/net-device-wifi.c:1302
+#: ../panels/network/net-device-wifi.c:1326
 msgid "_Turn On"
 msgstr "_Slå på"
 
-#: ../panels/network/net-device-wifi.c:1379
+#: ../panels/network/net-device-wifi.c:1403
 msgid "Stop hotspot and disconnect any users?"
 msgstr "Vil du slå av trådløst aksesspunkt og koble fra brukere?"
 
-#: ../panels/network/net-device-wifi.c:1382
+#: ../panels/network/net-device-wifi.c:1406
 msgid "_Stop Hotspot"
 msgstr "_Stopp hotspot"
 
-#: ../panels/network/net-device-wifi.c:1482
+#: ../panels/network/net-device-wifi.c:1503
 msgid "System policy prohibits use as a Hotspot"
 msgstr "Systemregler hindrer oppsett av aksesspunkt"
 
-#: ../panels/network/net-device-wifi.c:1485
+#: ../panels/network/net-device-wifi.c:1506
 msgid "Wireless device does not support Hotspot mode"
 msgstr "Trådløs enhet støtter ikke hotspotmodus"
 
-#: ../panels/network/net-device-wifi.c:1616
+#: ../panels/network/net-device-wifi.c:1638
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
@@ -2762,19 +2741,24 @@ msgstr ""
 "Nettverksdetaljer for valgte nettverk - inkludert passord og innstillinger - "
 "går tapt."
 
-#: ../panels/network/net-device-wifi.c:1929
-#: ../panels/network/net-device-wifi.c:1936
+#: ../panels/network/net-device-wifi.c:1642
+#: ../panels/network/network-wifi.ui.h:42
+msgid "_Forget"
+msgstr "_Glem"
+
+#: ../panels/network/net-device-wifi.c:1951
+#: ../panels/network/net-device-wifi.c:1958
 msgid "Known Wi-Fi Networks"
 msgstr "Kjente trådløse nettverk"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1969
+#: ../panels/network/net-device-wifi.c:1991
 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
+#: ../panels/network/net-proxy.c:102
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr ""
@@ -2785,18 +2769,10 @@ msgstr ""
 #. * network, then anyone else on that network can tell your
 #. * machine that it should proxy all of your web traffic
 #. * through them.
-#: ../panels/network/net-proxy.c:75
+#: ../panels/network/net-proxy.c:110
 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:410
-msgid "Proxy"
-msgstr "Mellomtjener"
-
-#: ../panels/network/network-ethernet.ui.h:2
-msgid "_Add Profile…"
-msgstr "_Legg til profil …"
-
 #: ../panels/network/network-mobile.ui.h:1
 msgid "IMEI"
 msgstr "IMEI"
@@ -2810,95 +2786,64 @@ msgid "Network"
 msgstr "Nettverk"
 
 #: ../panels/network/network-proxy.ui.h:1
-msgctxt "proxy method"
-msgid "None"
-msgstr "Ingen"
-
-#: ../panels/network/network-proxy.ui.h:2
-msgctxt "proxy method"
-msgid "Manual"
-msgstr "Manuell"
-
-#: ../panels/network/network-proxy.ui.h:3
-msgctxt "proxy method"
-msgid "Automatic"
-msgstr "Automatisk"
-
-#: ../panels/network/network-proxy.ui.h:4
-msgid "_Method"
-msgstr "_Metode"
+msgid "Network Proxy"
+msgstr "Nettverksmellomtjener"
 
 #: ../panels/network/network-proxy.ui.h:5
-msgid "_Configuration URL"
-msgstr "_Nettadresse til oppsett"
-
-#: ../panels/network/network-proxy.ui.h:6
 msgid "_HTTP Proxy"
 msgstr "_HTTP-mellomtjener"
 
-#: ../panels/network/network-proxy.ui.h:7
+#: ../panels/network/network-proxy.ui.h:6
 msgid "H_TTPS Proxy"
 msgstr "H_TTP-mellomtjener"
 
-#: ../panels/network/network-proxy.ui.h:8
+#: ../panels/network/network-proxy.ui.h:7
 msgid "_FTP Proxy"
 msgstr "_FTP-mellomtjener"
 
-#: ../panels/network/network-proxy.ui.h:9
+#: ../panels/network/network-proxy.ui.h:8
 msgid "_Socks Host"
 msgstr "_Socks-vert"
 
-#: ../panels/network/network-proxy.ui.h:10
+#: ../panels/network/network-proxy.ui.h:9
 msgid "_Ignore Hosts"
 msgstr "_Ignorer verter"
 
-#: ../panels/network/network-proxy.ui.h:11
+#: ../panels/network/network-proxy.ui.h:10
 msgid "HTTP proxy port"
 msgstr "Port for HTTP-mellomtjener"
 
-#: ../panels/network/network-proxy.ui.h:12
+#: ../panels/network/network-proxy.ui.h:11
 msgid "HTTPS proxy port"
 msgstr "Port for HTTPS-mellomtjener"
 
-#: ../panels/network/network-proxy.ui.h:13
+#: ../panels/network/network-proxy.ui.h:12
 msgid "FTP proxy port"
 msgstr "Port for FTP-mellomtjener"
 
-#: ../panels/network/network-proxy.ui.h:14
+#: ../panels/network/network-proxy.ui.h:13
 msgid "Socks proxy port"
 msgstr "Port for Socks-mellomtjener"
 
-#: ../panels/network/network-simple.ui.h:7
+#: ../panels/network/network-proxy.ui.h:14
+msgid "_Configuration URL"
+msgstr "_Nettadresse til oppsett"
+
+#: ../panels/network/network-simple.ui.h:2
 msgid "Turn device off"
 msgstr "Slå enhet av"
 
+#. Translators: The found device is a printer connected via Bluetooth
 #: ../panels/network/network.ui.h:1
-msgid "Add Device"
-msgstr "Legg til enhet"
+#: ../panels/printers/pp-new-printer-dialog.c:1816
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../panels/network/network.ui.h:2
-msgid "Remove Device"
-msgstr "Fjern enhet"
+#: ../panels/network/network.ui.h:3
+msgid "Not set up"
+msgstr "Ikke satt opp"
 
 #: ../panels/network/network-vpn.ui.h:1
-msgid "VPN Type"
-msgstr "Type VPN"
-
-#: ../panels/network/network-vpn.ui.h:3
-msgid "Group Name"
-msgstr "Gruppenavn"
-
-#: ../panels/network/network-vpn.ui.h:4
-msgid "Group Password"
-msgstr "Gruppepassord"
-
-#: ../panels/network/network-vpn.ui.h:5
-#: ../panels/printers/authentication-dialog.ui.h:4
-#: ../panels/printers/new-printer-dialog.ui.h:13
-msgid "Username"
-msgstr "Brukernavn"
-
-#: ../panels/network/network-vpn.ui.h:6
 msgid "Turn VPN connection off"
 msgstr "Slå av VPN-forbindelse"
 
@@ -2933,6 +2878,14 @@ msgstr "Gjør tilgjengelig for andre brukere"
 msgid "identity"
 msgstr "identitet"
 
+#: ../panels/network/network-wifi.ui.h:24
+msgid "IPv_4"
+msgstr "IPv_4"
+
+#: ../panels/network/network-wifi.ui.h:25
+msgid "_Addresses"
+msgstr "_Adresser"
+
 #: ../panels/network/network-wifi.ui.h:28
 msgid "Automatic (DHCP) addresses only"
 msgstr "Kun automatiske adresser (DHCP)"
@@ -2953,6 +2906,10 @@ msgstr "_Ignorer automatisk innhentede ruter"
 msgid "ipv4"
 msgstr "ipv4"
 
+#: ../panels/network/network-wifi.ui.h:36
+msgid "IPv_6"
+msgstr "IPv_6"
+
 #: ../panels/network/network-wifi.ui.h:37
 msgid "ipv6"
 msgstr "ipv6"
@@ -2965,6 +2922,10 @@ msgstr "_Klonet MAC-adresse"
 msgid "hardware"
 msgstr "maskinvare"
 
+#: ../panels/network/network-wifi.ui.h:41
+msgid "_Reset"
+msgstr "N_ullstill"
+
 #: ../panels/network/network-wifi.ui.h:43
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
@@ -2995,52 +2956,72 @@ msgid "Reset"
 msgstr "Nullstill"
 
 #: ../panels/network/network-wifi.ui.h:52
-msgid "Wi-Fi"
-msgstr "Trådløs"
-
-#: ../panels/network/network-wifi.ui.h:53
-msgid "Turn Wi-Fi off"
-msgstr "Slå trådløs av"
-
-#: ../panels/network/network-wifi.ui.h:54
-msgid "_Use as Hotspot…"
-msgstr "Br_uk som trådløst aksesspunkt …"
-
-#: ../panels/network/network-wifi.ui.h:55
-msgid "_Connect to Hidden Network…"
-msgstr "_Koble til skjult nettverk …"
-
-#: ../panels/network/network-wifi.ui.h:56
-msgid "_History"
-msgstr "_Historikk"
-
-#: ../panels/network/network-wifi.ui.h:57
 msgid "Wi-Fi Hotspot"
 msgstr "Trådløst aksesspunkt"
 
-#: ../panels/network/network-wifi.ui.h:58
+#: ../panels/network/network-wifi.ui.h:53
 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:59
+#: ../panels/network/network-wifi.ui.h:54
 msgid "Network Name"
 msgstr "Nettverksnavn"
 
-#: ../panels/network/network-wifi.ui.h:60
+#: ../panels/network/network-wifi.ui.h:55
 msgid "Connected Devices"
 msgstr "Tilkoblede enheter"
 
-#: ../panels/network/network-wifi.ui.h:61
+#: ../panels/network/network-wifi.ui.h:56
 msgid "Security type"
 msgstr "Type sikkerhet"
 
-#: ../panels/network/network-wifi.ui.h:62
+#: ../panels/network/network-wifi.ui.h:57
 #: ../panels/printers/authentication-dialog.ui.h:5
 #: ../panels/printers/new-printer-dialog.ui.h:14
 #: ../panels/user-accounts/data/account-dialog.ui.h:9
 msgid "Password"
 msgstr "Passord"
 
+#: ../panels/network/network-wifi.ui.h:59
+msgid "Turn Wi-Fi off"
+msgstr "Slå trådløs av"
+
+#: ../panels/network/network-wifi.ui.h:60
+msgid "_Connect to Hidden Network…"
+msgstr "_Koble til skjult nettverk …"
+
+#: ../panels/network/network-wifi.ui.h:61
+msgid "_Turn On Wi-Fi Hotspot…"
+msgstr "Slå på _trådløst aksesspunkt …"
+
+#: ../panels/network/network-wifi.ui.h:62
+msgid "_Known Wi-Fi Networks"
+msgstr "_Kjente trådløse nettverk"
+
+#: ../panels/network/wifi.ui.h:1
+msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
+msgstr "Sjekk at du har et Wi-Fi-kort som er satt inn og slått på"
+
+#: ../panels/network/wifi.ui.h:2
+msgid "No Wi-Fi Adapter Found"
+msgstr "Fant ingen trådløse kort"
+
+#: ../panels/network/wifi.ui.h:3
+msgid "Airplane Mode"
+msgstr "Flymodus"
+
+#: ../panels/network/wifi.ui.h:4
+msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
+msgstr "Slår av Wi-Fi, blåtann og mobilt bredbånd"
+
+#: ../panels/network/wifi.ui.h:5
+msgid "Visible Networks"
+msgstr "Synlige nettverk"
+
+#: ../panels/network/wifi.ui.h:6
+msgid "NetworkManager needs to be running"
+msgstr "NetworkManager må kjøre"
+
 #. TRANSLATORS: AP type
 #: ../panels/network/panel-common.c:127
 msgid "Ad-hoc"
@@ -3426,12 +3407,12 @@ msgstr "ugyldig EAP-PEAP CA-sertifikat: ingen sertifikat oppgitt"
 
 #: ../panels/network/wireless-security/eap-method-peap.c:287
 #: ../panels/network/wireless-security/eap-method-ttls.c:336
-#: ../panels/network/wireless-security/wireless-security.c:439
+#: ../panels/network/wireless-security/wireless-security.c:441
 msgid "MD5"
 msgstr "MD5"
 
 #: ../panels/network/wireless-security/eap-method-peap.c:381
-#: ../panels/network/wireless-security/eap-method-tls.c:501
+#: ../panels/network/wireless-security/eap-method-tls.c:492
 #: ../panels/network/wireless-security/eap-method-ttls.c:430
 msgid "Choose a Certificate Authority certificate"
 msgstr "Velg et sertifikat fra en sertifikatutsteder"
@@ -3481,25 +3462,21 @@ msgstr "ugyldig EAP-TLS CA-sertifikat: %s"
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "ugyldig EAP-TLS CA-sertifikat: ingen sertifikat oppgitt"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:95
-msgid "invalid EAP-TLS password: missing"
-msgstr "ugyldig EAP-TLS-passord: mangler"
-
-#: ../panels/network/wireless-security/eap-method-tls.c:109
+#: ../panels/network/wireless-security/eap-method-tls.c:100
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "ugyldig EAP-TLS privat nøkkel: %s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:119
+#: ../panels/network/wireless-security/eap-method-tls.c:110
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "ugyldig EAP-TLS brukersertifikat: %s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:316
+#: ../panels/network/wireless-security/eap-method-tls.c:307
 msgid "Unencrypted private keys are insecure"
 msgstr "Ukrypterte private nøkler er usikre"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:319
+#: ../panels/network/wireless-security/eap-method-tls.c:310
 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 "
@@ -3513,11 +3490,11 @@ msgstr ""
 "\n"
 "Privat nøkkel kan passordbeskyttes med openssl."
 
-#: ../panels/network/wireless-security/eap-method-tls.c:495
+#: ../panels/network/wireless-security/eap-method-tls.c:486
 msgid "Choose your personal certificate"
 msgstr "Velg personlig sertifikat"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:507
+#: ../panels/network/wireless-security/eap-method-tls.c:498
 msgid "Choose your private key"
 msgstr "Velg privatnøkkel"
 
@@ -3566,23 +3543,23 @@ msgstr "CHAP"
 msgid "Unknown error validating 802.1X security"
 msgstr "Ukjent feil ved validering av 802.1x sikkerhet"
 
-#: ../panels/network/wireless-security/wireless-security.c:451
+#: ../panels/network/wireless-security/wireless-security.c:453
 msgid "TLS"
 msgstr "TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:475
+#: ../panels/network/wireless-security/wireless-security.c:477
 msgid "PWD"
 msgstr "PWD"
 
-#: ../panels/network/wireless-security/wireless-security.c:486
+#: ../panels/network/wireless-security/wireless-security.c:488
 msgid "FAST"
 msgstr "FAST"
 
-#: ../panels/network/wireless-security/wireless-security.c:497
+#: ../panels/network/wireless-security/wireless-security.c:499
 msgid "Tunneled TLS"
 msgstr "Tunnelert TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:508
+#: ../panels/network/wireless-security/wireless-security.c:510
 msgid "Protected EAP (PEAP)"
 msgstr "Beskyttet EAP (PEAP)"
 
@@ -3626,11 +3603,11 @@ msgstr ""
 
 #: ../panels/network/wireless-security/ws-wep-key.c:137
 msgid "invalid wep-key: passphrase must be non-empty"
-msgstr ""
+msgstr "ugyldig wep-nøkkel: passordfrasen kan ikke være tom"
 
 #: ../panels/network/wireless-security/ws-wep-key.c:139
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
-msgstr ""
+msgstr "ugyldig wep-nøkkel: passordfrasen må være kortere enn 64 tegn"
 
 #: ../panels/network/wireless-security/ws-wep-key.ui.h:1
 msgid "1 (Default)"
@@ -3735,7 +3712,7 @@ msgstr "Vars_linger på låseskjerm"
 
 #. List of applications.
 #: ../panels/notifications/notifications.ui.h:4
-#: ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1781
+#: ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1787
 msgid "Applications"
 msgstr "Programmer"
 
@@ -3746,19 +3723,19 @@ msgstr "Annen"
 
 #. translators: This is the title of the "Show Account" dialog. The
 #. * %s is the name of the provider. e.g., 'Google'.
-#: ../panels/online-accounts/cc-online-accounts-panel.c:580
+#: ../panels/online-accounts/cc-online-accounts-panel.c:603
 #, c-format
 msgid "%s Account"
 msgstr "%s-konto"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:872
+#: ../panels/online-accounts/cc-online-accounts-panel.c:895
 msgid "Error removing account"
 msgstr "Feil ved fjerning av konto"
 
 #. Translators: The %s is the username (eg., debarshi ray gmail com
 #. * or rishi).
 #.
-#: ../panels/online-accounts/cc-online-accounts-panel.c:937
+#: ../panels/online-accounts/cc-online-accounts-panel.c:960
 #, c-format
 msgid "<b>%s</b> removed"
 msgstr "<b>%s</b> fjernet"
@@ -3932,7 +3909,7 @@ msgstr "Datamaskin"
 
 #. TRANSLATORS: secondary battery, misc
 #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
-#: ../panels/power/cc-power-panel.c:2366
+#: ../panels/power/cc-power-panel.c:2356
 msgid "Battery"
 msgstr "Batteri"
 
@@ -3984,84 +3961,88 @@ msgstr "Når led_ig"
 msgid "Power Saving"
 msgstr "Strømsparing"
 
-#: ../panels/power/cc-power-panel.c:1716
+#: ../panels/power/cc-power-panel.c:1712
 msgid "_Screen brightness"
 msgstr "Lysstyrke for _skjerm"
 
-#: ../panels/power/cc-power-panel.c:1735
+#: ../panels/power/cc-power-panel.c:1731
 msgid "Automatic brightness"
 msgstr "Automatisk lysstyrke"
 
-#: ../panels/power/cc-power-panel.c:1755
+#: ../panels/power/cc-power-panel.c:1751
 msgid "_Keyboard brightness"
 msgstr "Lysstyr_ke for tastatur"
 
-#: ../panels/power/cc-power-panel.c:1765
+#: ../panels/power/cc-power-panel.c:1761
 msgid "_Dim screen when inactive"
 msgstr "_Demp skjermen når inaktiv"
 
-#: ../panels/power/cc-power-panel.c:1790
+#: ../panels/power/cc-power-panel.c:1786
 msgid "_Blank screen"
 msgstr "_Slå av skjerm"
 
-#: ../panels/power/cc-power-panel.c:1827
+#: ../panels/power/cc-power-panel.c:1823
 msgid "_Wi-Fi"
 msgstr "_Trådløs"
 
-#: ../panels/power/cc-power-panel.c:1832
+#: ../panels/power/cc-power-panel.c:1828
 msgid "Turn off Wi-Fi to save power."
 msgstr "Slå av Wi-Fi for å spare strøm."
 
-#: ../panels/power/cc-power-panel.c:1857
+#: ../panels/power/cc-power-panel.c:1853
 msgid "_Mobile broadband"
 msgstr "_Mobilt bredbånd"
 
-#: ../panels/power/cc-power-panel.c:1862
+#: ../panels/power/cc-power-panel.c:1858
 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
 msgstr "Slå av mobilt bredbånd (3G, 4G, LTE, etc.) for å spare strøm."
 
-#: ../panels/power/cc-power-panel.c:1907
+#: ../panels/power/cc-power-panel.c:1903
 msgid "_Bluetooth"
 msgstr "_Blåtann"
 
-#: ../panels/power/cc-power-panel.c:1970
+#: ../panels/power/cc-power-panel.c:1966
 msgid "When on battery power"
 msgstr "På batteristrøm"
 
-#: ../panels/power/cc-power-panel.c:1972
+#: ../panels/power/cc-power-panel.c:1968
 msgid "When plugged in"
 msgstr "Når den er koblet til strøm"
 
-#: ../panels/power/cc-power-panel.c:2067
+#: ../panels/power/cc-power-panel.c:2063
 msgid "Suspend"
 msgstr "Hvilemodus"
 
-#: ../panels/power/cc-power-panel.c:2068
+#: ../panels/power/cc-power-panel.c:2064
+msgid "Power Off"
+msgstr "Slå av"
+
+#: ../panels/power/cc-power-panel.c:2065
 msgid "Hibernate"
 msgstr "Dvalemodus"
 
-#: ../panels/power/cc-power-panel.c:2069
+#: ../panels/power/cc-power-panel.c:2066
 msgid "Nothing"
 msgstr "Ingenting"
 
 #. Frame header
-#: ../panels/power/cc-power-panel.c:2183
+#: ../panels/power/cc-power-panel.c:2180
 msgid "Suspend & Power Button"
 msgstr "Hvilemodus og strømknapp"
 
-#: ../panels/power/cc-power-panel.c:2226
+#: ../panels/power/cc-power-panel.c:2219
 msgid "_Automatic suspend"
 msgstr "_Automatisk hvilemodus"
 
-#: ../panels/power/cc-power-panel.c:2227
+#: ../panels/power/cc-power-panel.c:2220
 msgid "Automatic suspend"
 msgstr "Automatisk hvilemodus"
 
-#: ../panels/power/cc-power-panel.c:2294
+#: ../panels/power/cc-power-panel.c:2287
 msgid "_When the Power Button is pressed"
 msgstr "_Når strømknappen trykkes"
 
-#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:273
+#: ../panels/power/cc-power-panel.c:2406 ../shell/cc-window.c:247
 #: ../shell/panel-list.ui.h:1
 msgid "Devices"
 msgstr "Enheter"
@@ -4162,30 +4143,35 @@ msgstr " "
 msgid "Authenticate"
 msgstr "Autentiser"
 
+#: ../panels/printers/authentication-dialog.ui.h:4
+#: ../panels/printers/new-printer-dialog.ui.h:13
+msgid "Username"
+msgstr "Brukernavn"
+
 #: ../panels/printers/authentication-dialog.ui.h:6
 #: ../panels/printers/new-printer-dialog.ui.h:11
 msgid "Authentication Required"
 msgstr "Autentisering kreves"
 
 #. Translators: %s is the printer name
-#: ../panels/printers/cc-printers-panel.c:715
+#: ../panels/printers/cc-printers-panel.c:718
 #, c-format
 msgid "Printer “%s” has been deleted"
 msgstr "Skriver «%s» er slettet"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:899
+#: ../panels/printers/cc-printers-panel.c:909
 msgid "Failed to add new printer."
 msgstr "Klarte ikke å legge til ny skriver."
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:1208
+#: ../panels/printers/cc-printers-panel.c:1221
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Klarte ikke å laste brukergrensesnitt: %s"
 
 #: ../panels/printers/details-dialog.ui.h:2
-#: ../panels/printers/printer-entry.ui.h:8
+#: ../panels/printers/printer-entry.ui.h:9
 msgid "Location"
 msgstr "Plassering"
 
@@ -4263,6 +4249,13 @@ msgstr "Skriv inn en nettverksadresse, eller søk etter en skriver"
 msgid "Enter username and password to view printers on Print Server."
 msgstr "Oppgi brukernavn og passord for å se skrivere på utskriftstjener."
 
+#. Translators: This button triggers the printing of a test page.
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/options-dialog.ui.h:2
+#: ../panels/printers/pp-options-dialog.c:893
+msgid "Test Page"
+msgstr "Testside"
+
 #. Translators: This is the title of the dialog. %s is the printer name.
 #: ../panels/printers/pp-details-dialog.c:123
 #: ../panels/printers/pp-details-dialog.c:415
@@ -4431,11 +4424,6 @@ msgstr "Seriellport"
 msgid "Parallel Port"
 msgstr "Parallellport"
 
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/printers/pp-new-printer-dialog.c:1816
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
 #: ../panels/printers/pp-new-printer-dialog.c:1853
 #, c-format
@@ -4453,89 +4441,89 @@ msgstr "Adresse: %s"
 msgid "Server requires authentication"
 msgstr "Tjener krever autentisering"
 
-#: ../panels/printers/pp-options-dialog.c:81
+#: ../panels/printers/pp-options-dialog.c:83
 msgid "Two Sided"
 msgstr "Tosidig"
 
-#: ../panels/printers/pp-options-dialog.c:82
+#: ../panels/printers/pp-options-dialog.c:84
 msgid "Paper Type"
 msgstr "Papirtype"
 
-#: ../panels/printers/pp-options-dialog.c:83
+#: ../panels/printers/pp-options-dialog.c:85
 msgid "Paper Source"
 msgstr "Papirkilde"
 
-#: ../panels/printers/pp-options-dialog.c:84
+#: ../panels/printers/pp-options-dialog.c:86
 msgid "Output Tray"
 msgstr "Skuff"
 
-#: ../panels/printers/pp-options-dialog.c:86
+#: ../panels/printers/pp-options-dialog.c:88
 msgid "GhostScript pre-filtering"
 msgstr "Forhåndsfiltrering med GhostScript"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: ../panels/printers/pp-options-dialog.c:532
+#: ../panels/printers/pp-options-dialog.c:534
 msgid "Pages per side"
 msgstr "Sider per side"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: ../panels/printers/pp-options-dialog.c:544
+#: ../panels/printers/pp-options-dialog.c:546
 msgid "Two-sided"
 msgstr "Tosidig"
 
-#. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/printers/pp-options-dialog.c:556
-msgid "Orientation"
-msgstr "Orientering"
-
 #. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:653
+#: ../panels/printers/pp-options-dialog.c:655
 msgctxt "Printer Option Group"
 msgid "General"
 msgstr "Generelt"
 
 #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
-#: ../panels/printers/pp-options-dialog.c:656
+#: ../panels/printers/pp-options-dialog.c:658
 msgctxt "Printer Option Group"
 msgid "Page Setup"
 msgstr "Sideoppsett"
 
 #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, 
duplex unit, etc.)
-#: ../panels/printers/pp-options-dialog.c:659
+#: ../panels/printers/pp-options-dialog.c:661
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "Installerbare alternativer"
 
 #. Translators: "Job" tab contains settings for jobs
-#: ../panels/printers/pp-options-dialog.c:662
+#: ../panels/printers/pp-options-dialog.c:664
 msgctxt "Printer Option Group"
 msgid "Job"
 msgstr "Jobb"
 
 #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
-#: ../panels/printers/pp-options-dialog.c:665
+#: ../panels/printers/pp-options-dialog.c:667
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "Bildekvalitet"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: ../panels/printers/pp-options-dialog.c:668
+#: ../panels/printers/pp-options-dialog.c:670
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "Farge"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: ../panels/printers/pp-options-dialog.c:671
+#: ../panels/printers/pp-options-dialog.c:673
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "Fullføring"
 
 #. Translators: "Advanced" tab contains all others settings
-#: ../panels/printers/pp-options-dialog.c:674
+#: ../panels/printers/pp-options-dialog.c:676
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "Avansert"
 
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/pp-options-dialog.c:908
+msgid "Test page"
+msgstr "Testside"
+
 #. Translators: this is an option of "Paper Source"
 #: ../panels/printers/pp-ppd-option-widget.c:76
 #: ../panels/printers/pp-ppd-option-widget.c:78
@@ -4578,12 +4566,12 @@ msgid "Manufacturer"
 msgstr "Produsent"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: ../panels/printers/pp-printer-entry.c:573
+#: ../panels/printers/pp-printer-entry.c:577
 msgid "No Active Jobs"
 msgstr "Ingen aktive jobber"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: ../panels/printers/pp-printer-entry.c:578
+#: ../panels/printers/pp-printer-entry.c:582
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
@@ -4591,113 +4579,113 @@ msgstr[0] "%u jobb"
 msgstr[1] "%u jobber"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/pp-printer-entry.c:714
+#: ../panels/printers/pp-printer-entry.c:730
 msgid "Low on toner"
 msgstr "Lite toner"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/pp-printer-entry.c:716
+#: ../panels/printers/pp-printer-entry.c:732
 msgid "Out of toner"
 msgstr "Tom for toner"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/pp-printer-entry.c:719
+#: ../panels/printers/pp-printer-entry.c:735
 msgid "Low on developer"
 msgstr "Lite fremkaller"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/pp-printer-entry.c:722
+#: ../panels/printers/pp-printer-entry.c:738
 msgid "Out of developer"
 msgstr "Tom for fremkaller"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:724
+#: ../panels/printers/pp-printer-entry.c:740
 msgid "Low on a marker supply"
 msgstr "Lite farge"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:726
+#: ../panels/printers/pp-printer-entry.c:742
 msgid "Out of a marker supply"
 msgstr "Tom for farge"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/pp-printer-entry.c:728
+#: ../panels/printers/pp-printer-entry.c:744
 msgid "Open cover"
 msgstr "Åpent deksel"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/pp-printer-entry.c:730
+#: ../panels/printers/pp-printer-entry.c:746
 msgid "Open door"
 msgstr "Åpen dør"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/pp-printer-entry.c:732
+#: ../panels/printers/pp-printer-entry.c:748
 msgid "Low on paper"
 msgstr "Lite papir"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/pp-printer-entry.c:734
+#: ../panels/printers/pp-printer-entry.c:750
 msgid "Out of paper"
 msgstr "Tom for papir"
 
 #. Translators: The printer is offline
-#: ../panels/printers/pp-printer-entry.c:736
+#: ../panels/printers/pp-printer-entry.c:752
 msgctxt "printer state"
 msgid "Offline"
 msgstr "Frakoblet"
 
 #. Translators: Someone has stopped the Printer
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/pp-printer-entry.c:738
-#: ../panels/printers/pp-printer-entry.c:868
+#: ../panels/printers/pp-printer-entry.c:754
+#: ../panels/printers/pp-printer-entry.c:884
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "Stoppet"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/pp-printer-entry.c:740
+#: ../panels/printers/pp-printer-entry.c:756
 msgid "Waste receptacle almost full"
 msgstr "Søppelbeholderen er nesten full"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/pp-printer-entry.c:742
+#: ../panels/printers/pp-printer-entry.c:758
 msgid "Waste receptacle full"
 msgstr "Søppelbeholderen er full"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/pp-printer-entry.c:744
+#: ../panels/printers/pp-printer-entry.c:760
 msgid "The optical photo conductor is near end of life"
 msgstr ""
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/pp-printer-entry.c:746
+#: ../panels/printers/pp-printer-entry.c:762
 msgid "The optical photo conductor is no longer functioning"
 msgstr ""
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/pp-printer-entry.c:854
+#: ../panels/printers/pp-printer-entry.c:870
 msgctxt "printer state"
 msgid "Ready"
 msgstr "Klar"
 
 #. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/pp-printer-entry.c:859
+#: ../panels/printers/pp-printer-entry.c:875
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "Godtar ikke jobber"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/pp-printer-entry.c:864
+#: ../panels/printers/pp-printer-entry.c:880
 msgctxt "printer state"
 msgid "Processing"
 msgstr "Prosesserer"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: ../panels/printers/pp-printer-entry.c:888
+#: ../panels/printers/pp-printer-entry.c:904
 msgid "Clean print heads"
-msgstr ""
+msgstr "Rens utskriftshodene"
 
 #: ../panels/printers/printer-entry.ui.h:1
 msgid "Printing Options"
@@ -4707,34 +4695,35 @@ msgstr "Alternativer for utskrift"
 msgid "Printer Details"
 msgstr "Detaljer for skriver"
 
-#: ../panels/printers/printer-entry.ui.h:3
+#. Set this printer as default
+#: ../panels/printers/printer-entry.ui.h:4
 msgid "Use Printer by Default"
 msgstr "Bruk skriver som forvalgt"
 
 #. Translators: This button executes command which cleans print heads of the printer.
-#: ../panels/printers/printer-entry.ui.h:5
+#: ../panels/printers/printer-entry.ui.h:6
 msgid "Clean Print Heads"
-msgstr ""
+msgstr "Rens utskriftshodene"
 
-#: ../panels/printers/printer-entry.ui.h:6
+#: ../panels/printers/printer-entry.ui.h:7
 msgid "Remove Printer"
 msgstr "Fjern skriver"
 
-#: ../panels/printers/printer-entry.ui.h:7
+#: ../panels/printers/printer-entry.ui.h:8
 msgid "Model"
 msgstr "Modell"
 
-#: ../panels/printers/printer-entry.ui.h:9
+#: ../panels/printers/printer-entry.ui.h:10
 msgid "Ink Level"
 msgstr "Blekknivå"
 
 #. Translators: This is the message which follows the printer error.
-#: ../panels/printers/printer-entry.ui.h:11
+#: ../panels/printers/printer-entry.ui.h:12
 msgid "Please restart when the problem is resolved."
 msgstr "Vennligst start på nytt når problemet er løst."
 
 #. Translators: This is the button which restarts the printer.
-#: ../panels/printers/printer-entry.ui.h:13
+#: ../panels/printers/printer-entry.ui.h:14
 msgid "Restart"
 msgstr "Start på nytt"
 
@@ -5026,11 +5015,11 @@ msgctxt "Input Source"
 msgid "Other"
 msgstr "Annen"
 
-#: ../panels/region/cc-region-panel.c:866
+#: ../panels/region/cc-region-panel.c:881
 msgid "No input source selected"
 msgstr "Ingen inndatakilder valgt"
 
-#: ../panels/region/cc-region-panel.c:1758
+#: ../panels/region/cc-region-panel.c:1773
 msgid "Login _Screen"
 msgstr "Påloggings_skjerm"
 
@@ -5130,24 +5119,22 @@ msgid "Left+Right Alt"
 msgstr "Venstre+høyre Alt"
 
 #: ../panels/region/region.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
-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/region.ui.h:2
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Restart Now"
-msgstr "Start på nytt nå"
-
-#: ../panels/region/region.ui.h:3
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "_Language"
 msgstr "_Språk"
 
-#: ../panels/region/region.ui.h:4
+#: ../panels/region/region.ui.h:2
 msgid "English (United Kingdom)"
 msgstr "Engelsk (Storbritannia)"
 
+#: ../panels/region/region.ui.h:3
+msgid "Restart the session for changes to take effect"
+msgstr "Start økten på nytt for at endringene skal tre i kraft"
+
+#: ../panels/region/region.ui.h:4
+msgid "Restart…"
+msgstr "Start på nytt …"
+
 #: ../panels/region/region.ui.h:5
 msgid "_Formats"
 msgstr "_Formater"
@@ -5193,11 +5180,11 @@ 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:634
+#: ../panels/search/cc-search-locations-dialog.c:639
 msgid "Select Location"
 msgstr "Velg lokasjon"
 
-#: ../panels/search/cc-search-locations-dialog.c:638
+#: ../panels/search/cc-search-locations-dialog.c:643
 msgid "_OK"
 msgstr "_OK"
 
@@ -5254,32 +5241,32 @@ msgstr "Brukervalg"
 msgid "No networks selected for sharing"
 msgstr "Ingen nettverk valgt for deling"
 
-#: ../panels/sharing/cc-sharing-panel.c:266
+#: ../panels/sharing/cc-sharing-panel.c:273
 msgctxt "service is enabled"
 msgid "On"
 msgstr "På"
 
-#: ../panels/sharing/cc-sharing-panel.c:268
-#: ../panels/sharing/cc-sharing-panel.c:295
+#: ../panels/sharing/cc-sharing-panel.c:275
+#: ../panels/sharing/cc-sharing-panel.c:302
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "Av"
 
-#: ../panels/sharing/cc-sharing-panel.c:298
+#: ../panels/sharing/cc-sharing-panel.c:305
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "Slått på"
 
-#: ../panels/sharing/cc-sharing-panel.c:301
+#: ../panels/sharing/cc-sharing-panel.c:308
 msgctxt "service is active"
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../panels/sharing/cc-sharing-panel.c:372
+#: ../panels/sharing/cc-sharing-panel.c:379
 msgid "Choose a Folder"
 msgstr "Velg en mappe"
 
-#: ../panels/sharing/cc-sharing-panel.c:683
+#: ../panels/sharing/cc-sharing-panel.c:690
 #, c-format
 msgid ""
 "Personal File Sharing allows you to share your Public folder with others on "
@@ -5288,7 +5275,7 @@ msgstr ""
 "Personlig fildeling lar deg dele offentlig mappe med andre på gjeldende "
 "nettverk ved å bruke: <a href=\"dav://%s\"dav://%s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:685
+#: ../panels/sharing/cc-sharing-panel.c:692
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
@@ -5299,7 +5286,7 @@ msgstr ""
 "Secure Shell-kommandoen:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:687
+#: ../panels/sharing/cc-sharing-panel.c:694
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
@@ -5308,11 +5295,11 @@ msgstr ""
 "Skjermdeling lar eksterne brukere se eller kontrollere din skjerm ved å "
 "koble til <a href=\"vnc://%s\">vnc://%s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:799
+#: ../panels/sharing/cc-sharing-panel.c:806
 msgid "Copy"
 msgstr "Kopier"
 
-#: ../panels/sharing/cc-sharing-panel.c:1125
+#: ../panels/sharing/cc-sharing-panel.c:1233
 msgid "Sharing"
 msgstr "Deling"
 
@@ -5546,56 +5533,56 @@ msgstr "_Test høyttalere"
 msgid "Peak detect"
 msgstr "Bestem høyeste nivå"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1512
+#: ../panels/sound/gvc-mixer-dialog.c:1518
 msgid "Device"
 msgstr "Enhet"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1575
+#: ../panels/sound/gvc-mixer-dialog.c:1581
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "Høyttalertest for %s"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1631
+#: ../panels/sound/gvc-mixer-dialog.c:1637
 msgid "_Output volume:"
 msgstr "_Utgangsvolum:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1645
+#: ../panels/sound/gvc-mixer-dialog.c:1651
 msgid "Output"
 msgstr "Utgang"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1650
+#: ../panels/sound/gvc-mixer-dialog.c:1656
 msgid "C_hoose a device for sound output:"
 msgstr "_Velg en enhet som lydutgang:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1672
+#: ../panels/sound/gvc-mixer-dialog.c:1678
 msgid "Settings for the selected device:"
 msgstr "Innstillinger for valgt enhet:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1683
+#: ../panels/sound/gvc-mixer-dialog.c:1689
 msgid "Input"
 msgstr "Inngang"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1690
+#: ../panels/sound/gvc-mixer-dialog.c:1696
 msgid "_Input volume:"
 msgstr "_Inngangsvolum:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1711
+#: ../panels/sound/gvc-mixer-dialog.c:1717
 msgid "Input level:"
 msgstr "Inngangsnivå:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1737
+#: ../panels/sound/gvc-mixer-dialog.c:1743
 msgid "C_hoose a device for sound input:"
 msgstr "_Velg en enhet som lydinngang:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1761
+#: ../panels/sound/gvc-mixer-dialog.c:1767
 msgid "Sound Effects"
 msgstr "Lydeffekter"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1768
+#: ../panels/sound/gvc-mixer-dialog.c:1774
 msgid "_Alert volume:"
 msgstr "V_arselvolum:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1785
+#: ../panels/sound/gvc-mixer-dialog.c:1791
 msgid "No application is currently playing or recording audio."
 msgstr "Ingen programmer spiller av eller tar opp lyd."
 
@@ -5693,7 +5680,10 @@ msgstr "Gjør det lettere å se, høre, skrive og peke og klikke"
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
 "AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
-msgstr 
"Tastatur;Mus;a11y;Tilgjengelighet;Kontrast;Zoom;Skjerm;Leser;tekst;skrift;størrelse;AccessX;Klebrige;Taster;Trege;Sprett;Mus;Dobbelt;klikk;Pause;Assister;Gjenta;Blink;"
+msgstr ""
+"Tastatur;Mus;a11y;Tilgjengelighet;Kontrast;Zoom;Skjerm;Leser;tekst;skrift;"
+"størrelse;AccessX;Klebrige;Taster;Trege;Sprett;Mus;Dobbelt;klikk;Pause;"
+"Assister;Gjenta;Blink;"
 
 #: ../panels/universal-access/uap.ui.h:1
 msgid "_Always Show Universal Access Menu"
@@ -5779,7 +5769,7 @@ msgstr "Markørstørrelse"
 #: ../panels/universal-access/uap.ui.h:23
 msgid ""
 "Cursor size can be combined with zoom to make it easier to see the cursor."
-msgstr ""
+msgstr "Markørstørrelsen kan kombineres med zoom for å gjøre det lettere å se markøren."
 
 #: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
@@ -6370,6 +6360,14 @@ msgstr "Velg passord nå"
 msgid "_Add User…"
 msgstr "_Legg til bruker …"
 
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+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/user-accounts/data/user-accounts-dialog.ui.h:3
+msgid "Restart Now"
+msgstr "Start på nytt nå"
+
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "A_utomatic Login"
 msgstr "A_utomatisk pålogging"
@@ -6487,7 +6485,9 @@ msgctxt "Password hint"
 msgid ""
 "Password needs to be longer. Try to add more letters, numbers and "
 "punctuation."
-msgstr "Passordet må være lenger. Prøv å bruke en blanding av bokstaver, tall og tegnsetting."
+msgstr ""
+"Passordet må være lenger. Prøv å bruke en blanding av bokstaver, tall og "
+"tegnsetting."
 
 #: ../panels/user-accounts/pw-utils.c:117
 msgctxt "Password hint"
@@ -6498,7 +6498,9 @@ msgstr "Bland store og små bokstaver, og prøv å bruke et tall eller to."
 msgctxt "Password hint"
 msgid ""
 "Adding more letters, numbers and punctuation will make the password stronger."
-msgstr "Passordet blir sterkere hvis du legger til flere bokstaver, tall og spesialtegn."
+msgstr ""
+"Passordet blir sterkere hvis du legger til flere bokstaver, tall og "
+"spesialtegn."
 
 #: ../panels/user-accounts/run-passwd.c:422
 msgid "Authentication failed"
@@ -6975,7 +6977,7 @@ msgstr "Dette brukes til å gi hjemmemappen et navn, og kan ikke endres."
 msgid "Map Buttons"
 msgstr "Tilegne knapper"
 
-#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:505
+#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:547
 #: ../panels/wacom/gnome-wacom-properties.ui.h:5
 msgid "_Close"
 msgstr "_Lukk"
@@ -7048,7 +7050,7 @@ msgstr "Tilegne til en enkelt skjerm"
 msgid "%d of %d"
 msgstr "%d av %d"
 
-#: ../panels/wacom/cc-wacom-page.c:502
+#: ../panels/wacom/cc-wacom-page.c:544
 msgid "Display Mapping"
 msgstr "Vis kobling"
 
@@ -7192,11 +7194,27 @@ msgstr "Følelse av trykk på tuppen"
 msgid "page 3"
 msgstr "side 3"
 
-#: ../shell/alt/cc-window.c:766 ../shell/cc-window.c:53
-#: ../shell/cc-window.c:1484
+#: ../shell/alt/cc-window.c:53 ../shell/alt/cc-window.c:1484
+#: ../shell/cc-window.c:758
 msgid "All Settings"
 msgstr "Alle innstillinger"
 
+#. Add categories
+#: ../shell/alt/cc-window.c:875
+msgctxt "category"
+msgid "Personal"
+msgstr "Personlig"
+
+#: ../shell/alt/cc-window.c:876
+msgctxt "category"
+msgid "Hardware"
+msgstr "Maskinvare"
+
+#: ../shell/alt/cc-window.c:877
+msgctxt "category"
+msgid "System"
+msgstr "System"
+
 #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
 msgid "GNOME Control Center"
 msgstr "GNOME kontrollsenter"
@@ -7253,22 +7271,6 @@ msgstr "Hjelp"
 msgid "Quit"
 msgstr "Avslutt"
 
-#. Add categories
-#: ../shell/cc-window.c:875
-msgctxt "category"
-msgid "Personal"
-msgstr "Personlig"
-
-#: ../shell/cc-window.c:876
-msgctxt "category"
-msgid "Hardware"
-msgstr "Maskinvare"
-
-#: ../shell/cc-window.c:877
-msgctxt "category"
-msgid "System"
-msgstr "System"
-
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
 msgstr "Brukervalg;Innstillinger;"



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