diff --git a/po/nb.po b/po/nb.po
index 0135f15d8..df71e6087 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 3.9.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-24 08:16+0200\n"
-"PO-Revision-Date: 2013-09-24 08:17+0200\n"
+"POT-Creation-Date: 2013-10-20 01:03+0200\n"
+"PO-Revision-Date: 2013-10-20 01:04+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@@ -63,7 +63,7 @@ msgid "Span"
 msgstr "Strekk"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:293
+#: ../panels/background/cc-background-chooser-dialog.c:292
 msgid "Select Background"
 msgstr "Velg bakgrunn"
 
@@ -84,32 +84,32 @@ msgid "Flickr"
 msgstr "Flickr"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:393
+#: ../panels/background/cc-background-chooser-dialog.c:385
 msgid "No Pictures Found"
 msgstr "Fant ingen bilder"
 
 #. 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:408
+#: ../panels/background/cc-background-chooser-dialog.c:400
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr "Du kan legge til bilder i din %s-mappe så vil de vises her"
 
-#: ../panels/background/cc-background-chooser-dialog.c:436
+#: ../panels/background/cc-background-chooser-dialog.c:428
 #: ../panels/bluetooth/cc-bluetooth-panel.c:640
-#: ../panels/color/cc-color-panel.c:220 ../panels/color/cc-color-panel.c:967
-#: ../panels/display/cc-display-panel.c:1495
-#: ../panels/display/cc-display-panel.c:1910
+#: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
+#: ../panels/display/cc-display-panel.c:1509
+#: ../panels/display/cc-display-panel.c:1924
 #: ../panels/network/connection-editor/vpn-helpers.c:245
 #: ../panels/network/connection-editor/vpn-helpers.c:374
-#: ../panels/network/net-device-wifi.c:1201
-#: ../panels/network/net-device-wifi.c:1407
+#: ../panels/network/net-device-wifi.c:1194
+#: ../panels/network/net-device-wifi.c:1402
 #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
 #: ../panels/printers/cc-printers-panel.c:1946
 #: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:467
+#: ../panels/privacy/cc-privacy-panel.c:470
 #: ../panels/search/cc-search-locations-dialog.c:682
-#: ../panels/sharing/cc-sharing-panel.c:421
+#: ../panels/sharing/cc-sharing-panel.c:435
 #: ../panels/user-accounts/um-fingerprint-dialog.c:269
 #: ../panels/user-accounts/um-photo-dialog.c:96
 #: ../panels/user-accounts/um-photo-dialog.c:221
@@ -117,9 +117,8 @@ msgstr "Du kan legge til bilder i din %s-mappe så vil de vises her"
 msgid "_Cancel"
 msgstr "A_vbryt"
 
-#: ../panels/background/cc-background-chooser-dialog.c:437
+#: ../panels/background/cc-background-chooser-dialog.c:429
 #: ../panels/printers/ppd-selection-dialog.ui.h:3
-#: ../panels/user-accounts/data/photo-dialog.ui.h:9
 #: ../panels/user-accounts/um-photo-dialog.c:98
 msgid "Select"
 msgstr "Velg"
@@ -139,7 +138,7 @@ msgstr "%d x %d"
 msgid "No Desktop Background"
 msgstr "Ingen skrivebordsbakgrunn"
 
-#: ../panels/background/cc-background-panel.c:492
+#: ../panels/background/cc-background-panel.c:493
 msgid "Current background"
 msgstr "Nåværende bakgrunn"
 
@@ -156,7 +155,7 @@ msgstr "Bakgrunn;Skjerm;Skrivebord;"
 msgid "Set Up New Device"
 msgstr "Sett opp ny enhet"
 
-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
+#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
 msgid "Remove Device"
 msgstr "Fjern enhet"
 
@@ -267,14 +266,14 @@ 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
+#: ../panels/color/cc-color-calibrate.c:361
 msgid "Place your calibration device over the square and press 'Start'"
 msgstr "Plasser kalibreringsenheten over firkanten og trykk «Start»"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:366
+#: ../panels/color/cc-color-calibrate.c:367
 msgid ""
 "Move your calibration device to the calibrate position and press 'Continue'"
 msgstr "Flytt kalibreringsenheten til kalibreringsposisjon og trykk «Fortsett»"
@@ -282,7 +281,7 @@ msgstr "Flytt kalibreringsenheten til kalibreringsposisjon og trykk «Fortsett»
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:372
+#: ../panels/color/cc-color-calibrate.c:373
 msgid ""
 "Move your calibration device to the surface position and press 'Continue'"
 msgstr "Flytt kalibreringsenheten til overflateposisjon og trykk «Fortsett»"
@@ -290,54 +289,54 @@ msgstr "Flytt kalibreringsenheten til overflateposisjon og trykk «Fortsett»"
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
 #. * sample widget and shut the lid.
-#: ../panels/color/cc-color-calibrate.c:378
+#: ../panels/color/cc-color-calibrate.c:379
 msgid "Shut the laptop lid"
 msgstr "Lukk lokket på bærbar"
 
 #. TRANSLATORS: We suck, the calibation failed and we have no
 #. * good idea why or any suggestions
-#: ../panels/color/cc-color-calibrate.c:409
+#: ../panels/color/cc-color-calibrate.c:410
 msgid "An internal error occurred that could not be recovered."
 msgstr "En intern feil oppsto som det ikke er mulig å rette opp."
 
 #. TRANSLATORS: Some required-at-runtime tools were not
 #. * installed, which should only affect insane distros
-#: ../panels/color/cc-color-calibrate.c:414
+#: ../panels/color/cc-color-calibrate.c:415
 msgid "Tools required for calibration are not installed."
 msgstr "Verktøy som kreves for kalibrering er ikke installert."
 
 #. TRANSLATORS: The profile failed for some reason
-#: ../panels/color/cc-color-calibrate.c:420
+#: ../panels/color/cc-color-calibrate.c:421
 msgid "The profile could not be generated."
 msgstr "Profilen kunne ikke genereres."
 
 #. TRANSLATORS: The user specified a whitepoint that was
 #. * unobtainable with the hardware they've got -- see
 #. * https://en.wikipedia.org/wiki/White_point for details
-#: ../panels/color/cc-color-calibrate.c:426
+#: ../panels/color/cc-color-calibrate.c:427
 msgid "The target whitepoint was not obtainable."
 msgstr "Hvitpunkt for mål kunne ikke hentes."
 
 #. TRANSLATORS: the display calibration process is finished
-#: ../panels/color/cc-color-calibrate.c:466
+#: ../panels/color/cc-color-calibrate.c:467
 msgid "Complete!"
 msgstr "Fullført"
 
 #. TRANSLATORS: the display calibration failed, and we also show
 #. * the translated (or untranslated) error string after this
-#: ../panels/color/cc-color-calibrate.c:474
+#: ../panels/color/cc-color-calibrate.c:475
 msgid "Calibration failed!"
 msgstr "Kalibrering feilet!"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
-#: ../panels/color/cc-color-calibrate.c:481
+#: ../panels/color/cc-color-calibrate.c:482
 msgid "You can remove the calibration device."
 msgstr "Du kan fjerne kalibreringsenheten."
 
 #. TRANSLATORS: The user has to be careful not to knock the
 #. * display off the screen (although we do cope if this is
 #. * detected early enough)
-#: ../panels/color/cc-color-calibrate.c:552
+#: ../panels/color/cc-color-calibrate.c:553
 msgid "Do not disturb the calibration device while in progress"
 msgstr "Ikke forstyrr kalibreringsenheten mens kalibrering pågår"
 
@@ -399,48 +398,48 @@ 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:135
+#: ../panels/color/cc-color-panel.c:137
 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:143
+#: ../panels/color/cc-color-panel.c:145
 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:150
+#: ../panels/color/cc-color-panel.c:152
 msgid "Test profile: "
 msgstr "Testprofil:"
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:218
+#: ../panels/color/cc-color-panel.c:219
 msgid "Select ICC Profile File"
 msgstr "Velg fil for ICC-profil"
 
-#: ../panels/color/cc-color-panel.c:221
+#: ../panels/color/cc-color-panel.c:222
 msgid "_Import"
 msgstr "_Importer"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:232
+#: ../panels/color/cc-color-panel.c:233
 msgid "Supported ICC profiles"
 msgstr "Støttede ICC-profiler"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:239
+#: ../panels/color/cc-color-panel.c:240
 #: ../panels/network/wireless-security/eap-method-fast.c:410
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../panels/color/cc-color-panel.c:586
+#: ../panels/color/cc-color-panel.c:579
 msgid "Screen"
 msgstr "Skjerm"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: ../panels/color/cc-color-panel.c:912
+#: ../panels/color/cc-color-panel.c:903
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "Klarte ikke å laste opp fil: %s"
@@ -448,39 +447,39 @@ msgstr "Klarte ikke å laste opp fil: %s"
 #. TRANSLATORS: these are instructions on how to recover
 #. * the ICC profile on the native operating system and are
 #. * only shown when the user uses a LiveCD to calibrate
-#: ../panels/color/cc-color-panel.c:926
+#: ../panels/color/cc-color-panel.c:917
 msgid "The profile has been uploaded to:"
 msgstr "Profilen ble lastet opp til:"
 
-#: ../panels/color/cc-color-panel.c:928
+#: ../panels/color/cc-color-panel.c:919
 msgid "Write down this URL."
 msgstr "Skriv ned denne URLen."
 
-#: ../panels/color/cc-color-panel.c:929
+#: ../panels/color/cc-color-panel.c:920
 msgid "Restart this computer and boot your normal operating system."
 msgstr "Start denne datamaskinen på nytt og start ditt normale operativsystem."
 
-#: ../panels/color/cc-color-panel.c:930
+#: ../panels/color/cc-color-panel.c:921
 msgid "Type the URL into your browser to download and install the profile."
 msgstr "Skriv URLen inn i nettleseren for å laste ned og installere profilen."
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: ../panels/color/cc-color-panel.c:964
+#: ../panels/color/cc-color-panel.c:955
 msgid "Save Profile"
 msgstr "Lagre profil"
 
-#: ../panels/color/cc-color-panel.c:968
+#: ../panels/color/cc-color-panel.c:959
 #: ../panels/network/connection-editor/vpn-helpers.c:375
 msgid "_Save"
 msgstr "_Lagre"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:1328
+#: ../panels/color/cc-color-panel.c:1315
 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:1343 ../panels/color/cc-color-panel.c:1367
+#: ../panels/color/cc-color-panel.c:1330 ../panels/color/cc-color-panel.c:1354
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
@@ -489,12 +488,12 @@ msgstr ""
 "tilkoblet."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1377
+#: ../panels/color/cc-color-panel.c:1364
 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:1388
+#: ../panels/color/cc-color-panel.c:1375
 msgid "The device type is not currently supported."
 msgstr "Enhetstypen er ikke støttet."
 
@@ -581,7 +580,6 @@ 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:1470
 msgid "Cancel"
 msgstr "Avbryt"
@@ -602,7 +600,7 @@ msgid "Done"
 msgstr "Ferdig"
 
 #. Timeout parameters
-#. 5000 = 5 sec
+#. 15000 = 15 sec
 #. 750 = 0.75 sec
 #. Text printed on screen
 #: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
@@ -750,166 +748,146 @@ msgstr ""
 "\"\">Vis detaljer.</a>"
 
 #: ../panels/color/color.ui.h:30
-msgid "Device type:"
-msgstr "Type enhet:"
-
-#: ../panels/color/color.ui.h:31
-msgid "Manufacturer:"
-msgstr "Produsent:"
-
-#: ../panels/color/color.ui.h:32
-msgid "Model:"
-msgstr "Modell:"
-
-#: ../panels/color/color.ui.h:33
-msgid ""
-"Image files can be dragged on this window to auto-complete the above fields."
-msgstr ""
-"Bildefiler kan dras til dette vinduet for å fullføre ovenstående felt "
-"automatisk."
-
-#: ../panels/color/color.ui.h:34
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-msgid "Color"
-msgstr "Farge"
-
-#: ../panels/color/color.ui.h:35
 msgid "Each device needs an up to date color profile to be color managed."
 msgstr "Hver enhet må ha en oppdatert fargeprofil for å bli fargestyrt."
 
-#: ../panels/color/color.ui.h:36
+#: ../panels/color/color.ui.h:31
 msgid "Learn more"
 msgstr "Lær mer"
 
-#: ../panels/color/color.ui.h:37
+#: ../panels/color/color.ui.h:32
 msgid "Learn more about color management"
 msgstr "Lær mer om fargehåndtering"
 
-#: ../panels/color/color.ui.h:38
+#: ../panels/color/color.ui.h:33
 msgid "Set for all users"
 msgstr "Sett for alle brukere"
 
-#: ../panels/color/color.ui.h:39
+#: ../panels/color/color.ui.h:34
 msgid "Set this profile for all users on this computer"
 msgstr "Angi denne profilen for alle brukere på denne datamaskinen"
 
-#: ../panels/color/color.ui.h:40
+#: ../panels/color/color.ui.h:35
 msgid "Enable"
 msgstr "Slått på"
 
-#: ../panels/color/color.ui.h:41
+#: ../panels/color/color.ui.h:36
 msgid "Add profile"
 msgstr "Legg til profil:"
 
-#: ../panels/color/color.ui.h:42
+#: ../panels/color/color.ui.h:37
 #: ../panels/wacom/gnome-wacom-properties.ui.h:10
 msgid "Calibrate…"
 msgstr "Kalibrer …"
 
-#: ../panels/color/color.ui.h:43
+#: ../panels/color/color.ui.h:38
 msgid "Calibrate the device"
 msgstr "Kalibrer enheten"
 
-#: ../panels/color/color.ui.h:44
+#: ../panels/color/color.ui.h:39
 msgid "Remove profile"
 msgstr "Fjern profil"
 
-#: ../panels/color/color.ui.h:45
+#: ../panels/color/color.ui.h:40
 msgid "View details"
 msgstr "Vis detaljer"
 
-#: ../panels/color/color.ui.h:46
+#: ../panels/color/color.ui.h:41
 msgid "Unable to detect any devices that can be color managed"
 msgstr "Kan ikke finne noen enheter som støtter fargehåndtering"
 
-#: ../panels/color/color.ui.h:47
+#: ../panels/color/color.ui.h:42
 msgid "LCD"
 msgstr "LCD"
 
-#: ../panels/color/color.ui.h:48
+#: ../panels/color/color.ui.h:43
 msgid "LED"
 msgstr "LED"
 
-#: ../panels/color/color.ui.h:49
+#: ../panels/color/color.ui.h:44
 msgid "CRT"
 msgstr "CRT"
 
-#: ../panels/color/color.ui.h:50
+#: ../panels/color/color.ui.h:45
 msgid "Projector"
 msgstr "Prosjektor"
 
-#: ../panels/color/color.ui.h:51
+#: ../panels/color/color.ui.h:46
 msgid "Plasma"
 msgstr "Plasma"
 
-#: ../panels/color/color.ui.h:52
+#: ../panels/color/color.ui.h:47
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (CCFL-baklys)"
 
-#: ../panels/color/color.ui.h:53
+#: ../panels/color/color.ui.h:48
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (RGB LED-baklys)"
 
-#: ../panels/color/color.ui.h:54
+#: ../panels/color/color.ui.h:49
 msgid "LCD (white LED backlight)"
 msgstr "LCD (hvitt LED-baklys)"
 
-#: ../panels/color/color.ui.h:55
+#: ../panels/color/color.ui.h:50
 msgid "Wide gamut LCD (CCFL backlight)"
 msgstr "Bred gamut LCD (CCFL-baklys)"
 
-#: ../panels/color/color.ui.h:56
+#: ../panels/color/color.ui.h:51
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "Bred gamut LCD (RGB LED-baklys)"
 
-#: ../panels/color/color.ui.h:57
+#: ../panels/color/color.ui.h:52
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "Høy"
 
-#: ../panels/color/color.ui.h:58
+#: ../panels/color/color.ui.h:53
 msgid "40 minutes"
 msgstr "40 minutter"
 
-#: ../panels/color/color.ui.h:59
+#: ../panels/color/color.ui.h:54
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "Middels"
 
-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:4
+#: ../panels/color/color.ui.h:55 ../panels/power/power.ui.h:4
 #: ../panels/privacy/privacy.ui.h:7
 msgid "30 minutes"
 msgstr "30 minutter"
 
-#: ../panels/color/color.ui.h:61
+#: ../panels/color/color.ui.h:56
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "Lav"
 
-#: ../panels/color/color.ui.h:62 ../panels/power/power.ui.h:3
+#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:3
 msgid "15 minutes"
 msgstr "15 minutter"
 
-#: ../panels/color/color.ui.h:63
+#: ../panels/color/color.ui.h:58
 msgid "Native to display"
 msgstr "Skjermens egen"
 
-#: ../panels/color/color.ui.h:64
+#: ../panels/color/color.ui.h:59
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (Utskrift og trykking)"
 
-#: ../panels/color/color.ui.h:65
+#: ../panels/color/color.ui.h:60
 msgid "D55"
 msgstr "D55"
 
-#: ../panels/color/color.ui.h:66
+#: ../panels/color/color.ui.h:61
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (fotografi og grafikk)"
 
-#: ../panels/color/color.ui.h:67
+#: ../panels/color/color.ui.h:62
 msgid "D75"
 msgstr "D75"
 
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+msgid "Color"
+msgstr "Farge"
+
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
 msgid ""
 "Calibrate the color of your devices, such as displays, cameras or printers"
@@ -961,33 +939,33 @@ msgid "Language"
 msgstr "Språk"
 
 #: ../panels/common/language-chooser.ui.h:2
-#: ../panels/mouse/cc-mouse-panel.c:120 ../panels/region/format-chooser.ui.h:2
+#: ../panels/mouse/cc-mouse-panel.c:111 ../panels/region/format-chooser.ui.h:2
 msgid "_Done"
 msgstr "Fer_dig"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:352
+#: ../panels/datetime/cc-datetime-panel.c:363
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%B %e %Y, %a %H.%M"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:357
+#: ../panels/datetime/cc-datetime-panel.c:368
 msgid "%e %B %Y, %R"
 msgstr "%B %e %Y, %R"
 
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: ../panels/datetime/cc-datetime-panel.c:573
+#: ../panels/datetime/cc-datetime-panel.c:584
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:578
+#: ../panels/datetime/cc-datetime-panel.c:589
 msgid "%l:%M %p"
 msgstr "%H.%M"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:583
+#: ../panels/datetime/cc-datetime-panel.c:594
 msgid "%R"
 msgstr "%R"
 
@@ -1126,144 +1104,111 @@ 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:473
+#: ../panels/display/cc-display-panel.c:485
 msgid "Lid Closed"
 msgstr "Lokk lukket"
 
 #. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:476
+#: ../panels/display/cc-display-panel.c:488
 msgid "Mirrored"
 msgstr "Speilet"
 
-#: ../panels/display/cc-display-panel.c:478
-#: ../panels/display/cc-display-panel.c:2043
-#: ../panels/display/display-capplet.ui.h:1
+#: ../panels/display/cc-display-panel.c:490
+#: ../panels/display/cc-display-panel.c:2057
 msgid "Primary"
 msgstr "Primær"
 
-#: ../panels/display/cc-display-panel.c:480
+#: ../panels/display/cc-display-panel.c:492
 #: ../panels/notifications/cc-notifications-panel.c:205
-#: ../panels/power/cc-power-panel.c:1727 ../panels/power/cc-power-panel.c:1738
-#: ../panels/privacy/cc-privacy-panel.c:77
-#: ../panels/privacy/cc-privacy-panel.c:117
-#: ../panels/universal-access/cc-ua-panel.c:253
-#: ../panels/universal-access/cc-ua-panel.c:610
-#: ../panels/universal-access/cc-ua-panel.c:736
+#: ../panels/power/cc-power-panel.c:1769 ../panels/power/cc-power-panel.c:1780
+#: ../panels/privacy/cc-privacy-panel.c:80
+#: ../panels/privacy/cc-privacy-panel.c:120
+#: ../panels/universal-access/cc-ua-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:597
+#: ../panels/universal-access/cc-ua-panel.c:722
 #: ../panels/universal-access/uap.ui.h:6
 msgid "Off"
 msgstr "Av"
 
-#: ../panels/display/cc-display-panel.c:483
+#: ../panels/display/cc-display-panel.c:495
 msgid "Secondary"
 msgstr "Sekundær"
 
-#: ../panels/display/cc-display-panel.c:1491
+#: ../panels/display/cc-display-panel.c:1505
 msgid "Arrange Combined Displays"
 msgstr "Organiser sammenslåtte skjermer"
 
-#: ../panels/display/cc-display-panel.c:1497
-#: ../panels/display/cc-display-panel.c:1913
+#: ../panels/display/cc-display-panel.c:1511
+#: ../panels/display/cc-display-panel.c:1927
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
 msgid "_Apply"
 msgstr "_Bruk"
 
-#: ../panels/display/cc-display-panel.c:1518
+#: ../panels/display/cc-display-panel.c:1532
 msgid "Drag displays to rearrange them"
 msgstr "Dra skjermer for å omorganisere dem"
 
 #. size
-#: ../panels/display/cc-display-panel.c:1977
+#: ../panels/display/cc-display-panel.c:1991
 msgid "Size"
 msgstr "Størrelse"
 
 #. aspect ratio
-#: ../panels/display/cc-display-panel.c:1992
-#: ../panels/display/display-capplet.ui.h:12
+#: ../panels/display/cc-display-panel.c:2006
 msgid "Aspect Ratio"
 msgstr "Høyde-/breddeforhold"
 
-#: ../panels/display/cc-display-panel.c:2013
-#: ../panels/display/display-capplet.ui.h:13
+#: ../panels/display/cc-display-panel.c:2027
 #: ../panels/printers/pp-options-dialog.c:86
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: ../panels/display/cc-display-panel.c:2044
-#: ../panels/display/display-capplet.ui.h:2
+#: ../panels/display/cc-display-panel.c:2058
 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:2050
+#: ../panels/display/cc-display-panel.c:2064
 msgid "Secondary Display"
 msgstr "Sekundær skjerm"
 
-#: ../panels/display/cc-display-panel.c:2051
+#: ../panels/display/cc-display-panel.c:2065
 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:2058
-#: ../panels/display/display-capplet.ui.h:3
+#: ../panels/display/cc-display-panel.c:2072
 msgid "Presentation"
 msgstr "Presentasjon"
 
-#: ../panels/display/cc-display-panel.c:2059
-#: ../panels/display/display-capplet.ui.h:4
+#: ../panels/display/cc-display-panel.c:2073
 msgid "Show slideshows and media only"
 msgstr "Vis kun lysbildeserier og medier"
 
 #. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2064
-#: ../panels/display/display-capplet.ui.h:5
+#: ../panels/display/cc-display-panel.c:2078
 msgid "Mirror"
 msgstr "Speil"
 
-#: ../panels/display/cc-display-panel.c:2065
+#: ../panels/display/cc-display-panel.c:2079
 msgid "Show your existing view on both displays"
 msgstr "Vis eksisterende visning på begge skjermer"
 
-#: ../panels/display/cc-display-panel.c:2071
-#: ../panels/display/display-capplet.ui.h:9
+#: ../panels/display/cc-display-panel.c:2085
 msgid "Turn Off"
 msgstr "Slå av"
 
-#: ../panels/display/cc-display-panel.c:2072
+#: ../panels/display/cc-display-panel.c:2086
 msgid "Don't use this display"
 msgstr "Ikke bruk denne skjermen"
 
-#: ../panels/display/cc-display-panel.c:2289
+#: ../panels/display/cc-display-panel.c:2301
 msgid "Could not get screen information"
 msgstr "Fant ikke informasjon om skjermen"
 
-#: ../panels/display/cc-display-panel.c:2320
+#: ../panels/display/cc-display-panel.c:2332
 msgid "_Arrange Combined Displays"
 msgstr "Org_aniser sammenslåtte skjermer"
 
-#: ../panels/display/display-capplet.ui.h:6
-msgid "Show your primary display on this screen also"
-msgstr "Vis primær skjerm på denne skjermen også"
-
-#: ../panels/display/display-capplet.ui.h:7
-msgid "Combine"
-msgstr "Slå sammen"
-
-#: ../panels/display/display-capplet.ui.h:8
-msgid "Join with the primary display to create an extra space"
-msgstr "Slå sammen med primær skjerm for å lage et ekstra område"
-
-#: ../panels/display/display-capplet.ui.h:10
-msgid "Don't use the display"
-msgstr "Ikke bruk skjermen"
-
-#: ../panels/display/display-capplet.ui.h:11
-#: ../panels/printers/printers.ui.h:12
-msgid "Model"
-msgstr "Modell"
-
-#: ../panels/display/display-capplet.ui.h:14
-msgid "Refresh Rate"
-msgstr "Oppfriskingsrate"
-
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
 msgid "Displays"
 msgstr "Skjermer"
@@ -1278,53 +1223,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:450 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:451 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../panels/info/cc-info-panel.c:532
+#: ../panels/info/cc-info-panel.c:534
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %d-bit"
 
-#: ../panels/info/cc-info-panel.c:534
+#: ../panels/info/cc-info-panel.c:536
 #, c-format
 msgid "%d-bit"
 msgstr "%d-bit"
 
-#: ../panels/info/cc-info-panel.c:1214
+#: ../panels/info/cc-info-panel.c:1216
 msgid "Ask what to do"
-msgstr "Spør hvs som skal gjøres"
+msgstr "Spør hva som skal gjøres"
 
-#: ../panels/info/cc-info-panel.c:1218
+#: ../panels/info/cc-info-panel.c:1220
 msgid "Do nothing"
 msgstr "Ikke gjør noe"
 
-#: ../panels/info/cc-info-panel.c:1222
+#: ../panels/info/cc-info-panel.c:1224
 msgid "Open folder"
 msgstr "Åpne mappe"
 
-#: ../panels/info/cc-info-panel.c:1313
+#: ../panels/info/cc-info-panel.c:1315
 msgid "Other Media"
 msgstr "Annet medie"
 
-#: ../panels/info/cc-info-panel.c:1344
+#: ../panels/info/cc-info-panel.c:1346
 msgid "Select an application for audio CDs"
 msgstr "Velg et program for lyd-CDer"
 
-#: ../panels/info/cc-info-panel.c:1345
+#: ../panels/info/cc-info-panel.c:1347
 msgid "Select an application for video DVDs"
 msgstr "Velg et program for video-DVDer"
 
-#: ../panels/info/cc-info-panel.c:1346
+#: ../panels/info/cc-info-panel.c:1348
 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:1347
+#: ../panels/info/cc-info-panel.c:1349
 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:1348
+#: ../panels/info/cc-info-panel.c:1350
 msgid "Select an application for software CDs"
 msgstr "Velg et program for programvare-CDer"
 
@@ -1333,89 +1278,89 @@ 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:1360
+#: ../panels/info/cc-info-panel.c:1362
 msgid "audio DVD"
 msgstr "Lyd-DVD"
 
-#: ../panels/info/cc-info-panel.c:1361
+#: ../panels/info/cc-info-panel.c:1363
 msgid "blank Blu-ray disc"
 msgstr "Tom Blu-ray-plate"
 
-#: ../panels/info/cc-info-panel.c:1362
+#: ../panels/info/cc-info-panel.c:1364
 msgid "blank CD disc"
 msgstr "Tom CD-plate"
 
-#: ../panels/info/cc-info-panel.c:1363
+#: ../panels/info/cc-info-panel.c:1365
 msgid "blank DVD disc"
 msgstr "Tom DVD-plate"
 
-#: ../panels/info/cc-info-panel.c:1364
+#: ../panels/info/cc-info-panel.c:1366
 msgid "blank HD DVD disc"
 msgstr "tom HD-DVD plate"
 
-#: ../panels/info/cc-info-panel.c:1365
+#: ../panels/info/cc-info-panel.c:1367
 msgid "Blu-ray video disc"
 msgstr "Blu-ray videoplate"
 
-#: ../panels/info/cc-info-panel.c:1366
+#: ../panels/info/cc-info-panel.c:1368
 msgid "e-book reader"
 msgstr "E-bokleser"
 
-#: ../panels/info/cc-info-panel.c:1367
+#: ../panels/info/cc-info-panel.c:1369
 msgid "HD DVD video disc"
 msgstr "HD-DVD-videoplate"
 
-#: ../panels/info/cc-info-panel.c:1368
+#: ../panels/info/cc-info-panel.c:1370
 msgid "Picture CD"
 msgstr "Bilde-CD"
 
-#: ../panels/info/cc-info-panel.c:1369
+#: ../panels/info/cc-info-panel.c:1371
 msgid "Super Video CD"
 msgstr "Super Video CD"
 
-#: ../panels/info/cc-info-panel.c:1370
+#: ../panels/info/cc-info-panel.c:1372
 msgid "Video CD"
 msgstr "Video-CD"
 
-#: ../panels/info/cc-info-panel.c:1371
+#: ../panels/info/cc-info-panel.c:1373
 msgid "Windows software"
 msgstr "Windows programvare"
 
-#: ../panels/info/cc-info-panel.c:1372
+#: ../panels/info/cc-info-panel.c:1374
 msgid "Software"
 msgstr "Programvare"
 
-#: ../panels/info/cc-info-panel.c:1495
+#: ../panels/info/cc-info-panel.c:1497
 #: ../panels/keyboard/keyboard-shortcuts.c:1696
 msgid "Section"
 msgstr "Seksjon"
 
-#: ../panels/info/cc-info-panel.c:1504 ../panels/info/info.ui.h:13
+#: ../panels/info/cc-info-panel.c:1506 ../panels/info/info.ui.h:13
 msgid "Overview"
 msgstr "Oversikt"
 
-#: ../panels/info/cc-info-panel.c:1510 ../panels/info/info.ui.h:20
+#: ../panels/info/cc-info-panel.c:1512 ../panels/info/info.ui.h:20
 msgid "Default Applications"
 msgstr "Forvalgte programmer"
 
-#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:28
+#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:28
 msgid "Removable Media"
 msgstr "Avtagbare medier"
 
-#: ../panels/info/cc-info-panel.c:1540
+#: ../panels/info/cc-info-panel.c:1542
 #, c-format
 msgid "Version %s"
 msgstr "Versjon %s"
 
-#: ../panels/info/cc-info-panel.c:1590
+#: ../panels/info/cc-info-panel.c:1592
 msgid "Install Updates"
 msgstr "Installer oppdateringer"
 
-#: ../panels/info/cc-info-panel.c:1594
+#: ../panels/info/cc-info-panel.c:1596
 msgid "System Up-To-Date"
 msgstr "Systemet er oppdatert"
 
-#: ../panels/info/cc-info-panel.c:1598
+#: ../panels/info/cc-info-panel.c:1600
 msgid "Checking for Updates"
 msgstr "Ser etter oppdateringer"
 
@@ -1580,7 +1525,7 @@ msgid "Eject"
 msgstr "Utløs"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
 #: ../panels/universal-access/uap.ui.h:11
 msgid "Typing"
 msgstr "Skriving"
@@ -1739,7 +1684,6 @@ msgid "Modifiers-only switch to next source"
 msgstr "Bytt til neste kilde kun med endringstaster"
 
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "Keyboard"
 msgstr "Tastatur"
 
@@ -1764,76 +1708,76 @@ msgstr "_Navn:"
 msgid "C_ommand:"
 msgstr "K_ommando:"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "Repeat Keys"
 msgstr "Repeter taster"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
 msgid "Key presses _repeat when key is held down"
 msgstr "Tastetrykk _repeteres når tasten holdes nede"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
 msgid "_Delay:"
 msgstr "_Pause:"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
 msgid "_Speed:"
 msgstr "_Hastighet:"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
 msgctxt "keyboard, delay"
 msgid "Short"
 msgstr "Kort"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
 msgctxt "keyboard, speed"
 msgid "Slow"
 msgstr "Treg"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
 msgid "Repeat keys speed"
 msgstr "Hastighet for tasterepetering"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
 msgctxt "keyboard, delay"
 msgid "Long"
 msgstr "Lang"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
 msgctxt "keyboard, speed"
 msgid "Fast"
 msgstr "Rask"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
 msgid "Cursor Blinking"
 msgstr "Markørblinking"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
 msgid "Cursor _blinks in text fields"
 msgstr "Markøren _blinker i tekstfelt"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
 msgid "S_peed:"
 msgstr "_Hastighet:"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
 msgid "Cursor blink speed"
 msgstr "Hastighet for blinkende markør"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
 #: ../panels/region/region.ui.h:5
 msgid "Input Sources"
 msgstr "Inndatakilder"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
 msgid "Add Shortcut"
 msgstr "Legg til snarvei"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 msgid "Remove Shortcut"
 msgstr "Fjern snarvei"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
 msgid ""
 "To edit a shortcut, click the row and hold down the new keys or press "
 "Backspace to clear."
@@ -1841,7 +1785,7 @@ msgstr ""
 "Klikk på tilhørende rad og skriv inn en ny tastekombinasjon for å redigere "
 "en snarveitast, eller trykk slettetast for å fjerne den."
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
 msgid "Shortcuts"
 msgstr "Snarveier"
 
@@ -1886,11 +1830,11 @@ msgstr ""
 msgid "_Reassign"
 msgstr "_Omfordel"
 
-#: ../panels/mouse/cc-mouse-panel.c:100
+#: ../panels/mouse/cc-mouse-panel.c:95
 msgid "Test Your _Settings"
 msgstr "Test dine inn_stillinger"
 
-#: ../panels/mouse/cc-mouse-panel.c:117
+#: ../panels/mouse/cc-mouse-panel.c:108
 msgid "Test Your Settings"
 msgstr "Test dine innstillinger"
 
@@ -1911,91 +1855,87 @@ msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
 msgstr "Styrepute;Peker;Klikk;Tapp;Dobbel;Knapp;Styrekule;Rull;"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:1
-msgid "Mouse Preferences"
-msgstr "Brukervalg for mus"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
 msgid "General"
 msgstr "Generelt"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+#: ../panels/mouse/gnome-mouse-properties.ui.h:2
 msgctxt "double click, speed"
 msgid "Slow"
 msgstr "Treg"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+#: ../panels/mouse/gnome-mouse-properties.ui.h:3
 msgid "Double-click timeout"
 msgstr "Tidsavbrudd for dobbeltklikk"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+#: ../panels/mouse/gnome-mouse-properties.ui.h:4
 msgctxt "double click, speed"
 msgid "Fast"
 msgstr "Rask"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+#: ../panels/mouse/gnome-mouse-properties.ui.h:5
 msgid "_Double-click"
 msgstr "_Dobbeltklikk"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+#: ../panels/mouse/gnome-mouse-properties.ui.h:6
 msgid "Primary _button"
 msgstr "Primær_knapp"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+#: ../panels/mouse/gnome-mouse-properties.ui.h:7
 msgctxt "mouse, left button as primary"
 msgid "_Left"
 msgstr "_Venstre"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+#: ../panels/mouse/gnome-mouse-properties.ui.h:8
 msgctxt "mouse, right button as primary"
 msgid "_Right"
 msgstr "Høy_re"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#: ../panels/mouse/gnome-mouse-properties.ui.h:9
 msgid "Mouse"
 msgstr "Mus"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: ../panels/mouse/gnome-mouse-properties.ui.h:10
 msgid "_Pointer speed"
 msgstr "_Pekerhastighet"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: ../panels/mouse/gnome-mouse-properties.ui.h:11
 msgctxt "mouse pointer, speed"
 msgid "Slow"
 msgstr "Treg"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#: ../panels/mouse/gnome-mouse-properties.ui.h:12
 msgctxt "mouse pointer, speed"
 msgid "Fast"
 msgstr "Rask"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: ../panels/mouse/gnome-mouse-properties.ui.h:13
 msgid "Touchpad"
 msgstr "Pekeplate"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: ../panels/mouse/gnome-mouse-properties.ui.h:14
 msgctxt "touchpad pointer, speed"
 msgid "Slow"
 msgstr "Treg"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+#: ../panels/mouse/gnome-mouse-properties.ui.h:15
 msgctxt "touchpad pointer, speed"
 msgid "Fast"
 msgstr "Rask"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+#: ../panels/mouse/gnome-mouse-properties.ui.h:16
 msgid "Disable while _typing"
 msgstr "Deak_tiver når du skriver"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+#: ../panels/mouse/gnome-mouse-properties.ui.h:17
 msgid "Tap to _click"
 msgstr "Tapp for å _klikke"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
+#: ../panels/mouse/gnome-mouse-properties.ui.h:18
 msgid "Two _finger scroll"
 msgstr "Rulling med to _fingre"
 
 #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible.
-#: ../panels/mouse/gnome-mouse-properties.ui.h:21
+#: ../panels/mouse/gnome-mouse-properties.ui.h:20
 msgid "_Natural scrolling"
 msgstr "_Naturlig rulling"
 
@@ -2038,7 +1978,7 @@ msgstr "Enkeltklikk, sekundærknapp"
 msgid "Air_plane Mode"
 msgstr "_Flymodus"
 
-#: ../panels/network/cc-network-panel.c:928
+#: ../panels/network/cc-network-panel.c:930
 msgid "Network proxy"
 msgstr "Nettverksproxy"
 
@@ -2046,14 +1986,14 @@ msgstr "Nettverksproxy"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1107 ../panels/network/net-vpn.c:285
-#: ../panels/network/net-vpn.c:438
+#: ../panels/network/cc-network-panel.c:1109 ../panels/network/net-vpn.c:278
+#: ../panels/network/net-vpn.c:431
 #, 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:1242
+#: ../panels/network/cc-network-panel.c:1244
 msgid "The system network services are not compatible with this version."
 msgstr ""
 "Nettverkstjenesten for dette systemet er ikke kompatibelt med denne "
@@ -2089,34 +2029,34 @@ msgstr "automatisk"
 
 #. TRANSLATORS: this WEP WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:221
-#: ../panels/network/net-device-wifi.c:382
+#: ../panels/network/net-device-wifi.c:216
+#: ../panels/network/net-device-wifi.c:377
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:225
-#: ../panels/network/net-device-wifi.c:387
+#: ../panels/network/net-device-wifi.c:220
+#: ../panels/network/net-device-wifi.c:382
 #: ../panels/network/network-wifi.ui.h:17
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:229
+#: ../panels/network/net-device-wifi.c:224
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:65
-#: ../panels/network/net-device-wifi.c:234
+#: ../panels/network/net-device-wifi.c:229
 msgid "Enterprise"
 msgstr "Bedrift"
 
 #: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:239
-#: ../panels/network/net-device-wifi.c:372
+#: ../panels/network/net-device-wifi.c:234
+#: ../panels/network/net-device-wifi.c:367
 msgctxt "Wifi security"
 msgid "None"
 msgstr "Ingen"
@@ -2137,8 +2077,8 @@ msgid "Yesterday"
 msgstr "I går"
 
 #: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:125
-#: ../panels/network/net-device-wifi.c:476
+#: ../panels/network/net-device-ethernet.c:122
+#: ../panels/network/net-device-wifi.c:471
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2148,37 +2088,37 @@ msgstr[1] "%i dager siden"
 #. Translators: network device speed
 #: ../panels/network/connection-editor/ce-page-details.c:155
 #: ../panels/network/net-device-ethernet.c:53
-#: ../panels/network/net-device-wifi.c:534
+#: ../panels/network/net-device-wifi.c:528
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
 #: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:563
+#: ../panels/network/net-device-wifi.c:557
 msgctxt "Signal strength"
 msgid "None"
 msgstr "Ingen"
 
 #: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:565
+#: ../panels/network/net-device-wifi.c:559
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Svak"
 
 #: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:567
+#: ../panels/network/net-device-wifi.c:561
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "Ok"
 
 #: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:569
+#: ../panels/network/net-device-wifi.c:563
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "God"
 
 #: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:571
+#: ../panels/network/net-device-wifi.c:565
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Utmerket"
@@ -2324,15 +2264,15 @@ msgid "Link speed"
 msgstr "Hastighet for tilkobling"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:158
+#: ../panels/network/net-device-ethernet.c:155
 #: ../panels/network/network-simple.ui.h:3
 #: ../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:159
-#: ../panels/network/net-device-ethernet.c:163
+#: ../panels/network/net-device-ethernet.c:156
+#: ../panels/network/net-device-ethernet.c:160
 #: ../panels/network/network-mobile.ui.h:4
 #: ../panels/network/network-simple.ui.h:4
 #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
@@ -2340,14 +2280,14 @@ msgid "IPv6 Address"
 msgstr "IPv6-adresse"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:166
+#: ../panels/network/net-device-ethernet.c:163
 #: ../panels/network/network-simple.ui.h:2
 #: ../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:170
+#: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-mobile.ui.h:5
 #: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:8
@@ -2357,7 +2297,7 @@ 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:172
+#: ../panels/network/net-device-ethernet.c:169
 #: ../panels/network/network-mobile.ui.h:6
 #: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:9
@@ -2503,7 +2443,7 @@ msgid "_Add"
 msgstr "_Legg til"
 
 #: ../panels/network/connection-editor/net-connection-editor.c:595
-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
+#: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
 msgid "VPN"
 msgstr "VPN"
 
@@ -2537,7 +2477,7 @@ msgid "_Reset"
 msgstr "N_ullstill"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1408
+#: ../panels/network/net-device-wifi.c:1403
 #: ../panels/network/network-wifi.ui.h:40
 msgid "_Forget"
 msgstr "_Glem"
@@ -2586,7 +2526,7 @@ msgstr "Velg fil som skal importeres"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:246
 #: ../panels/printers/cc-printers-panel.c:1947
-#: ../panels/sharing/cc-sharing-panel.c:422
+#: ../panels/sharing/cc-sharing-panel.c:436
 #: ../panels/user-accounts/um-photo-dialog.c:222
 msgid "_Open"
 msgstr "_Åpne"
@@ -2673,29 +2613,29 @@ msgstr "Koble sammen slaver"
 msgid "Bridge slaves"
 msgstr "Lag bro mellom slaver"
 
-#: ../panels/network/net-device-ethernet.c:111
-#: ../panels/network/net-device-wifi.c:462
+#: ../panels/network/net-device-ethernet.c:108
+#: ../panels/network/net-device-wifi.c:457
 msgid "never"
 msgstr "aldri"
 
-#: ../panels/network/net-device-ethernet.c:121
-#: ../panels/network/net-device-wifi.c:472
+#: ../panels/network/net-device-ethernet.c:118
+#: ../panels/network/net-device-wifi.c:467
 msgid "today"
 msgstr "i dag"
 
-#: ../panels/network/net-device-ethernet.c:123
-#: ../panels/network/net-device-wifi.c:474
+#: ../panels/network/net-device-ethernet.c:120
+#: ../panels/network/net-device-wifi.c:469
 msgid "yesterday"
 msgstr "i går"
 
-#: ../panels/network/net-device-ethernet.c:161
+#: ../panels/network/net-device-ethernet.c:158
 #: ../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:177
+#: ../panels/network/net-device-ethernet.c:174
 #: ../panels/network/network-wifi.ui.h:10
 msgid "Last used"
 msgstr "Sist brukt"
@@ -2705,14 +2645,14 @@ msgstr "Sist brukt"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:287
+#: ../panels/network/net-device-ethernet.c:284
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "Kablet"
 
-#: ../panels/network/net-device-ethernet.c:355
-#: ../panels/network/net-device-wifi.c:1549
+#: ../panels/network/net-device-ethernet.c:352
+#: ../panels/network/net-device-wifi.c:1558
 #: ../panels/network/network-ethernet.ui.h:3
 #: ../panels/network/network-mobile.ui.h:8
 #: ../panels/network/network-simple.ui.h:8
@@ -2720,16 +2660,16 @@ msgstr "Kablet"
 msgid "Options…"
 msgstr "Alternativer …"
 
-#: ../panels/network/net-device-ethernet.c:492
+#: ../panels/network/net-device-ethernet.c:489
 #, c-format
 msgid "Profile %d"
 msgstr "Profil %d"
 
-#: ../panels/network/net-device-mobile.c:239
+#: ../panels/network/net-device-mobile.c:232
 msgid "Add new connection"
 msgstr "Legg til ny tilkobling"
 
-#: ../panels/network/net-device-wifi.c:1117
+#: ../panels/network/net-device-wifi.c:1110
 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."
@@ -2737,12 +2677,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:1121
+#: ../panels/network/net-device-wifi.c:1114
 #, 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:1125
+#: ../panels/network/net-device-wifi.c:1118
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2750,23 +2690,23 @@ 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:1199
+#: ../panels/network/net-device-wifi.c:1192
 msgid "Stop hotspot and disconnect any users?"
 msgstr "Stopp trådløst aksesspunkt og koble fra brukere?"
 
-#: ../panels/network/net-device-wifi.c:1202
+#: ../panels/network/net-device-wifi.c:1195
 msgid "_Stop Hotspot"
 msgstr "_Stopp hotspot"
 
-#: ../panels/network/net-device-wifi.c:1274
+#: ../panels/network/net-device-wifi.c:1267
 msgid "System policy prohibits use as a Hotspot"
 msgstr "Systemets regelsett forhindrer bruk som aksesspunkt"
 
-#: ../panels/network/net-device-wifi.c:1277
+#: ../panels/network/net-device-wifi.c:1270
 msgid "Wireless device does not support Hotspot mode"
 msgstr "Trådløs enhet støtter ikke hotspotmodus"
 
-#: ../panels/network/net-device-wifi.c:1404
+#: ../panels/network/net-device-wifi.c:1399
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
@@ -2774,19 +2714,19 @@ 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
+#: ../panels/network/net-device-wifi.c:1726
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
 msgid "History"
 msgstr "Historikk"
 
-#: ../panels/network/net-device-wifi.c:1718 ../panels/power/power.ui.h:21
+#: ../panels/network/net-device-wifi.c:1730 ../panels/power/power.ui.h:21
 #: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596
-#: ../panels/wacom/cc-wacom-page.c:525
+#: ../panels/wacom/cc-wacom-page.c:534
 msgid "_Close"
 msgstr "_Lukk"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1726
+#: ../panels/network/net-device-wifi.c:1738
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_Glem"
@@ -2807,7 +2747,7 @@ msgstr ""
 msgid "This is not recommended for untrusted public networks."
 msgstr "Dette anbefales ikke for offentlige nettverk du ikke stoler på."
 
-#: ../panels/network/net-proxy.c:417
+#: ../panels/network/net-proxy.c:410
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -2823,17 +2763,17 @@ msgstr "IMEI"
 msgid "Provider"
 msgstr "Tilbyder"
 
-#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
+#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:2
 msgctxt "proxy method"
 msgid "None"
 msgstr "Ingen"
 
-#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
+#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:3
 msgctxt "proxy method"
 msgid "Manual"
 msgstr "Manuell"
 
-#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
+#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:4
 msgctxt "proxy method"
 msgid "Automatic"
 msgstr "Automatisk"
@@ -2886,19 +2826,7 @@ msgstr "Port for Socks-proxy"
 msgid "Turn device off"
 msgstr "Slå enhet av"
 
-#: ../panels/network/network.ui.h:1
-msgid "Select the interface to use for the new service"
-msgstr "Velger grensesnitt som skal brukes for den nye tjenesten"
-
-#: ../panels/network/network.ui.h:2
-msgid "C_reate…"
-msgstr "_Lag …"
-
-#: ../panels/network/network.ui.h:3
-msgid "_Interface"
-msgstr "Grensesn_itt"
-
-#: ../panels/network/network.ui.h:8
+#: ../panels/network/network.ui.h:5
 msgid "Add Device"
 msgstr "Legg til enhet"
 
@@ -2937,7 +2865,7 @@ msgstr "detaljer"
 #: ../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:9
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "_Password"
 msgstr "_Passord"
 
@@ -3633,12 +3561,12 @@ msgid "Show Details in Lock Screen"
 msgstr "Vis detaljer ved låsing av skjerm"
 
 #: ../panels/notifications/cc-notifications-panel.c:205
-#: ../panels/power/cc-power-panel.c:1733 ../panels/power/cc-power-panel.c:1740
-#: ../panels/privacy/cc-privacy-panel.c:77
-#: ../panels/privacy/cc-privacy-panel.c:117
-#: ../panels/universal-access/cc-ua-panel.c:253
-#: ../panels/universal-access/cc-ua-panel.c:610
-#: ../panels/universal-access/cc-ua-panel.c:736
+#: ../panels/power/cc-power-panel.c:1775 ../panels/power/cc-power-panel.c:1782
+#: ../panels/privacy/cc-privacy-panel.c:80
+#: ../panels/privacy/cc-privacy-panel.c:120
+#: ../panels/universal-access/cc-ua-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:597
+#: ../panels/universal-access/cc-ua-panel.c:722
 msgid "On"
 msgstr "På"
 
@@ -3759,18 +3687,18 @@ msgstr ""
 "Hvis du legger til en konto kan alle dine programmer bruke denne for "
 "dokumenter, e-post, kontakter, kalender, lynmeldinger og mer."
 
-#: ../panels/power/cc-power-panel.c:187
+#: ../panels/power/cc-power-panel.c:195
 msgid "Unknown time"
 msgstr "Ukjent tid"
 
-#: ../panels/power/cc-power-panel.c:193
+#: ../panels/power/cc-power-panel.c:201
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minutt"
 msgstr[1] "%i minutter"
 
-#: ../panels/power/cc-power-panel.c:205
+#: ../panels/power/cc-power-panel.c:213
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3779,226 +3707,226 @@ msgstr[1] "%i timer"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:213
+#: ../panels/power/cc-power-panel.c:221
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:214
+#: ../panels/power/cc-power-panel.c:222
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: ../panels/power/cc-power-panel.c:215
+#: ../panels/power/cc-power-panel.c:223
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minutter"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:234
+#: ../panels/power/cc-power-panel.c:242
 #, c-format
 msgid "%s until fully charged"
 msgstr "fullt ladet om %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:241
+#: ../panels/power/cc-power-panel.c:249
 #, c-format
 msgid "Caution: %s remaining"
 msgstr "Advarsel: %s gjenstår"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:246
+#: ../panels/power/cc-power-panel.c:254
 #, c-format
 msgid "%s remaining"
 msgstr "%s gjenstår"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:251 ../panels/power/cc-power-panel.c:279
+#: ../panels/power/cc-power-panel.c:259 ../panels/power/cc-power-panel.c:287
 msgid "Fully charged"
 msgstr "Fullt ladet"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:255 ../panels/power/cc-power-panel.c:283
+#: ../panels/power/cc-power-panel.c:263 ../panels/power/cc-power-panel.c:291
 msgid "Empty"
 msgstr "Tom"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:270
+#: ../panels/power/cc-power-panel.c:278
 msgid "Charging"
 msgstr "Lader"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:275
+#: ../panels/power/cc-power-panel.c:283
 msgid "Discharging"
 msgstr "Lader ut"
 
-#: ../panels/power/cc-power-panel.c:393
+#: ../panels/power/cc-power-panel.c:403
 msgctxt "Battery name"
 msgid "Main"
 msgstr "Hoved"
 
-#: ../panels/power/cc-power-panel.c:395
+#: ../panels/power/cc-power-panel.c:405
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "Ekstra"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:486
+#: ../panels/power/cc-power-panel.c:477
 msgid "Wireless mouse"
 msgstr "Trådløs mus"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:490
+#: ../panels/power/cc-power-panel.c:480
 msgid "Wireless keyboard"
 msgstr "Trådløst tastatur"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:494
+#: ../panels/power/cc-power-panel.c:483
 msgid "Uninterruptible power supply"
 msgstr "Avbruddsfri strømforsyning"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:499
+#: ../panels/power/cc-power-panel.c:486
 msgid "Personal digital assistant"
 msgstr "Personlig digital assistent"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:503
+#: ../panels/power/cc-power-panel.c:489
 msgid "Cellphone"
 msgstr "Mobiltelefon"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:507
+#: ../panels/power/cc-power-panel.c:492
 msgid "Media player"
 msgstr "Musikkavspiller"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:511
+#: ../panels/power/cc-power-panel.c:495
 msgid "Tablet"
 msgstr "Tegnebrett"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:515
+#: ../panels/power/cc-power-panel.c:498
 msgid "Computer"
 msgstr "Datamaskin"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:519 ../panels/power/cc-power-panel.c:729
-#: ../panels/power/cc-power-panel.c:2064
+#: ../panels/power/cc-power-panel.c:501 ../panels/power/cc-power-panel.c:745
+#: ../panels/power/cc-power-panel.c:2106
 msgid "Battery"
 msgstr "Batteri"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:528
+#: ../panels/power/cc-power-panel.c:547
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "Lader"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:535
+#: ../panels/power/cc-power-panel.c:554
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "Advarsel"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:540
+#: ../panels/power/cc-power-panel.c:559
 msgctxt "Battery power"
 msgid "Low"
 msgstr "Lav"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:545
+#: ../panels/power/cc-power-panel.c:564
 msgctxt "Battery power"
 msgid "Good"
 msgstr "God"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:550
+#: ../panels/power/cc-power-panel.c:569
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "Fullt ladet"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:554
+#: ../panels/power/cc-power-panel.c:573
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "Tom"
 
-#: ../panels/power/cc-power-panel.c:727
+#: ../panels/power/cc-power-panel.c:743
 msgid "Batteries"
 msgstr "Batterier"
 
-#: ../panels/power/cc-power-panel.c:1133
+#: ../panels/power/cc-power-panel.c:1175
 msgid "When _idle"
 msgstr "Når led_ig"
 
-#: ../panels/power/cc-power-panel.c:1502
+#: ../panels/power/cc-power-panel.c:1544
 msgid "Power Saving"
 msgstr "Strømsparing"
 
-#: ../panels/power/cc-power-panel.c:1530
+#: ../panels/power/cc-power-panel.c:1572
 msgid "_Screen brightness"
 msgstr "Lysstyrke for _skjerm"
 
-#: ../panels/power/cc-power-panel.c:1536
+#: ../panels/power/cc-power-panel.c:1578
 msgid "_Keyboard brightness"
 msgstr "Lysstyrke for s_kjerm"
 
-#: ../panels/power/cc-power-panel.c:1546
+#: ../panels/power/cc-power-panel.c:1588
 msgid "_Dim screen when inactive"
 msgstr "_Demp skjermen når inaktiv"
 
-#: ../panels/power/cc-power-panel.c:1571
+#: ../panels/power/cc-power-panel.c:1613
 msgid "_Blank screen"
 msgstr "_Slå av skjerm"
 
-#: ../panels/power/cc-power-panel.c:1608
+#: ../panels/power/cc-power-panel.c:1650
 msgid "_Wi-Fi"
 msgstr "_Trådløs"
 
-#: ../panels/power/cc-power-panel.c:1613
+#: ../panels/power/cc-power-panel.c:1655
 msgid "Turns off wireless devices"
 msgstr "Slår av trådløse enheter"
 
-#: ../panels/power/cc-power-panel.c:1638
+#: ../panels/power/cc-power-panel.c:1680
 msgid "_Mobile broadband"
 msgstr "_Mobilt bredbånd"
 
-#: ../panels/power/cc-power-panel.c:1643
+#: ../panels/power/cc-power-panel.c:1685
 msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
 msgstr "Slår av mobile bredbåndsenheter (3G, 4G, WiMax, etc.)"
 
-#: ../panels/power/cc-power-panel.c:1678
+#: ../panels/power/cc-power-panel.c:1720
 msgid "_Bluetooth"
 msgstr "_Blåtann"
 
-#: ../panels/power/cc-power-panel.c:1729
+#: ../panels/power/cc-power-panel.c:1771
 msgid "When on battery power"
 msgstr "På batteristrøm"
 
-#: ../panels/power/cc-power-panel.c:1731
+#: ../panels/power/cc-power-panel.c:1773
 msgid "When plugged in"
 msgstr "Når den er koblet til strøm"
 
-#: ../panels/power/cc-power-panel.c:1860
+#: ../panels/power/cc-power-panel.c:1902
 msgid "Suspend & Power Off"
 msgstr "Hvilemodus og slå av"
 
-#: ../panels/power/cc-power-panel.c:1893
+#: ../panels/power/cc-power-panel.c:1935
 msgid "_Automatic suspend"
 msgstr "_Automatisk hvilemodus"
 
-#: ../panels/power/cc-power-panel.c:1917
+#: ../panels/power/cc-power-panel.c:1959
 msgid "When battery power is _critical"
 msgstr "Når batterikapasiteten er _kritisk lav"
 
-#: ../panels/power/cc-power-panel.c:1974
+#: ../panels/power/cc-power-panel.c:2016
 msgid "Power Off"
 msgstr "Slå av"
 
-#: ../panels/power/cc-power-panel.c:2111
+#: ../panels/power/cc-power-panel.c:2153
 msgid "Devices"
 msgstr "Enheter"
 
@@ -4469,12 +4397,12 @@ msgid "%s Active Jobs"
 msgstr "%s aktive jobber"
 
 #. Translators: This item is a server which needs authentication to show its printers
-#: ../panels/printers/pp-new-printer-dialog.c:1667
+#: ../panels/printers/pp-new-printer-dialog.c:1669
 msgid "Server requires authentication"
 msgstr "Tjener krever autentisering"
 
 #. Translators: No printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1704
+#: ../panels/printers/pp-new-printer-dialog.c:1706
 msgid "No printers detected."
 msgstr "Ingen skrivere funnet."
 
@@ -4646,6 +4574,10 @@ msgstr "Jobber"
 msgid "Show _Jobs"
 msgstr "Vis _jobber"
 
+#: ../panels/printers/printers.ui.h:12
+msgid "Model"
+msgstr "Modell"
+
 #: ../panels/printers/printers.ui.h:15
 msgid "label"
 msgstr "etikett"
@@ -4682,39 +4614,39 @@ msgstr ""
 "Beklager! Systemets utskriftstjeneste\n"
 "ser ikke ut til å være tilgjengelig."
 
-#: ../panels/privacy/cc-privacy-panel.c:245 ../panels/privacy/privacy.ui.h:26
+#: ../panels/privacy/cc-privacy-panel.c:248 ../panels/privacy/privacy.ui.h:26
 msgid "Screen Lock"
 msgstr "Lås skjerm"
 
-#: ../panels/privacy/cc-privacy-panel.c:358 ../panels/privacy/privacy.ui.h:20
+#: ../panels/privacy/cc-privacy-panel.c:361 ../panels/privacy/privacy.ui.h:20
 msgid "Usage & History"
 msgstr "Bruk og historikk"
 
-#: ../panels/privacy/cc-privacy-panel.c:486
+#: ../panels/privacy/cc-privacy-panel.c:489
 msgid "Empty all items from Trash?"
 msgstr "Tøm alle oppføringer fra papirkurven?"
 
-#: ../panels/privacy/cc-privacy-panel.c:487
+#: ../panels/privacy/cc-privacy-panel.c:490
 msgid "All items in the Trash will be permanently deleted."
 msgstr "Alle oppføringer i papirkurven vil bli slettet permanent."
 
-#: ../panels/privacy/cc-privacy-panel.c:488 ../panels/privacy/privacy.ui.h:32
+#: ../panels/privacy/cc-privacy-panel.c:491 ../panels/privacy/privacy.ui.h:32
 msgid "_Empty Trash"
 msgstr "_Tøm papirkurv"
 
-#: ../panels/privacy/cc-privacy-panel.c:511
+#: ../panels/privacy/cc-privacy-panel.c:514
 msgid "Delete all the temporary files?"
 msgstr "Slett alle midlertidige filer?"
 
-#: ../panels/privacy/cc-privacy-panel.c:512
+#: ../panels/privacy/cc-privacy-panel.c:515
 msgid "All the temporary files will be permanently deleted."
 msgstr "Alle midlertidige filer vil bli slettet permanent."
 
-#: ../panels/privacy/cc-privacy-panel.c:513 ../panels/privacy/privacy.ui.h:33
+#: ../panels/privacy/cc-privacy-panel.c:516 ../panels/privacy/privacy.ui.h:33
 msgid "_Purge Temporary Files"
 msgstr "_Fjern midlertidige filer"
 
-#: ../panels/privacy/cc-privacy-panel.c:535 ../panels/privacy/privacy.ui.h:31
+#: ../panels/privacy/cc-privacy-panel.c:538 ../panels/privacy/privacy.ui.h:31
 msgid "Purge Trash & Temporary Files"
 msgstr "Tøm papirkurv og midlertidige filer"
 
@@ -4866,32 +4798,27 @@ msgctxt "Input Source"
 msgid "Other"
 msgstr "Annen"
 
-#: ../panels/region/cc-region-panel.c:239
+#: ../panels/region/cc-region-panel.c:242
 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/cc-region-panel.c:240
+#: ../panels/region/cc-region-panel.c:243
 msgid "Restart Now"
 msgstr "Start på nytt nå"
 
-#: ../panels/region/cc-region-panel.c:569
-msgctxt "Language"
-msgid "None"
-msgstr "Ingen"
-
-#: ../panels/region/cc-region-panel.c:853
+#: ../panels/region/cc-region-panel.c:903
 msgid "No input source selected"
 msgstr "Ingen inndatakilder valgt"
 
-#: ../panels/region/cc-region-panel.c:1084
+#: ../panels/region/cc-region-panel.c:1134
 msgid "Sorry"
 msgstr "Beklager"
 
-#: ../panels/region/cc-region-panel.c:1086
+#: ../panels/region/cc-region-panel.c:1136
 msgid "Input methods can't be used on the login screen"
 msgstr "Inndatametoder kan ikke brukes i påloggingsskjermen"
 
-#: ../panels/region/cc-region-panel.c:1716
+#: ../panels/region/cc-region-panel.c:1765
 msgid "Login Screen"
 msgstr "Påloggingsskjerm"
 
@@ -5064,21 +4991,21 @@ msgstr "Flytt ned"
 msgid "Preferences"
 msgstr "Brukervalg"
 
-#: ../panels/sharing/cc-sharing-panel.c:274
+#: ../panels/sharing/cc-sharing-panel.c:285
 msgctxt "service is enabled"
 msgid "On"
 msgstr "På"
 
-#: ../panels/sharing/cc-sharing-panel.c:276
+#: ../panels/sharing/cc-sharing-panel.c:287
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "Av"
 
-#: ../panels/sharing/cc-sharing-panel.c:418
+#: ../panels/sharing/cc-sharing-panel.c:432
 msgid "Choose a Folder"
 msgstr "Velg en mappe"
 
-#: ../panels/sharing/cc-sharing-panel.c:702
+#: ../panels/sharing/cc-sharing-panel.c:739
 msgid "Copy"
 msgstr "Kopier"
 
@@ -5922,7 +5849,7 @@ msgid "_Full Name"
 msgstr "_Fullt navn"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:5
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
 msgid "Account _Type"
 msgstr "_Type konto"
 
@@ -6077,69 +6004,35 @@ msgstr "Gjeldende _passord"
 msgid "Ch_ange"
 msgstr "_Bytt"
 
-#: ../panels/user-accounts/data/photo-dialog.ui.h:1
-msgid "Changing photo for:"
-msgstr "Bytter bilde for:"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
-msgid ""
-"Choose a picture that will be shown at the login screen for this account."
-msgstr "Velg et bilde som skal vises ved pålogging for denne kontoen."
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
-msgid "Gallery"
-msgstr "Galleri"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:4
-#: ../panels/user-accounts/um-photo-dialog.c:218
-msgid "Browse for more pictures"
-msgstr "Se etter flere bilder"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:5
-msgid "Take a photograph"
-msgstr "Ta et bilde"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:6
-msgid "Browse"
-msgstr "Bla gjennom"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:7
-msgid "Photograph"
-msgstr "Bilde"
-
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Account Information"
-msgstr "Kontoinformasjon"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgid "Add User Account"
 msgstr "Legg til brukerkonto"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgid "Remove User Account"
 msgstr "Fjern brukerkonto"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
 msgid "Login Options"
 msgstr "Alternativer for pålogging"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "A_utomatic Login"
 msgstr "A_utomatisk pålogging"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
 msgid "_Fingerprint Login"
 msgstr "Innlogging med _fingeravtrykk"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
 msgid "User Icon"
 msgstr "Ikon for bruker"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "_Language"
 msgstr "_Språk"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
 msgid "Last Login"
 msgstr "Siste pålogging"
 
@@ -6554,6 +6447,10 @@ msgstr "Passordet kunne ikke endres"
 msgid "The passwords do not match."
 msgstr "Passordene er ikke like."
 
+#: ../panels/user-accounts/um-photo-dialog.c:218
+msgid "Browse for more pictures"
+msgstr "Se etter flere bilder"
+
 #: ../panels/user-accounts/um-photo-dialog.c:443
 msgid "Disable image"
 msgstr "Slå av bilde"
@@ -6816,7 +6713,7 @@ msgstr "Tilegne til en enkelt skjerm"
 msgid "%d of %d"
 msgstr "%d av %d"
 
-#: ../panels/wacom/cc-wacom-page.c:522
+#: ../panels/wacom/cc-wacom-page.c:531
 msgid "Display Mapping"
 msgstr "Vis kobling"
 
@@ -6953,22 +6850,22 @@ msgstr "Bytt modus for høyre berøringsstripe"
 msgid "Mode Switch #%d"
 msgstr "Modusbytte #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1336
+#: ../panels/wacom/gsd-wacom-device.c:1335
 #, c-format
 msgid "Left Button #%d"
 msgstr "Venstre knapp #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1339
+#: ../panels/wacom/gsd-wacom-device.c:1338
 #, c-format
 msgid "Right Button #%d"
 msgstr "Høyre knapp #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1342
+#: ../panels/wacom/gsd-wacom-device.c:1341
 #, c-format
 msgid "Top Button #%d"
 msgstr "Øverste knapp #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1345
+#: ../panels/wacom/gsd-wacom-device.c:1344
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "Nederste knapp #%d"
@@ -7100,27 +6997,27 @@ msgstr "Hjelp"
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1479
+#: ../shell/cc-window.c:61 ../shell/cc-window.c:1486
 msgid "All Settings"
 msgstr "Alle innstillinger"
 
 #. Add categories
-#: ../shell/cc-window.c:866
+#: ../shell/cc-window.c:868
 msgctxt "category"
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../shell/cc-window.c:867
+#: ../shell/cc-window.c:869
 msgctxt "category"
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: ../shell/cc-window.c:868
+#: ../shell/cc-window.c:870
 msgctxt "category"
 msgid "System"
 msgstr "System"
 
-#: ../shell/cc-window.c:1588 ../shell/gnome-control-center.desktop.in.in.h:1
+#: ../shell/cc-window.c:1597 ../shell/gnome-control-center.desktop.in.in.h:1
 msgid "Settings"
 msgstr "Innstillinger"