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

[Kjartan Maraas <kmaraas src gnome org>]

commit 0b4c630e473a30f295691b98a3c79d4a962e9264
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Sun Jan 20 15:12:02 2013 +0100

    Updated Norwegian bokmÃl translation

 po/nb.po |  590 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 397 insertions(+), 193 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 4a12fb5..a2f5b7b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 3.7.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 11:10+0100\n"
-"PO-Revision-Date: 2013-01-14 11:11+0100\n"
+"POT-Creation-Date: 2013-01-20 14:08+0100\n"
+"PO-Revision-Date: 2013-01-20 15:11+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmÃl <i18n-nb lister ping uio no>\n"
 "Language: \n"
@@ -693,11 +693,11 @@ msgstr "Speilede skjermer"
 msgid "Monitor"
 msgstr "Skjerm"
 
-#: ../panels/display/cc-display-panel.c:1666
+#: ../panels/display/cc-display-panel.c:1669
 msgid "Drag to change primary display."
 msgstr "Dra for à bytte primÃr skjerm."
 
-#: ../panels/display/cc-display-panel.c:1724
+#: ../panels/display/cc-display-panel.c:1727
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
@@ -705,29 +705,29 @@ msgstr ""
 "Velg en skjerm for à endre egenskaper for denne. Dra den rundt for à bytte "
 "plassering."
 
-#: ../panels/display/cc-display-panel.c:2112
+#: ../panels/display/cc-display-panel.c:2115
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/cc-display-panel.c:2114
+#: ../panels/display/cc-display-panel.c:2117
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../panels/display/cc-display-panel.c:2276
-#: ../panels/display/cc-display-panel.c:2328
+#: ../panels/display/cc-display-panel.c:2279
+#: ../panels/display/cc-display-panel.c:2331
 #, c-format
 msgid "Failed to apply configuration: %s"
 msgstr "Klarte ikke à ta konfigurasjonen i bruk: %s"
 
-#: ../panels/display/cc-display-panel.c:2356
+#: ../panels/display/cc-display-panel.c:2359
 msgid "Could not save the monitor configuration"
 msgstr "Kunne ikke lagre skjermkonfigurasjon"
 
-#: ../panels/display/cc-display-panel.c:2416
+#: ../panels/display/cc-display-panel.c:2419
 msgid "Could not detect displays"
 msgstr "Kunne ikke sÃke etter skjermer"
 
-#: ../panels/display/cc-display-panel.c:2611
+#: ../panels/display/cc-display-panel.c:2614
 msgid "Could not get screen information"
 msgstr "Fant ikke informasjon om skjermen"
 
@@ -766,53 +766,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:440 ../panels/network/panel-common.c:120
+#: ../panels/info/cc-info-panel.c:441 ../panels/network/panel-common.c:120
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../panels/info/cc-info-panel.c:579
+#: ../panels/info/cc-info-panel.c:542
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %d-bit"
 
-#: ../panels/info/cc-info-panel.c:581
+#: ../panels/info/cc-info-panel.c:544
 #, c-format
 msgid "%d-bit"
 msgstr "%d-bit"
 
-#: ../panels/info/cc-info-panel.c:1256
+#: ../panels/info/cc-info-panel.c:1219
 msgid "Ask what to do"
 msgstr "SpÃr hvs som skal gjÃres"
 
-#: ../panels/info/cc-info-panel.c:1260
+#: ../panels/info/cc-info-panel.c:1223
 msgid "Do nothing"
 msgstr "Ikke gjÃr noe"
 
-#: ../panels/info/cc-info-panel.c:1264
+#: ../panels/info/cc-info-panel.c:1227
 msgid "Open folder"
 msgstr "Ãpne mappe"
 
-#: ../panels/info/cc-info-panel.c:1355
+#: ../panels/info/cc-info-panel.c:1318
 msgid "Other Media"
 msgstr "Annet medie"
 
-#: ../panels/info/cc-info-panel.c:1386
+#: ../panels/info/cc-info-panel.c:1349
 msgid "Select an application for audio CDs"
 msgstr "Velg et program for lyd-CDer"
 
-#: ../panels/info/cc-info-panel.c:1387
+#: ../panels/info/cc-info-panel.c:1350
 msgid "Select an application for video DVDs"
 msgstr "Velg et program for video-DVDer"
 
-#: ../panels/info/cc-info-panel.c:1388
+#: ../panels/info/cc-info-panel.c:1351
 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:1389
+#: ../panels/info/cc-info-panel.c:1352
 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:1390
+#: ../panels/info/cc-info-panel.c:1353
 msgid "Select an application for software CDs"
 msgstr "Velg et program for programvare-CDer"
 
@@ -821,89 +821,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:1402
+#: ../panels/info/cc-info-panel.c:1365
 msgid "audio DVD"
 msgstr "Lyd-DVD"
 
-#: ../panels/info/cc-info-panel.c:1403
+#: ../panels/info/cc-info-panel.c:1366
 msgid "blank Blu-ray disc"
 msgstr "Tom Blu-ray-plate"
 
-#: ../panels/info/cc-info-panel.c:1404
+#: ../panels/info/cc-info-panel.c:1367
 msgid "blank CD disc"
 msgstr "Tom CD-plate"
 
-#: ../panels/info/cc-info-panel.c:1405
+#: ../panels/info/cc-info-panel.c:1368
 msgid "blank DVD disc"
 msgstr "Tom DVD-plate"
 
-#: ../panels/info/cc-info-panel.c:1406
+#: ../panels/info/cc-info-panel.c:1369
 msgid "blank HD DVD disc"
 msgstr "tom HD-DVD plate"
 
-#: ../panels/info/cc-info-panel.c:1407
+#: ../panels/info/cc-info-panel.c:1370
 msgid "Blu-ray video disc"
 msgstr "Blu-ray videoplate"
 
-#: ../panels/info/cc-info-panel.c:1408
+#: ../panels/info/cc-info-panel.c:1371
 msgid "e-book reader"
 msgstr "E-bokleser"
 
-#: ../panels/info/cc-info-panel.c:1409
+#: ../panels/info/cc-info-panel.c:1372
 msgid "HD DVD video disc"
 msgstr "HD-DVD-videoplate"
 
-#: ../panels/info/cc-info-panel.c:1410
+#: ../panels/info/cc-info-panel.c:1373
 msgid "Picture CD"
 msgstr "Bilde-CD"
 
-#: ../panels/info/cc-info-panel.c:1411
+#: ../panels/info/cc-info-panel.c:1374
 msgid "Super Video CD"
 msgstr "Super Video CD"
 
-#: ../panels/info/cc-info-panel.c:1412
+#: ../panels/info/cc-info-panel.c:1375
 msgid "Video CD"
 msgstr "Video-CD"
 
-#: ../panels/info/cc-info-panel.c:1413
+#: ../panels/info/cc-info-panel.c:1376
 msgid "Windows software"
 msgstr "Windows programvare"
 
-#: ../panels/info/cc-info-panel.c:1414
+#: ../panels/info/cc-info-panel.c:1377
 msgid "Software"
 msgstr "Programvare"
 
-#: ../panels/info/cc-info-panel.c:1537
+#: ../panels/info/cc-info-panel.c:1500
 #: ../panels/keyboard/keyboard-shortcuts.c:1697
 msgid "Section"
 msgstr "Seksjon"
 
-#: ../panels/info/cc-info-panel.c:1546 ../panels/info/info.ui.h:13
+#: ../panels/info/cc-info-panel.c:1509 ../panels/info/info.ui.h:13
 msgid "Overview"
 msgstr "Oversikt"
 
-#: ../panels/info/cc-info-panel.c:1552 ../panels/info/info.ui.h:20
+#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:20
 msgid "Default Applications"
 msgstr "Forvalgte programmer"
 
-#: ../panels/info/cc-info-panel.c:1557 ../panels/info/info.ui.h:28
+#: ../panels/info/cc-info-panel.c:1520 ../panels/info/info.ui.h:28
 msgid "Removable Media"
 msgstr "Avtagbare medier"
 
-#: ../panels/info/cc-info-panel.c:1773
+#: ../panels/info/cc-info-panel.c:1545
 #, c-format
 msgid "Version %s"
 msgstr "Versjon %s"
 
-#: ../panels/info/cc-info-panel.c:1823
+#: ../panels/info/cc-info-panel.c:1595
 msgid "Install Updates"
 msgstr "Installer oppdateringer"
 
-#: ../panels/info/cc-info-panel.c:1827
+#: ../panels/info/cc-info-panel.c:1599
 msgid "System Up-To-Date"
 msgstr "Systemet er oppdatert"
 
-#: ../panels/info/cc-info-panel.c:1831
+#: ../panels/info/cc-info-panel.c:1603
 msgid "Checking for Updates"
 msgstr "Ser etter oppdateringer"
 
@@ -1194,8 +1194,9 @@ msgstr "HÃy kontrast pà eller av"
 
 #. translators:
 #. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:241
-#: ../panels/keyboard/cc-keyboard-option.c:347
+#: ../panels/keyboard/cc-keyboard-option.c:254
+#: ../panels/keyboard/cc-keyboard-option.c:304
+#: ../panels/keyboard/cc-keyboard-option.c:436
 #: ../panels/keyboard/keyboard-shortcuts.c:1160
 #: ../panels/sound/gvc/gvc-mixer-control.c:1828
 #: ../panels/user-accounts/um-fingerprint-dialog.c:215
@@ -1203,14 +1204,98 @@ msgstr "HÃy kontrast pà eller av"
 msgid "Disabled"
 msgstr "SlÃtt av"
 
-#: ../panels/keyboard/cc-keyboard-option.c:315
+#: ../panels/keyboard/cc-keyboard-option.c:255
+msgid "Left Shift"
+msgstr "Venstre Shift"
+
+#: ../panels/keyboard/cc-keyboard-option.c:256
+msgid "Left Alt"
+msgstr "Venstre Alt"
+
+#: ../panels/keyboard/cc-keyboard-option.c:257
+msgid "Left Ctrl"
+msgstr "Venstre Ctrl"
+
+#: ../panels/keyboard/cc-keyboard-option.c:258
+msgid "Right Shift"
+msgstr "HÃyre Shift"
+
+#: ../panels/keyboard/cc-keyboard-option.c:259
+msgid "Right Alt"
+msgstr "HÃyre Alt"
+
+#: ../panels/keyboard/cc-keyboard-option.c:260
+msgid "Right Ctrl"
+msgstr "HÃyre Ctrl"
+
+#: ../panels/keyboard/cc-keyboard-option.c:261
+msgid "Left Alt+Shift"
+msgstr "Venstre Alt+Shift"
+
+#: ../panels/keyboard/cc-keyboard-option.c:262
+msgid "Right Alt+Shift"
+msgstr "HÃyre Alt+Shift"
+
+#: ../panels/keyboard/cc-keyboard-option.c:263
+msgid "Left Ctrl+Shift"
+msgstr "Venstre Ctrl+Shift"
+
+#: ../panels/keyboard/cc-keyboard-option.c:264
+msgid "Right Ctrl+Shift"
+msgstr "HÃyre Ctrl+Shift"
+
+#: ../panels/keyboard/cc-keyboard-option.c:265
+msgid "Left+Right Shift"
+msgstr "Venstre+hÃyre Shift"
+
+#: ../panels/keyboard/cc-keyboard-option.c:266
+msgid "Left+Right Alt"
+msgstr "Venstre+hÃyre Alt"
+
+#: ../panels/keyboard/cc-keyboard-option.c:267
+msgid "Left+Right Ctrl"
+msgstr "Venstre+hÃyre Ctrl"
+
+#: ../panels/keyboard/cc-keyboard-option.c:268
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
+
+#: ../panels/keyboard/cc-keyboard-option.c:269
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
+
+#: ../panels/keyboard/cc-keyboard-option.c:270
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
+
+#: ../panels/keyboard/cc-keyboard-option.c:271
+msgid "Caps"
+msgstr "Caps"
+
+#: ../panels/keyboard/cc-keyboard-option.c:272
+msgid "Shift+Caps"
+msgstr "Shift+Caps"
+
+#: ../panels/keyboard/cc-keyboard-option.c:273
+msgid "Alt+Caps"
+msgstr "Alt+Caps"
+
+#: ../panels/keyboard/cc-keyboard-option.c:274
+msgid "Ctrl+Caps"
+msgstr "Ctrl+Caps"
+
+#: ../panels/keyboard/cc-keyboard-option.c:390
 msgid "Alternative Characters Key"
 msgstr "Tast for alternative tegn"
 
-#: ../panels/keyboard/cc-keyboard-option.c:320
+#: ../panels/keyboard/cc-keyboard-option.c:395
 msgid "Compose Key"
 msgstr "Komponeringstast"
 
+#: ../panels/keyboard/cc-keyboard-option.c:399
+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"
@@ -2203,16 +2288,16 @@ msgid "Show Details in Lock Screen"
 msgstr "Vis detaljer ved lÃsing av skjerm"
 
 #: ../panels/notifications/cc-notifications-panel.c:203
-#: ../panels/power/cc-power-panel.c:1508 ../panels/power/cc-power-panel.c:1515
-#: ../panels/privacy/cc-privacy-panel.c:78
-#: ../panels/privacy/cc-privacy-panel.c:145
+#: ../panels/power/cc-power-panel.c:1557 ../panels/power/cc-power-panel.c:1564
+#: ../panels/privacy/cc-privacy-panel.c:77
+#: ../panels/privacy/cc-privacy-panel.c:144
 msgid "On"
 msgstr "PÃ"
 
 #: ../panels/notifications/cc-notifications-panel.c:203
-#: ../panels/power/cc-power-panel.c:1502 ../panels/power/cc-power-panel.c:1513
-#: ../panels/privacy/cc-privacy-panel.c:78
-#: ../panels/privacy/cc-privacy-panel.c:145
+#: ../panels/power/cc-power-panel.c:1551 ../panels/power/cc-power-panel.c:1562
+#: ../panels/privacy/cc-privacy-panel.c:77
+#: ../panels/privacy/cc-privacy-panel.c:144
 msgid "Off"
 msgstr "Av"
 
@@ -2309,18 +2394,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:168
+#: ../panels/power/cc-power-panel.c:177
 msgid "Unknown time"
 msgstr "Ukjent tid"
 
-#: ../panels/power/cc-power-panel.c:174
+#: ../panels/power/cc-power-panel.c:183
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minutt"
 msgstr[1] "%i minutter"
 
-#: ../panels/power/cc-power-panel.c:186
+#: ../panels/power/cc-power-panel.c:195
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -2329,215 +2414,219 @@ 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:194
+#: ../panels/power/cc-power-panel.c:203
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:195
+#: ../panels/power/cc-power-panel.c:204
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: ../panels/power/cc-power-panel.c:196
+#: ../panels/power/cc-power-panel.c:205
 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:215
+#: ../panels/power/cc-power-panel.c:224
 #, 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:222
+#: ../panels/power/cc-power-panel.c:231
 #, 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:227
+#: ../panels/power/cc-power-panel.c:236
 #, c-format
 msgid "%s remaining"
 msgstr "%s gjenstÃr"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:232 ../panels/power/cc-power-panel.c:260
+#: ../panels/power/cc-power-panel.c:241 ../panels/power/cc-power-panel.c:269
 msgid "Fully charged"
 msgstr "Fullt ladet"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:236 ../panels/power/cc-power-panel.c:264
+#: ../panels/power/cc-power-panel.c:245 ../panels/power/cc-power-panel.c:273
 msgid "Empty"
 msgstr "Tom"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:251
+#: ../panels/power/cc-power-panel.c:260
 msgid "Charging"
 msgstr "Lader"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:256
+#: ../panels/power/cc-power-panel.c:265
 msgid "Discharging"
 msgstr "Lader ut"
 
-#: ../panels/power/cc-power-panel.c:308
+#: ../panels/power/cc-power-panel.c:317
 #, c-format
 msgid "Estimated battery capacity: %s"
 msgstr "Estimerer batterikapasitet: %s"
 
-#: ../panels/power/cc-power-panel.c:384
+#: ../panels/power/cc-power-panel.c:393
 msgctxt "Battery name"
 msgid "Main"
 msgstr "Hoved"
 
-#: ../panels/power/cc-power-panel.c:386
+#: ../panels/power/cc-power-panel.c:395
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "Ekstra"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:468
+#: ../panels/power/cc-power-panel.c:477
 msgid "Wireless mouse"
 msgstr "TrÃdlÃs mus"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:472
+#: ../panels/power/cc-power-panel.c:481
 msgid "Wireless keyboard"
 msgstr "TrÃdlÃst tastatur"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:476
+#: ../panels/power/cc-power-panel.c:485
 msgid "Uninterruptible power supply"
 msgstr "Avbruddsfri strÃmforsyning"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:481
+#: ../panels/power/cc-power-panel.c:490
 msgid "Personal digital assistant"
 msgstr "Personlig digital assistent"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:485
+#: ../panels/power/cc-power-panel.c:494
 msgid "Cellphone"
 msgstr "Mobiltelefon"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:489
+#: ../panels/power/cc-power-panel.c:498
 msgid "Media player"
 msgstr "Musikkavspiller"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:493
+#: ../panels/power/cc-power-panel.c:502
 msgid "Tablet"
 msgstr "Tegnebrett"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:497
+#: ../panels/power/cc-power-panel.c:506
 msgid "Computer"
 msgstr "Datamaskin"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:501 ../panels/power/cc-power-panel.c:709
-#: ../panels/power/cc-power-panel.c:1795
+#: ../panels/power/cc-power-panel.c:510 ../panels/power/cc-power-panel.c:718
+#: ../panels/power/cc-power-panel.c:1844
 msgid "Battery"
 msgstr "Batteri"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:510
+#: ../panels/power/cc-power-panel.c:519
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "Lader"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:517
+#: ../panels/power/cc-power-panel.c:526
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "Advarsel"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:522
+#: ../panels/power/cc-power-panel.c:531
 msgctxt "Battery power"
 msgid "Low"
 msgstr "Lav"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:527
+#: ../panels/power/cc-power-panel.c:536
 msgctxt "Battery power"
 msgid "Good"
 msgstr "God"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:532
+#: ../panels/power/cc-power-panel.c:541
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "Fullt ladet"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:536
+#: ../panels/power/cc-power-panel.c:545
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "Tom"
 
-#: ../panels/power/cc-power-panel.c:707
+#: ../panels/power/cc-power-panel.c:716
 msgid "Batteries"
 msgstr "Batterier"
 
-#: ../panels/power/cc-power-panel.c:1048
+#: ../panels/power/cc-power-panel.c:1058
 msgid "When _idle"
 msgstr "NÃr led_ig"
 
-#: ../panels/power/cc-power-panel.c:1289
+#: ../panels/power/cc-power-panel.c:1324
 msgid "Power Saving"
 msgstr "StrÃmsparing"
 
-#: ../panels/power/cc-power-panel.c:1316
+#: ../panels/power/cc-power-panel.c:1351
 msgid "_Screen Brightness"
 msgstr "Lysstyrke for _skjerm"
 
-#: ../panels/power/cc-power-panel.c:1353
-msgid "Screen _Power Saving"
-msgstr "StrÃms_paring for skjerm"
+#: ../panels/power/cc-power-panel.c:1378
+msgid "Dim Screen when Inactive"
+msgstr "Demp skjermen av nÃr inaktiv"
+
+#: ../panels/power/cc-power-panel.c:1401
+msgid "Mark As Inactive After"
+msgstr "Merk som inaktiv etter"
 
-#: ../panels/power/cc-power-panel.c:1387
+#: ../panels/power/cc-power-panel.c:1436
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1415
+#: ../panels/power/cc-power-panel.c:1464
 msgid "_Mobile Broadband"
 msgstr "_Mobilt bredbÃnd"
 
-#: ../panels/power/cc-power-panel.c:1453
+#: ../panels/power/cc-power-panel.c:1502
 msgid "_Bluetooth"
 msgstr "_BlÃtann"
 
-#: ../panels/power/cc-power-panel.c:1504
+#: ../panels/power/cc-power-panel.c:1553
 msgid "When on battery power"
 msgstr "PÃ batteristrÃm"
 
-#: ../panels/power/cc-power-panel.c:1506
+#: ../panels/power/cc-power-panel.c:1555
 msgid "When plugged in"
 msgstr "NÃr den er koblet til strÃm"
 
-#: ../panels/power/cc-power-panel.c:1624
+#: ../panels/power/cc-power-panel.c:1673
 msgid "Suspend & Power Off"
 msgstr "Hvilemodus og slà av"
 
-#: ../panels/power/cc-power-panel.c:1653
+#: ../panels/power/cc-power-panel.c:1702
 msgid "_Automatic Suspend"
 msgstr "_Automatisk hvilemodus"
 
-#: ../panels/power/cc-power-panel.c:1673
+#: ../panels/power/cc-power-panel.c:1722
 msgid "When Battery Power is _Critical"
 msgstr "NÃr batterikapasiteten er kritisk lav"
 
-#: ../panels/power/cc-power-panel.c:1705
+#: ../panels/power/cc-power-panel.c:1754
 msgid "Power Off"
 msgstr "Slà av"
 
-#: ../panels/power/cc-power-panel.c:1845
+#: ../panels/power/cc-power-panel.c:1894
 msgid "Devices"
 msgstr "Enheter"
 
@@ -2563,41 +2652,50 @@ msgid "Power off"
 msgstr "Slà av"
 
 #: ../panels/power/power.ui.h:3 ../panels/privacy/privacy.ui.h:6
-#: ../panels/screen/screen.ui.h:6
 msgid "5 minutes"
 msgstr "5 minutter"
 
-#: ../panels/power/power.ui.h:4 ../panels/screen/screen.ui.h:7
+#: ../panels/power/power.ui.h:4
 msgid "10 minutes"
 msgstr "10 minutter"
 
 #: ../panels/power/power.ui.h:5 ../panels/privacy/privacy.ui.h:7
-#: ../panels/screen/screen.ui.h:8
 msgid "30 minutes"
 msgstr "30 minutter"
 
 #: ../panels/power/power.ui.h:6 ../panels/privacy/privacy.ui.h:8
-#: ../panels/screen/screen.ui.h:9
 msgid "1 hour"
 msgstr "1 time"
 
-#: ../panels/power/power.ui.h:7
+#: ../panels/power/power.ui.h:7 ../panels/privacy/privacy.ui.h:3
+msgid "1 minute"
+msgstr "1 minutt"
+
+#: ../panels/power/power.ui.h:8 ../panels/privacy/privacy.ui.h:4
+msgid "2 minutes"
+msgstr "2 minutter"
+
+#: ../panels/power/power.ui.h:9
+msgid "Never"
+msgstr "Aldri"
+
+#: ../panels/power/power.ui.h:10
 msgid "Automatic Suspend"
 msgstr "Automatisk hvilemodus"
 
-#: ../panels/power/power.ui.h:8 ../panels/privacy/privacy.ui.h:10
+#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:10
 msgid "_Close"
 msgstr "_Lukk"
 
-#: ../panels/power/power.ui.h:9
+#: ../panels/power/power.ui.h:12
 msgid "When on _Battery Power"
 msgstr "PÃ _batteristrÃm"
 
-#: ../panels/power/power.ui.h:10
+#: ../panels/power/power.ui.h:13
 msgid "When _Plugged In"
 msgstr "NÃr den er _koblet til strÃm"
 
-#: ../panels/power/power.ui.h:11
+#: ../panels/power/power.ui.h:14
 msgid "Delay"
 msgstr "Pause"
 
@@ -2738,7 +2836,7 @@ msgid "No printers available"
 msgstr "Ingen skrivere tilgjengelig"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1428
+#: ../panels/printers/cc-printers-panel.c:1429
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
@@ -2746,15 +2844,15 @@ msgstr[0] "%u aktiv"
 msgstr[1] "%u aktive"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1772
+#: ../panels/printers/cc-printers-panel.c:1773
 msgid "Failed to add new printer."
 msgstr "Klarte ikke à legge til ny skriver."
 
-#: ../panels/printers/cc-printers-panel.c:1937
+#: ../panels/printers/cc-printers-panel.c:1938
 msgid "Select PPD File"
 msgstr "Velg PPD-fil"
 
-#: ../panels/printers/cc-printers-panel.c:1946
+#: ../panels/printers/cc-printers-panel.c:1947
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
@@ -2762,30 +2860,30 @@ msgstr ""
 "PostScript Printer Description filer (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 
-#: ../panels/printers/cc-printers-panel.c:2251
+#: ../panels/printers/cc-printers-panel.c:2252
 msgid "No suitable driver found"
 msgstr "Ingen passende driver funnet"
 
-#: ../panels/printers/cc-printers-panel.c:2320
+#: ../panels/printers/cc-printers-panel.c:2321
 msgid "Searching for preferred driversâ"
 msgstr "SÃker etter foretrukne drivere â"
 
-#: ../panels/printers/cc-printers-panel.c:2335
+#: ../panels/printers/cc-printers-panel.c:2336
 msgid "Select from databaseâ"
 msgstr "Velg fra database â"
 
-#: ../panels/printers/cc-printers-panel.c:2344
+#: ../panels/printers/cc-printers-panel.c:2345
 msgid "Provide PPD Fileâ"
 msgstr "Oppgi en PPD-fil â"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2495
-#: ../panels/printers/cc-printers-panel.c:2518
+#: ../panels/printers/cc-printers-panel.c:2496
+#: ../panels/printers/cc-printers-panel.c:2519
 msgid "Test page"
 msgstr "Testside"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2922
+#: ../panels/printers/cc-printers-panel.c:2923
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Klarte ikke à laste brukergrensesnitt: %s"
@@ -2963,7 +3061,7 @@ msgstr "Tilstand for jobb"
 msgid "Time"
 msgstr "Tid"
 
-#: ../panels/printers/pp-jobs-dialog.c:484
+#: ../panels/printers/pp-jobs-dialog.c:498
 #, c-format
 msgid "%s Active Jobs"
 msgstr "%s aktive jobber"
@@ -3184,27 +3282,27 @@ msgstr ""
 "Beklager! Systemets utskriftstjeneste\n"
 "ser ikke ut til à vÃre tilgjengelig."
 
-#: ../panels/privacy/cc-privacy-panel.c:105
+#: ../panels/privacy/cc-privacy-panel.c:104
 msgid "Hidden"
 msgstr "Skjult"
 
-#: ../panels/privacy/cc-privacy-panel.c:105
+#: ../panels/privacy/cc-privacy-panel.c:104
 msgid "Visible"
 msgstr "Synlig"
 
-#: ../panels/privacy/cc-privacy-panel.c:271 ../panels/privacy/privacy.ui.h:32
+#: ../panels/privacy/cc-privacy-panel.c:270 ../panels/privacy/privacy.ui.h:32
 msgid "Screen Lock"
 msgstr "LÃs skjerm"
 
-#: ../panels/privacy/cc-privacy-panel.c:338 ../panels/privacy/privacy.ui.h:9
+#: ../panels/privacy/cc-privacy-panel.c:337 ../panels/privacy/privacy.ui.h:9
 msgid "Name & Visibility"
 msgstr "Navn og synlighet"
 
-#: ../panels/privacy/cc-privacy-panel.c:446 ../panels/privacy/privacy.ui.h:27
+#: ../panels/privacy/cc-privacy-panel.c:445 ../panels/privacy/privacy.ui.h:27
 msgid "Usage & History"
 msgstr "Bruk og historikk"
 
-#: ../panels/privacy/cc-privacy-panel.c:576 ../panels/privacy/privacy.ui.h:37
+#: ../panels/privacy/cc-privacy-panel.c:575 ../panels/privacy/privacy.ui.h:37
 msgid "Purge Trash & Temporary Files"
 msgstr "TÃm papirkurv og midlertidige filer"
 
@@ -3229,19 +3327,11 @@ msgstr ""
 msgid "Screen Turns Off"
 msgstr "Skjermen slÃr seg av"
 
-#: ../panels/privacy/privacy.ui.h:2 ../panels/screen/screen.ui.h:2
+#: ../panels/privacy/privacy.ui.h:2
 msgid "30 seconds"
 msgstr "30 sekunder"
 
-#: ../panels/privacy/privacy.ui.h:3 ../panels/screen/screen.ui.h:3
-msgid "1 minute"
-msgstr "1 minutt"
-
-#: ../panels/privacy/privacy.ui.h:4 ../panels/screen/screen.ui.h:4
-msgid "2 minutes"
-msgstr "2 minutter"
-
-#: ../panels/privacy/privacy.ui.h:5 ../panels/screen/screen.ui.h:5
+#: ../panels/privacy/privacy.ui.h:5
 msgid "3 minutes"
 msgstr "3 minutter"
 
@@ -3560,56 +3650,6 @@ msgstr "Dine innstillinger"
 msgid "System settings"
 msgstr "Systeminnstillinger"
 
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:1
-msgid "Brightness & Lock"
-msgstr "Lysstyrke og lÃs"
-
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:2
-msgid "Screen brightness and lock settings"
-msgstr "Innstillinger for lysstyrke og lÃsing av skjerm"
-
-#. Translators: those are keywords for the brightness and lock control-center panel
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:4
-msgid "Brightness;Lock;Dim;Blank;Monitor;"
-msgstr "Lysstyrke;LÃs;Demp;Blank;Skjerm;"
-
-#: ../panels/screen/screen.ui.h:1
-msgid "Screen turns off"
-msgstr "Skjermen slÃr seg av"
-
-#: ../panels/screen/screen.ui.h:10
-msgid "_Dim screen to save power"
-msgstr "_Demp skjermen for à spare strÃm"
-
-#: ../panels/screen/screen.ui.h:11
-msgid "Brightness"
-msgstr "Lysstyrke"
-
-#: ../panels/screen/screen.ui.h:12
-msgid "_Turn screen off when inactive for:"
-msgstr "_Slà skjermen av nÃr den har vÃrt inaktiv:"
-
-#: ../panels/screen/screen.ui.h:13
-msgid "_Lock screen after:"
-msgstr "_LÃs skjermen etter:"
-
-#. To translators: This asks whether you want to lock the screen (through the screensaver) when you're detected to be physically in your home (your house, etc.)
-#: ../panels/screen/screen.ui.h:15
-msgid "Don't lock when at home"
-msgstr "Ikke lÃs nÃr du er hjemme"
-
-#: ../panels/screen/screen.ui.h:16
-msgid "Locationsâ"
-msgstr "Lokasjoner â"
-
-#: ../panels/screen/screen.ui.h:17
-msgid "Show _notifications when locked"
-msgstr "Vis varslinger _nÃr lÃst"
-
-#: ../panels/screen/screen.ui.h:18
-msgid "Lock"
-msgstr "LÃs"
-
 #: ../panels/search/cc-search-locations-dialog.c:275
 msgid "Home"
 msgstr "Hjemme"
@@ -3669,6 +3709,166 @@ msgstr "Flytt ned"
 msgid "Preferences"
 msgstr "Brukervalg"
 
+#: ../panels/sharing/cc-sharing-panel.c:200
+msgctxt "service is enabled"
+msgid "On"
+msgstr "PÃ"
+
+#: ../panels/sharing/cc-sharing-panel.c:202
+msgctxt "service is disabled"
+msgid "Off"
+msgstr "Av"
+
+#: ../panels/sharing/cc-sharing-panel.c:311
+msgid "Choose a Folder"
+msgstr "Velg en mappe"
+
+#: ../panels/sharing/cc-sharing-panel.c:489
+msgid "Copy"
+msgstr "Kopier"
+
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1
+msgid "Sharing"
+msgstr "Deling"
+
+#. Translators: those are keywords for the sharing control-center panel
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
+msgid ""
+"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;"
+"pictures;photos;movies;server;renderer;"
+msgstr "del;deling;ssh;vert;navn;ekstern;skrivebord;blÃtann;obex;media;lyd;video;bilder;foto;filmer;tjener;"
+
+#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
+msgid "Enable or disable remote login"
+msgstr "Slà pà eller av ekstern pÃlogging"
+
+#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:2
+msgid "Authentication is required to enable or disable remote login"
+msgstr "Autentisering kreves for à slà av eller pà ekstern pÃlogging"
+
+#: ../panels/sharing/sharing.ui.h:1
+msgid "Bluetooth Sharing"
+msgstr "Deling med Bluetooth"
+
+#: ../panels/sharing/sharing.ui.h:2
+msgid ""
+"Bluetooth Sharing allows you to share files with other Bluetooth enabled "
+"devices"
+msgstr "Deling med Bluetooth lar deg dele filer med andre enheter som har Bluetooth"
+
+#: ../panels/sharing/sharing.ui.h:3
+msgid "<b>Share Public Folder</b>"
+msgstr "<b>Del offentlig mappe</b>"
+
+#: ../panels/sharing/sharing.ui.h:4
+msgid "Only share with Trusted Devices"
+msgstr "Del kun med enheter du stoler pÃ"
+
+#: ../panels/sharing/sharing.ui.h:5
+msgid "Only Receive From Trusted Devices"
+msgstr "Motta kun fra enheter du stoler pÃ"
+
+#: ../panels/sharing/sharing.ui.h:6
+msgid "<b>Save Received Files to Downloads Folder</b>"
+msgstr ""
+
+#: ../panels/sharing/sharing.ui.h:7
+msgid "<b>Computer Name</b>"
+msgstr "<b>Navn pà datamaskin</b>"
+
+#: ../panels/sharing/sharing.ui.h:8
+msgid "Some services are disabled because of no network access."
+msgstr ""
+
+#: ../panels/sharing/sharing.ui.h:9
+msgid "Media Sharing"
+msgstr "Deling av media"
+
+#: ../panels/sharing/sharing.ui.h:10
+msgid "Share Music, Photos and Videos with others on the current network."
+msgstr ""
+
+#: ../panels/sharing/sharing.ui.h:11
+msgid "<b>Share Media On This Network</b>"
+msgstr ""
+
+#: ../panels/sharing/sharing.ui.h:12
+msgid "Shared Folders"
+msgstr "Delte mapper"
+
+#: ../panels/sharing/sharing.ui.h:13
+msgid "column"
+msgstr "kolonne"
+
+#: ../panels/sharing/sharing.ui.h:14
+msgid "Add Folder"
+msgstr "Legg til mappe"
+
+#: ../panels/sharing/sharing.ui.h:15
+msgid "Remove Folder"
+msgstr "Fjern mappe"
+
+#: ../panels/sharing/sharing.ui.h:16
+msgid "Personal File Sharing"
+msgstr "Personlig fildeling"
+
+#: ../panels/sharing/sharing.ui.h:18
+#, no-c-format
+msgid ""
+"Personal File Sharing allows you to share your Public folder with others on "
+"your current network using: <a href=\"dav://%s\">dav://%s</a>"
+msgstr ""
+
+#: ../panels/sharing/sharing.ui.h:19
+msgid "<b>Share Public Folder On This Network</b>"
+msgstr ""
+
+#: ../panels/sharing/sharing.ui.h:20
+msgid "Require Password"
+msgstr "Krev passord"
+
+#: ../panels/sharing/sharing.ui.h:21
+msgid "Password"
+msgstr "Passord"
+
+#: ../panels/sharing/sharing.ui.h:22
+msgid "Remote Login"
+msgstr "Ekstern pÃlogging"
+
+#: ../panels/sharing/sharing.ui.h:24
+#, no-c-format
+msgid ""
+"Allow remote users to connect using the Secure Shell command:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
+msgstr ""
+
+#: ../panels/sharing/sharing.ui.h:26
+msgid "<b>Remote Login</b>"
+msgstr ""
+
+#: ../panels/sharing/sharing.ui.h:27
+msgid "Screen Sharing"
+msgstr "Deling av skjerm"
+
+#: ../panels/sharing/sharing.ui.h:29
+#, no-c-format
+msgid ""
+"Allow remote users to view or control your screen by connecting to: <a href="
+"\"vnc://%s\">vnc://%s</a>"
+msgstr ""
+
+#: ../panels/sharing/sharing.ui.h:30
+msgid "<b>Remote View</b>"
+msgstr ""
+
+#: ../panels/sharing/sharing.ui.h:31
+msgid "<b>Remote Control</b>"
+msgstr ""
+
+#: ../panels/sharing/sharing.ui.h:32
+msgid "Approve All Connections"
+msgstr "Godkjenn alle tilkoblinger"
+
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
 msgid "Sound"
 msgstr "Lyd"
@@ -5471,21 +5671,25 @@ msgid "Quit"
 msgstr "Avslutt"
 
 #. Add categories
-#: ../shell/gnome-control-center.c:790
+#: ../shell/gnome-control-center.c:880
 msgctxt "category"
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../shell/gnome-control-center.c:791
+#: ../shell/gnome-control-center.c:881
 msgctxt "category"
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: ../shell/gnome-control-center.c:792
+#: ../shell/gnome-control-center.c:882
 msgctxt "category"
 msgid "System"
 msgstr "System"
 
+#: ../shell/gnomecc.directory.in.h:1
+msgid "Control Center"
+msgstr "Kontrollsenter"
+
 #: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/shell.ui.h:1
 msgid "Settings"
 msgstr "Innstillinger"