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

From: Kjartan Maraas <kmaraas src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-control-center] Updated Norwegian bokmål transl ation
Date: Mon, 13 Jan 2014 23:39:17 +0000 (UTC)
commit 317e021a0b1f47af444fe0144c5005a72ab6b992
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Tue Jan 14 00:38:57 2014 +0100

    Updated Norwegian bokmål translation

 po/nb.po |  539 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 242 insertions(+), 297 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 5294153..5f9a871 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 3.11.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-03 14:42+0100\n"
-"PO-Revision-Date: 2013-11-03 14:43+0100\n"
+"POT-Creation-Date: 2014-01-14 00:34+0100\n"
+"PO-Revision-Date: 2014-01-14 00:38+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb lister ping uio no>\n"
 "Language: \n"
@@ -95,21 +95,20 @@ msgstr "Fant ingen bilder"
 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:428
-#: ../panels/bluetooth/cc-bluetooth-panel.c:640
+#: ../panels/background/cc-background-chooser-dialog.c:429
 #: ../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/display/cc-display-panel.c:1510
+#: ../panels/display/cc-display-panel.c:1953
 #: ../panels/network/connection-editor/vpn-helpers.c:245
 #: ../panels/network/connection-editor/vpn-helpers.c:374
-#: ../panels/network/net-device-wifi.c:1194
-#: ../panels/network/net-device-wifi.c:1402
+#: ../panels/network/net-device-wifi.c:1197
+#: ../panels/network/net-device-wifi.c:1405
 #: ../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:470
 #: ../panels/search/cc-search-locations-dialog.c:682
-#: ../panels/sharing/cc-sharing-panel.c:435
+#: ../panels/sharing/cc-sharing-panel.c:445
 #: ../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,7 +116,7 @@ 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:429
+#: ../panels/background/cc-background-chooser-dialog.c:430
 #: ../panels/printers/ppd-selection-dialog.ui.h:3
 #: ../panels/user-accounts/um-photo-dialog.c:98
 msgid "Select"
@@ -151,111 +150,17 @@ msgstr "Bytt bakgrunnsbilde"
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Bakgrunn;Skjerm;Skrivebord;"
 
-#: ../panels/bluetooth/bluetooth.ui.h:1
-msgid "Set Up New Device"
-msgstr "Sett opp ny enhet"
-
-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
-msgid "Remove Device"
-msgstr "Fjern enhet"
-
-#: ../panels/bluetooth/bluetooth.ui.h:3
-msgid "Connection"
-msgstr "Tilkobling"
-
-#: ../panels/bluetooth/bluetooth.ui.h:4
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/printers/printers.ui.h:14
-msgid "page 1"
-msgstr "side 1"
-
-#: ../panels/bluetooth/bluetooth.ui.h:5
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:5
-#: ../panels/printers/printers.ui.h:16
-msgid "page 2"
-msgstr "side 2"
-
-#: ../panels/bluetooth/bluetooth.ui.h:6
-msgid "Paired"
-msgstr "Koblet"
-
-#: ../panels/bluetooth/bluetooth.ui.h:7
-msgid "Type"
-msgstr "Type:"
-
-#: ../panels/bluetooth/bluetooth.ui.h:8
-#: ../panels/network/connection-editor/ce-page-ip4.c:194
-#: ../panels/network/connection-editor/ce-page-ip4.c:456
-#: ../panels/network/connection-editor/ce-page-ip6.c:196
-#: ../panels/network/connection-editor/ce-page-ip6.c:460
-msgid "Address"
-msgstr "Adresse"
-
-#: ../panels/bluetooth/bluetooth.ui.h:9
-msgid "Mouse & Touchpad Settings"
-msgstr "Innstillinger for mus og pekeplate"
-
-#: ../panels/bluetooth/bluetooth.ui.h:10
-msgid "Sound Settings"
-msgstr "Innstillinger for lyd"
-
-#: ../panels/bluetooth/bluetooth.ui.h:11
-msgid "Keyboard Settings"
-msgstr "Innstillinger for tastatur"
-
-#: ../panels/bluetooth/bluetooth.ui.h:12
-msgid "Send Files…"
-msgstr "Send filer …"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:366
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Ja"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:366
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Nei"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:479
+#: ../panels/bluetooth/cc-bluetooth-panel.c:262
 msgid "Bluetooth is disabled"
 msgstr "Bluetooth er slått av"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:484
-msgid "Bluetooth is disabled by hardware switch"
-msgstr "Bluetooth er slått av med maskinvarebryter"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:488
+#: ../panels/bluetooth/cc-bluetooth-panel.c:263
 msgid "No Bluetooth adapters found"
 msgstr "Ingen Bluetooth-kort funnet"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:587
-msgid "Visibility"
-msgstr "Synlighet"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:591
-#, c-format
-msgid "Visibility of “%s”"
-msgstr "Synlighet for «%s»"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:635
-#, c-format
-msgid "Remove '%s' from the list of devices?"
-msgstr "Fjern «%s» fra listen med enheter?"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:637
-msgid ""
-"If you remove the device, you will have to set it up again before next use."
-msgstr ""
-"Hvis du fjerner enheten vil du måtte sette den opp på nytt før du bruker den "
-"igjen."
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:641
-#: ../panels/online-accounts/cc-online-accounts-panel.c:844
-msgid "_Remove"
-msgstr "Fje_rn"
+#: ../panels/bluetooth/cc-bluetooth-panel.c:264
+msgid "Bluetooth is disabled by hardware switch"
+msgstr "Bluetooth er slått av med maskinvarebryter"
 
 #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
 msgid "Bluetooth"
@@ -603,7 +508,7 @@ msgstr "Ferdig"
 #. 15000 = 15 sec
 #. 750 = 0.75 sec
 #. Text printed on screen
-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
+#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:83
 msgid "Screen Calibration"
 msgstr "Kalibrering av skjerm"
 
@@ -1104,23 +1009,23 @@ 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:485
+#: ../panels/display/cc-display-panel.c:486
 msgid "Lid Closed"
 msgstr "Lokk lukket"
 
 #. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:488
+#: ../panels/display/cc-display-panel.c:489
 msgid "Mirrored"
 msgstr "Speilet"
 
-#: ../panels/display/cc-display-panel.c:490
-#: ../panels/display/cc-display-panel.c:2057
+#: ../panels/display/cc-display-panel.c:491
+#: ../panels/display/cc-display-panel.c:2122
 msgid "Primary"
 msgstr "Primær"
 
-#: ../panels/display/cc-display-panel.c:492
+#: ../panels/display/cc-display-panel.c:493
 #: ../panels/notifications/cc-notifications-panel.c:205
-#: ../panels/power/cc-power-panel.c:1718 ../panels/power/cc-power-panel.c:1729
+#: ../panels/power/cc-power-panel.c:1698 ../panels/power/cc-power-panel.c:1709
 #: ../panels/privacy/cc-privacy-panel.c:80
 #: ../panels/privacy/cc-privacy-panel.c:120
 #: ../panels/universal-access/cc-ua-panel.c:257
@@ -1130,82 +1035,81 @@ msgstr "Primær"
 msgid "Off"
 msgstr "Av"
 
-#: ../panels/display/cc-display-panel.c:495
+#: ../panels/display/cc-display-panel.c:496
 msgid "Secondary"
 msgstr "Sekundær"
 
-#: ../panels/display/cc-display-panel.c:1505
+#: ../panels/display/cc-display-panel.c:1506
 msgid "Arrange Combined Displays"
 msgstr "Organiser sammenslåtte skjermer"
 
-#: ../panels/display/cc-display-panel.c:1511
-#: ../panels/display/cc-display-panel.c:1927
+#: ../panels/display/cc-display-panel.c:1512
+#: ../panels/display/cc-display-panel.c:1956
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
 msgid "_Apply"
 msgstr "_Bruk"
 
-#: ../panels/display/cc-display-panel.c:1532
+#: ../panels/display/cc-display-panel.c:1533
 msgid "Drag displays to rearrange them"
 msgstr "Dra skjermer for å omorganisere dem"
 
-#. size
-#: ../panels/display/cc-display-panel.c:1991
+#: ../panels/display/cc-display-panel.c:2058
 msgid "Size"
 msgstr "Størrelse"
 
 #. aspect ratio
-#: ../panels/display/cc-display-panel.c:2006
+#: ../panels/display/cc-display-panel.c:2071
 msgid "Aspect Ratio"
 msgstr "Høyde-/breddeforhold"
 
-#: ../panels/display/cc-display-panel.c:2027
+#: ../panels/display/cc-display-panel.c:2092
 #: ../panels/printers/pp-options-dialog.c:86
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: ../panels/display/cc-display-panel.c:2058
+#: ../panels/display/cc-display-panel.c:2123
 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:2064
+#: ../panels/display/cc-display-panel.c:2129
 msgid "Secondary Display"
 msgstr "Sekundær skjerm"
 
-#: ../panels/display/cc-display-panel.c:2065
+#: ../panels/display/cc-display-panel.c:2130
 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:2072
+#: ../panels/display/cc-display-panel.c:2137
 msgid "Presentation"
 msgstr "Presentasjon"
 
-#: ../panels/display/cc-display-panel.c:2073
+#: ../panels/display/cc-display-panel.c:2138
 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:2078
+#: ../panels/display/cc-display-panel.c:2143
 msgid "Mirror"
 msgstr "Speil"
 
-#: ../panels/display/cc-display-panel.c:2079
+#: ../panels/display/cc-display-panel.c:2144
 msgid "Show your existing view on both displays"
 msgstr "Vis eksisterende visning på begge skjermer"
 
-#: ../panels/display/cc-display-panel.c:2085
+#: ../panels/display/cc-display-panel.c:2150
 msgid "Turn Off"
 msgstr "Slå av"
 
-#: ../panels/display/cc-display-panel.c:2086
+#: ../panels/display/cc-display-panel.c:2151
 msgid "Don't use this display"
 msgstr "Ikke bruk denne skjermen"
 
-#: ../panels/display/cc-display-panel.c:2302
+#: ../panels/display/cc-display-panel.c:2367
 msgid "Could not get screen information"
 msgstr "Fant ikke informasjon om skjermen"
 
-#: ../panels/display/cc-display-panel.c:2333
+#: ../panels/display/cc-display-panel.c:2398
 msgid "_Arrange Combined Displays"
 msgstr "Org_aniser sammenslåtte skjermer"
 
@@ -1223,53 +1127,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:451 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:452 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../panels/info/cc-info-panel.c:534
+#: ../panels/info/cc-info-panel.c:539
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %d-bit"
 
-#: ../panels/info/cc-info-panel.c:536
+#: ../panels/info/cc-info-panel.c:541
 #, c-format
 msgid "%d-bit"
 msgstr "%d-bit"
 
-#: ../panels/info/cc-info-panel.c:1216
+#: ../panels/info/cc-info-panel.c:1221
 msgid "Ask what to do"
 msgstr "Spør hva som skal gjøres"
 
-#: ../panels/info/cc-info-panel.c:1220
+#: ../panels/info/cc-info-panel.c:1225
 msgid "Do nothing"
 msgstr "Ikke gjør noe"
 
-#: ../panels/info/cc-info-panel.c:1224
+#: ../panels/info/cc-info-panel.c:1229
 msgid "Open folder"
 msgstr "Åpne mappe"
 
-#: ../panels/info/cc-info-panel.c:1315
+#: ../panels/info/cc-info-panel.c:1320
 msgid "Other Media"
 msgstr "Annet medie"
 
-#: ../panels/info/cc-info-panel.c:1346
+#: ../panels/info/cc-info-panel.c:1351
 msgid "Select an application for audio CDs"
 msgstr "Velg et program for lyd-CDer"
 
-#: ../panels/info/cc-info-panel.c:1347
+#: ../panels/info/cc-info-panel.c:1352
 msgid "Select an application for video DVDs"
 msgstr "Velg et program for video-DVDer"
 
-#: ../panels/info/cc-info-panel.c:1348
+#: ../panels/info/cc-info-panel.c:1353
 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:1349
+#: ../panels/info/cc-info-panel.c:1354
 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:1350
+#: ../panels/info/cc-info-panel.c:1355
 msgid "Select an application for software CDs"
 msgstr "Velg et program for programvare-CDer"
 
@@ -1278,85 +1182,85 @@ 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:1362
+#: ../panels/info/cc-info-panel.c:1367
 msgid "audio DVD"
 msgstr "Lyd-DVD"
 
-#: ../panels/info/cc-info-panel.c:1363
+#: ../panels/info/cc-info-panel.c:1368
 msgid "blank Blu-ray disc"
 msgstr "Tom Blu-ray-plate"
 
-#: ../panels/info/cc-info-panel.c:1364
+#: ../panels/info/cc-info-panel.c:1369
 msgid "blank CD disc"
 msgstr "Tom CD-plate"
 
-#: ../panels/info/cc-info-panel.c:1365
+#: ../panels/info/cc-info-panel.c:1370
 msgid "blank DVD disc"
 msgstr "Tom DVD-plate"
 
-#: ../panels/info/cc-info-panel.c:1366
+#: ../panels/info/cc-info-panel.c:1371
 msgid "blank HD DVD disc"
 msgstr "tom HD-DVD plate"
 
-#: ../panels/info/cc-info-panel.c:1367
+#: ../panels/info/cc-info-panel.c:1372
 msgid "Blu-ray video disc"
 msgstr "Blu-ray videoplate"
 
-#: ../panels/info/cc-info-panel.c:1368
+#: ../panels/info/cc-info-panel.c:1373
 msgid "e-book reader"
 msgstr "E-bokleser"
 
-#: ../panels/info/cc-info-panel.c:1369
+#: ../panels/info/cc-info-panel.c:1374
 msgid "HD DVD video disc"
 msgstr "HD-DVD-videoplate"
 
-#: ../panels/info/cc-info-panel.c:1370
+#: ../panels/info/cc-info-panel.c:1375
 msgid "Picture CD"
 msgstr "Bilde-CD"
 
-#: ../panels/info/cc-info-panel.c:1371
+#: ../panels/info/cc-info-panel.c:1376
 msgid "Super Video CD"
 msgstr "Super Video CD"
 
-#: ../panels/info/cc-info-panel.c:1372
+#: ../panels/info/cc-info-panel.c:1377
 msgid "Video CD"
 msgstr "Video-CD"
 
-#: ../panels/info/cc-info-panel.c:1373
+#: ../panels/info/cc-info-panel.c:1378
 msgid "Windows software"
 msgstr "Windows programvare"
 
-#: ../panels/info/cc-info-panel.c:1496
+#: ../panels/info/cc-info-panel.c:1501
 #: ../panels/keyboard/keyboard-shortcuts.c:1696
 msgid "Section"
 msgstr "Seksjon"
 
-#: ../panels/info/cc-info-panel.c:1505 ../panels/info/info.ui.h:13
+#: ../panels/info/cc-info-panel.c:1510 ../panels/info/info.ui.h:13
 msgid "Overview"
 msgstr "Oversikt"
 
-#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:20
+#: ../panels/info/cc-info-panel.c:1516 ../panels/info/info.ui.h:20
 msgid "Default Applications"
 msgstr "Forvalgte programmer"
 
-#: ../panels/info/cc-info-panel.c:1516 ../panels/info/info.ui.h:28
+#: ../panels/info/cc-info-panel.c:1521 ../panels/info/info.ui.h:28
 msgid "Removable Media"
 msgstr "Avtagbare medier"
 
-#: ../panels/info/cc-info-panel.c:1541
+#: ../panels/info/cc-info-panel.c:1546
 #, c-format
 msgid "Version %s"
 msgstr "Versjon %s"
 
-#: ../panels/info/cc-info-panel.c:1591
+#: ../panels/info/cc-info-panel.c:1596
 msgid "Install Updates"
 msgstr "Installer oppdateringer"
 
-#: ../panels/info/cc-info-panel.c:1595
+#: ../panels/info/cc-info-panel.c:1600
 msgid "System Up-To-Date"
 msgstr "Systemet er oppdatert"
 
-#: ../panels/info/cc-info-panel.c:1599
+#: ../panels/info/cc-info-panel.c:1604
 msgid "Checking for Updates"
 msgstr "Ser etter oppdateringer"
 
@@ -1999,6 +1903,12 @@ msgstr ""
 msgid "802.1x _Security"
 msgstr "802.1x sikkerhet"
 
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
+#: ../panels/network/connection-editor/security-page.ui.h:2
+#: ../panels/printers/printers.ui.h:14
+msgid "page 1"
+msgstr "side 1"
+
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:3
 #: ../panels/network/connection-editor/security-page.ui.h:3
 #: ../panels/network/wireless-security/eap-method-fast.ui.h:1
@@ -2012,6 +1922,12 @@ msgstr "Anony_m identitet"
 msgid "Inner _authentication"
 msgstr "Indre _autentisering"
 
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
+#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/printers/printers.ui.h:16
+msgid "page 2"
+msgstr "side 2"
+
 #: ../panels/network/connection-editor/ce-page-8021x-security.c:108
 #: ../panels/network/connection-editor/ce-page-security.c:455
 #: ../panels/network/connection-editor/details-page.ui.h:3
@@ -2073,7 +1989,7 @@ msgid "Yesterday"
 msgstr "I går"
 
 #: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:122
+#: ../panels/network/net-device-ethernet.c:125
 #: ../panels/network/net-device-wifi.c:471
 #, c-format
 msgid "%i day ago"
@@ -2126,6 +2042,13 @@ msgstr "Utmerket"
 msgid "Identity"
 msgstr "Identitet"
 
+#: ../panels/network/connection-editor/ce-page-ip4.c:194
+#: ../panels/network/connection-editor/ce-page-ip4.c:456
+#: ../panels/network/connection-editor/ce-page-ip6.c:196
+#: ../panels/network/connection-editor/ce-page-ip6.c:460
+msgid "Address"
+msgstr "Adresse"
+
 #: ../panels/network/connection-editor/ce-page-ip4.c:207
 #: ../panels/network/connection-editor/ce-page-ip4.c:469
 msgid "Netmask"
@@ -2260,15 +2183,15 @@ msgid "Link speed"
 msgstr "Hastighet for tilkobling"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:155
+#: ../panels/network/net-device-ethernet.c:158
 #: ../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:156
-#: ../panels/network/net-device-ethernet.c:160
+#: ../panels/network/net-device-ethernet.c:159
+#: ../panels/network/net-device-ethernet.c:163
 #: ../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
@@ -2276,14 +2199,14 @@ msgid "IPv6 Address"
 msgstr "IPv6-adresse"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:163
+#: ../panels/network/net-device-ethernet.c:166
 #: ../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:167
+#: ../panels/network/net-device-ethernet.c:170
 #: ../panels/network/network-mobile.ui.h:5
 #: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:8
@@ -2293,7 +2216,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:169
+#: ../panels/network/net-device-ethernet.c:172
 #: ../panels/network/network-mobile.ui.h:6
 #: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:9
@@ -2448,22 +2371,26 @@ msgid "Bond"
 msgstr "Bundet"
 
 #: ../panels/network/connection-editor/net-connection-editor.c:597
+msgid "Team"
+msgstr "Koble sammen"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:598
 msgid "Bridge"
 msgstr "Bro"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:598
+#: ../panels/network/connection-editor/net-connection-editor.c:599
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:749
+#: ../panels/network/connection-editor/net-connection-editor.c:750
 msgid "Could not load VPN plugins"
 msgstr "Klarte ikke å laste VPN-tillegg"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:818
+#: ../panels/network/connection-editor/net-connection-editor.c:819
 msgid "Import from file…"
 msgstr "Importer fil …"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:889
+#: ../panels/network/connection-editor/net-connection-editor.c:890
 msgid "Add Network Connection"
 msgstr "Legg til nettverkstilkobling"
 
@@ -2473,7 +2400,7 @@ msgid "_Reset"
 msgstr "N_ullstill"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1403
+#: ../panels/network/net-device-wifi.c:1406
 #: ../panels/network/network-wifi.ui.h:40
 msgid "_Forget"
 msgstr "_Glem"
@@ -2522,7 +2449,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:436
+#: ../panels/sharing/cc-sharing-panel.c:446
 #: ../panels/user-accounts/um-photo-dialog.c:222
 msgid "_Open"
 msgstr "_Åpne"
@@ -2605,33 +2532,39 @@ msgstr ""
 msgid "Bond slaves"
 msgstr "Koble sammen slaver"
 
+#: ../panels/network/net-device-bond.c:102
+#: ../panels/network/net-device-bridge.c:102
+#: ../panels/network/net-device-team.c:102
+msgid "(none)"
+msgstr "(ingen)"
+
 #: ../panels/network/net-device-bridge.c:77
 msgid "Bridge slaves"
 msgstr "Lag bro mellom slaver"
 
-#: ../panels/network/net-device-ethernet.c:108
+#: ../panels/network/net-device-ethernet.c:111
 #: ../panels/network/net-device-wifi.c:457
 msgid "never"
 msgstr "aldri"
 
-#: ../panels/network/net-device-ethernet.c:118
+#: ../panels/network/net-device-ethernet.c:121
 #: ../panels/network/net-device-wifi.c:467
 msgid "today"
 msgstr "i dag"
 
-#: ../panels/network/net-device-ethernet.c:120
+#: ../panels/network/net-device-ethernet.c:123
 #: ../panels/network/net-device-wifi.c:469
 msgid "yesterday"
 msgstr "i går"
 
-#: ../panels/network/net-device-ethernet.c:158
+#: ../panels/network/net-device-ethernet.c:161
 #: ../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:174
+#: ../panels/network/net-device-ethernet.c:177
 #: ../panels/network/network-wifi.ui.h:10
 msgid "Last used"
 msgstr "Sist brukt"
@@ -2641,14 +2574,14 @@ msgstr "Sist brukt"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:284
+#: ../panels/network/net-device-ethernet.c:287
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "Kablet"
 
-#: ../panels/network/net-device-ethernet.c:352
-#: ../panels/network/net-device-wifi.c:1558
+#: ../panels/network/net-device-ethernet.c:355
+#: ../panels/network/net-device-wifi.c:1561
 #: ../panels/network/network-ethernet.ui.h:3
 #: ../panels/network/network-mobile.ui.h:8
 #: ../panels/network/network-simple.ui.h:8
@@ -2656,7 +2589,7 @@ msgstr "Kablet"
 msgid "Options…"
 msgstr "Alternativer …"
 
-#: ../panels/network/net-device-ethernet.c:489
+#: ../panels/network/net-device-ethernet.c:492
 #, c-format
 msgid "Profile %d"
 msgstr "Profil %d"
@@ -2665,6 +2598,10 @@ msgstr "Profil %d"
 msgid "Add new connection"
 msgstr "Legg til ny tilkobling"
 
+#: ../panels/network/net-device-team.c:77
+msgid "Team slaves"
+msgstr "La enhetene jobbe sammen"
+
 #: ../panels/network/net-device-wifi.c:1110
 msgid ""
 "If you have a connection to the Internet other than wireless, you can set up "
@@ -2686,23 +2623,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:1192
+#: ../panels/network/net-device-wifi.c:1195
 msgid "Stop hotspot and disconnect any users?"
 msgstr "Stopp trådløst aksesspunkt og koble fra brukere?"
 
-#: ../panels/network/net-device-wifi.c:1195
+#: ../panels/network/net-device-wifi.c:1198
 msgid "_Stop Hotspot"
 msgstr "_Stopp hotspot"
 
-#: ../panels/network/net-device-wifi.c:1267
+#: ../panels/network/net-device-wifi.c:1270
 msgid "System policy prohibits use as a Hotspot"
 msgstr "Systemets regelsett forhindrer bruk som aksesspunkt"
 
-#: ../panels/network/net-device-wifi.c:1270
+#: ../panels/network/net-device-wifi.c:1273
 msgid "Wireless device does not support Hotspot mode"
 msgstr "Trådløs enhet støtter ikke hotspotmodus"
 
-#: ../panels/network/net-device-wifi.c:1399
+#: ../panels/network/net-device-wifi.c:1402
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
@@ -2710,19 +2647,19 @@ msgstr ""
 "Nettverksdetaljer for valgte nettverk, inkludert passord og egendefinert "
 "konfigurasjon vil gå tapt."
 
-#: ../panels/network/net-device-wifi.c:1726
+#: ../panels/network/net-device-wifi.c:1729
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
 msgid "History"
 msgstr "Historikk"
 
-#: ../panels/network/net-device-wifi.c:1730 ../panels/power/power.ui.h:21
+#: ../panels/network/net-device-wifi.c:1733 ../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:534
 msgid "_Close"
 msgstr "_Lukk"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1738
+#: ../panels/network/net-device-wifi.c:1741
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_Glem"
@@ -2826,6 +2763,10 @@ msgstr "Slå enhet av"
 msgid "Add Device"
 msgstr "Legg til enhet"
 
+#: ../panels/network/network.ui.h:6
+msgid "Remove Device"
+msgstr "Fjern enhet"
+
 #: ../panels/network/network-vpn.ui.h:2
 msgid "VPN Type"
 msgstr "Type VPN"
@@ -3461,6 +3402,14 @@ msgstr "CHAP"
 msgid "Don't _warn me again"
 msgstr "Ikke vis ad_varsel igjen"
 
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
+msgid "No"
+msgstr "Nei"
+
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
+msgid "Yes"
+msgstr "Ja"
+
 #: ../panels/network/wireless-security/wireless-security.c:397
 msgid "TLS"
 msgstr "TLS"
@@ -3557,7 +3506,7 @@ 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:1724 ../panels/power/cc-power-panel.c:1731
+#: ../panels/power/cc-power-panel.c:1704 ../panels/power/cc-power-panel.c:1711
 #: ../panels/privacy/cc-privacy-panel.c:80
 #: ../panels/privacy/cc-privacy-panel.c:120
 #: ../panels/universal-access/cc-ua-panel.c:257
@@ -3646,6 +3595,10 @@ msgstr "Er du sikker på at du vil fjerne kontoen?"
 msgid "This will not remove the account on the server."
 msgstr "Dette vil ikke fjerne kontoen på tjeneren."
 
+#: ../panels/online-accounts/cc-online-accounts-panel.c:844
+msgid "_Remove"
+msgstr "Fje_rn"
+
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1
 msgid "Online Accounts"
 msgstr "Kontoer på nettet"
@@ -3654,14 +3607,12 @@ msgstr "Kontoer på nettet"
 msgid "Connect to your online accounts and decide what to use them for"
 msgstr "Koble til dine kontoer på nettet og bestem hva du skal bruke dem til"
 
-#. Translators: those are keywords for the online-accounts control-center panel
+#. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
-"Kerberos;IMAP;SMTP;"
-msgstr ""
-"Google;Facebook;Twitter;Yahoo;Web;Nett;Lynmeldinger;Kalender;E-post;Kontakt;"
-"ownCloud;Kerberos;IMAP;SMTP;"
+"Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
+msgstr 
"Google;Facebook;Twitter;Yahoo;Web;Nett;Lynmeldinger;Kalender;E-post;Kontakt;ownCloud;Kerberos;IMAP;SMTP;Lomme;ReadItLater;"
 
 #: ../panels/online-accounts/online-accounts.ui.h:1
 msgid "No online accounts configured"
@@ -3683,18 +3634,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:195
+#: ../panels/power/cc-power-panel.c:183
 msgid "Unknown time"
 msgstr "Ukjent tid"
 
-#: ../panels/power/cc-power-panel.c:201
+#: ../panels/power/cc-power-panel.c:189
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minutt"
 msgstr[1] "%i minutter"
 
-#: ../panels/power/cc-power-panel.c:213
+#: ../panels/power/cc-power-panel.c:201
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3703,226 +3654,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:221
+#: ../panels/power/cc-power-panel.c:209
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:222
+#: ../panels/power/cc-power-panel.c:210
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: ../panels/power/cc-power-panel.c:223
+#: ../panels/power/cc-power-panel.c:211
 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:242
+#: ../panels/power/cc-power-panel.c:230
 #, 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:249
+#: ../panels/power/cc-power-panel.c:237
 #, 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:254
+#: ../panels/power/cc-power-panel.c:242
 #, c-format
 msgid "%s remaining"
 msgstr "%s gjenstår"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:259 ../panels/power/cc-power-panel.c:287
+#: ../panels/power/cc-power-panel.c:247 ../panels/power/cc-power-panel.c:275
 msgid "Fully charged"
 msgstr "Fullt ladet"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:263 ../panels/power/cc-power-panel.c:291
+#: ../panels/power/cc-power-panel.c:251 ../panels/power/cc-power-panel.c:279
 msgid "Empty"
 msgstr "Tom"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:278
+#: ../panels/power/cc-power-panel.c:266
 msgid "Charging"
 msgstr "Lader"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:283
+#: ../panels/power/cc-power-panel.c:271
 msgid "Discharging"
 msgstr "Lader ut"
 
-#: ../panels/power/cc-power-panel.c:403
+#: ../panels/power/cc-power-panel.c:391
 msgctxt "Battery name"
 msgid "Main"
 msgstr "Hoved"
 
-#: ../panels/power/cc-power-panel.c:405
+#: ../panels/power/cc-power-panel.c:393
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "Ekstra"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:477
+#: ../panels/power/cc-power-panel.c:465
 msgid "Wireless mouse"
 msgstr "Trådløs mus"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:480
+#: ../panels/power/cc-power-panel.c:468
 msgid "Wireless keyboard"
 msgstr "Trådløst tastatur"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:483
+#: ../panels/power/cc-power-panel.c:471
 msgid "Uninterruptible power supply"
 msgstr "Avbruddsfri strømforsyning"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:486
+#: ../panels/power/cc-power-panel.c:474
 msgid "Personal digital assistant"
 msgstr "Personlig digital assistent"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:489
+#: ../panels/power/cc-power-panel.c:477
 msgid "Cellphone"
 msgstr "Mobiltelefon"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:492
+#: ../panels/power/cc-power-panel.c:480
 msgid "Media player"
 msgstr "Musikkavspiller"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:495
+#: ../panels/power/cc-power-panel.c:483
 msgid "Tablet"
 msgstr "Tegnebrett"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:498
+#: ../panels/power/cc-power-panel.c:486
 msgid "Computer"
 msgstr "Datamaskin"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:501 ../panels/power/cc-power-panel.c:724
-#: ../panels/power/cc-power-panel.c:2055
+#: ../panels/power/cc-power-panel.c:489 ../panels/power/cc-power-panel.c:712
+#: ../panels/power/cc-power-panel.c:2035
 msgid "Battery"
 msgstr "Batteri"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:547
+#: ../panels/power/cc-power-panel.c:535
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "Lader"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:554
+#: ../panels/power/cc-power-panel.c:542
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "Advarsel"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:559
+#: ../panels/power/cc-power-panel.c:547
 msgctxt "Battery power"
 msgid "Low"
 msgstr "Lav"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:564
+#: ../panels/power/cc-power-panel.c:552
 msgctxt "Battery power"
 msgid "Good"
 msgstr "God"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:569
+#: ../panels/power/cc-power-panel.c:557
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "Fullt ladet"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:573
+#: ../panels/power/cc-power-panel.c:561
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "Tom"
 
-#: ../panels/power/cc-power-panel.c:722
+#: ../panels/power/cc-power-panel.c:710
 msgid "Batteries"
 msgstr "Batterier"
 
-#: ../panels/power/cc-power-panel.c:1124
+#: ../panels/power/cc-power-panel.c:1112
 msgid "When _idle"
 msgstr "Når led_ig"
 
-#: ../panels/power/cc-power-panel.c:1493
+#: ../panels/power/cc-power-panel.c:1459
 msgid "Power Saving"
 msgstr "Strømsparing"
 
-#: ../panels/power/cc-power-panel.c:1521
+#: ../panels/power/cc-power-panel.c:1487
 msgid "_Screen brightness"
 msgstr "Lysstyrke for _skjerm"
 
-#: ../panels/power/cc-power-panel.c:1527
+#: ../panels/power/cc-power-panel.c:1493
 msgid "_Keyboard brightness"
 msgstr "Lysstyrke for s_kjerm"
 
-#: ../panels/power/cc-power-panel.c:1537
+#: ../panels/power/cc-power-panel.c:1503
 msgid "_Dim screen when inactive"
 msgstr "_Demp skjermen når inaktiv"
 
-#: ../panels/power/cc-power-panel.c:1562
+#: ../panels/power/cc-power-panel.c:1528
 msgid "_Blank screen"
 msgstr "_Slå av skjerm"
 
-#: ../panels/power/cc-power-panel.c:1599
+#: ../panels/power/cc-power-panel.c:1565
 msgid "_Wi-Fi"
 msgstr "_Trådløs"
 
-#: ../panels/power/cc-power-panel.c:1604
+#: ../panels/power/cc-power-panel.c:1570
 msgid "Turns off wireless devices"
 msgstr "Slår av trådløse enheter"
 
-#: ../panels/power/cc-power-panel.c:1629
+#: ../panels/power/cc-power-panel.c:1595
 msgid "_Mobile broadband"
 msgstr "_Mobilt bredbånd"
 
-#: ../panels/power/cc-power-panel.c:1634
+#: ../panels/power/cc-power-panel.c:1600
 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:1669
+#: ../panels/power/cc-power-panel.c:1649
 msgid "_Bluetooth"
 msgstr "_Blåtann"
 
-#: ../panels/power/cc-power-panel.c:1720
+#: ../panels/power/cc-power-panel.c:1700
 msgid "When on battery power"
 msgstr "På batteristrøm"
 
-#: ../panels/power/cc-power-panel.c:1722
+#: ../panels/power/cc-power-panel.c:1702
 msgid "When plugged in"
 msgstr "Når den er koblet til strøm"
 
-#: ../panels/power/cc-power-panel.c:1851
+#: ../panels/power/cc-power-panel.c:1831
 msgid "Suspend & Power Off"
 msgstr "Hvilemodus og slå av"
 
-#: ../panels/power/cc-power-panel.c:1884
+#: ../panels/power/cc-power-panel.c:1864
 msgid "_Automatic suspend"
 msgstr "_Automatisk hvilemodus"
 
-#: ../panels/power/cc-power-panel.c:1908
+#: ../panels/power/cc-power-panel.c:1888
 msgid "When battery power is _critical"
 msgstr "Når batterikapasiteten er _kritisk lav"
 
-#: ../panels/power/cc-power-panel.c:1965
+#: ../panels/power/cc-power-panel.c:1945
 msgid "Power Off"
 msgstr "Slå av"
 
-#: ../panels/power/cc-power-panel.c:2102
+#: ../panels/power/cc-power-panel.c:2082
 msgid "Devices"
 msgstr "Enheter"
 
@@ -4026,7 +3977,7 @@ msgid "Authenticate"
 msgstr "Autentiser"
 
 #: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/sharing/sharing.ui.h:23
+#: ../panels/sharing/sharing.ui.h:21
 #: ../panels/user-accounts/data/account-dialog.ui.h:6
 msgid "Password"
 msgstr "Passord"
@@ -4987,21 +4938,21 @@ msgstr "Flytt ned"
 msgid "Preferences"
 msgstr "Brukervalg"
 
-#: ../panels/sharing/cc-sharing-panel.c:285
+#: ../panels/sharing/cc-sharing-panel.c:276
 msgctxt "service is enabled"
 msgid "On"
 msgstr "På"
 
-#: ../panels/sharing/cc-sharing-panel.c:287
+#: ../panels/sharing/cc-sharing-panel.c:278
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "Av"
 
-#: ../panels/sharing/cc-sharing-panel.c:432
+#: ../panels/sharing/cc-sharing-panel.c:442
 msgid "Choose a Folder"
 msgstr "Velg en mappe"
 
-#: ../panels/sharing/cc-sharing-panel.c:739
+#: ../panels/sharing/cc-sharing-panel.c:756
 msgid "Copy"
 msgstr "Kopier"
 
@@ -5042,70 +4993,62 @@ msgstr ""
 "Deling med Bluetooth lar deg dele filer med andre enheter som har Bluetooth"
 
 #: ../panels/sharing/sharing.ui.h:3
-msgid "Share Public Folder"
-msgstr "Del offentlig mappe"
-
-#: ../panels/sharing/sharing.ui.h:4
 msgid "Only Receive From Trusted Devices"
 msgstr "Motta kun fra enheter du stoler på"
 
-#: ../panels/sharing/sharing.ui.h:5
+#: ../panels/sharing/sharing.ui.h:4
 msgid "Save Received Files to Downloads Folder"
 msgstr "Lagre mottatte filer til nedlastingsmappen"
 
-#: ../panels/sharing/sharing.ui.h:6
-msgid "Only share with Trusted Devices"
-msgstr "Del kun med enheter du stoler på"
-
-#: ../panels/sharing/sharing.ui.h:7
+#: ../panels/sharing/sharing.ui.h:5
 msgid "Computer Name"
 msgstr "Navn på datamaskin"
 
-#: ../panels/sharing/sharing.ui.h:8
+#: ../panels/sharing/sharing.ui.h:6
 msgid "Personal File Sharing"
 msgstr "Personlig fildeling"
 
-#: ../panels/sharing/sharing.ui.h:9
+#: ../panels/sharing/sharing.ui.h:7
 msgid "Screen Sharing"
 msgstr "Deling av skjerm"
 
-#: ../panels/sharing/sharing.ui.h:10
+#: ../panels/sharing/sharing.ui.h:8
 msgid "Media Sharing"
 msgstr "Deling av media"
 
-#: ../panels/sharing/sharing.ui.h:11
+#: ../panels/sharing/sharing.ui.h:9
 msgid "Remote Login"
 msgstr "Ekstern pålogging"
 
-#: ../panels/sharing/sharing.ui.h:12
+#: ../panels/sharing/sharing.ui.h:10
 msgid "Some services are disabled because of no network access."
 msgstr "Npen tjenester er slått av fordi det ikke finnes nettverk."
 
-#: ../panels/sharing/sharing.ui.h:13
+#: ../panels/sharing/sharing.ui.h:11
 msgid "Share Music, Photos and Videos with others on the current network."
 msgstr "Del musikk, bilder og videoer med andre på aktivt nettverk."
 
-#: ../panels/sharing/sharing.ui.h:14
+#: ../panels/sharing/sharing.ui.h:12
 msgid "Share Media On This Network"
 msgstr "Del media på dette nettverket"
 
-#: ../panels/sharing/sharing.ui.h:15
+#: ../panels/sharing/sharing.ui.h:13
 msgid "Shared Folders"
 msgstr "Delte mapper"
 
-#: ../panels/sharing/sharing.ui.h:16
+#: ../panels/sharing/sharing.ui.h:14
 msgid "column"
 msgstr "kolonne"
 
-#: ../panels/sharing/sharing.ui.h:17
+#: ../panels/sharing/sharing.ui.h:15
 msgid "Add Folder"
 msgstr "Legg til mappe"
 
-#: ../panels/sharing/sharing.ui.h:18
+#: ../panels/sharing/sharing.ui.h:16
 msgid "Remove Folder"
 msgstr "Fjern mappe"
 
-#: ../panels/sharing/sharing.ui.h:20
+#: ../panels/sharing/sharing.ui.h:18
 #, no-c-format
 msgid ""
 "Personal File Sharing allows you to share your Public folder with others on "
@@ -5114,15 +5057,15 @@ msgstr ""
 "Personlig fildeling lar deg dele din offentlige mappe med andre på aktivt "
 "nettverk ved å bruke: <a href=\"dav://%s\"dav://%s</a>"
 
-#: ../panels/sharing/sharing.ui.h:21
+#: ../panels/sharing/sharing.ui.h:19
 msgid "Share Public Folder On This Network"
 msgstr "Del offentlig mappe på dette nettverket"
 
-#: ../panels/sharing/sharing.ui.h:22
+#: ../panels/sharing/sharing.ui.h:20
 msgid "Require Password"
 msgstr "Krev passord"
 
-#: ../panels/sharing/sharing.ui.h:25
+#: ../panels/sharing/sharing.ui.h:23
 #, no-c-format
 msgid ""
 "Allow remote users to connect using the Secure Shell command:\n"
@@ -5131,7 +5074,7 @@ msgstr ""
 "Tillat at eksterne brukere kobler til med Secure Shell-kommandoen:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/sharing.ui.h:28
+#: ../panels/sharing/sharing.ui.h:26
 #, no-c-format
 msgid ""
 "Allow remote users to view or control your screen by connecting to: <a href="
@@ -5140,19 +5083,19 @@ msgstr ""
 "Tillat eksterne brukere å se eller kontrollere din skjerm ved å koble til: "
 "<a href=\"vnc://%s\">vnc://%s</a>"
 
-#: ../panels/sharing/sharing.ui.h:29
+#: ../panels/sharing/sharing.ui.h:27
 msgid "Remote View"
 msgstr "Ekstern visning"
 
-#: ../panels/sharing/sharing.ui.h:30
+#: ../panels/sharing/sharing.ui.h:28
 msgid "Remote Control"
 msgstr "Fjernstyring"
 
-#: ../panels/sharing/sharing.ui.h:31
+#: ../panels/sharing/sharing.ui.h:29
 msgid "Approve All Connections"
 msgstr "Godkjenn alle tilkoblinger"
 
-#: ../panels/sharing/sharing.ui.h:32
+#: ../panels/sharing/sharing.ui.h:30
 msgid "Show Password"
 msgstr "Vis passord"
 
@@ -5396,7 +5339,9 @@ msgstr "Gjør det lettere å se, høre, skrive og peke og klikke"
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
 "AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
-msgstr 
"Tastatur;Mus;a11y;Tilgjengelighet;Kontrast;Zoom;Skjerm;Leser;tekst;skrift;størrelse;AccessX;Klebrige;Taster;Trege;Sprett;Mus;"
+msgstr ""
+"Tastatur;Mus;a11y;Tilgjengelighet;Kontrast;Zoom;Skjerm;Leser;tekst;skrift;"
+"størrelse;AccessX;Klebrige;Taster;Trege;Sprett;Mus;"
 
 #: ../panels/universal-access/uap.ui.h:1
 msgid "_Always Show Universal Access Menu"
@@ -6646,7 +6591,7 @@ msgstr ""
 "nede en ny tastekombinasjon for å redigere en snarvei, eller trykk "
 "slettetast for å fjerne den."
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:82
+#: ../panels/wacom/calibrator/calibrator-gui.c:84
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
@@ -6654,7 +6599,7 @@ msgstr ""
 "Vennligst tapp på målmarkørene når de vises på skjermen for å kalibrere "
 "tegnebrettet."
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:86
+#: ../panels/wacom/calibrator/calibrator-gui.c:88
 msgid "Mis-click detected, restarting..."
 msgstr "Feil klikk oppdaget. Starter på nytt …"
 
@@ -6965,11 +6910,11 @@ msgstr "Panel som skal vises"
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[PANEL] [ARGUMENT …]"
 
-#: ../shell/cc-application.c:142
+#: ../shell/cc-application.c:145
 msgid "- Settings"
 msgstr "- Innstillinger"
 
-#: ../shell/cc-application.c:160
+#: ../shell/cc-application.c:163
 #, c-format
 msgid ""
 "%s\n"
@@ -6979,15 +6924,15 @@ msgstr ""
 "Kjøre «%s --help» for å se en full liste med tilgjengelige "
 "kommandolinjeflagg.\n"
 
-#: ../shell/cc-application.c:190
+#: ../shell/cc-application.c:193
 msgid "Available panels:"
 msgstr "Tilgjengelige paneler:"
 
-#: ../shell/cc-application.c:325
+#: ../shell/cc-application.c:328
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../shell/cc-application.c:326
+#: ../shell/cc-application.c:329
 msgid "Quit"
 msgstr "Avslutt"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]