[gnome-control-center] Updated Norwegian bokmål translation.
- From: Kjartan Maraas <kmaraas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] Updated Norwegian bokmål translation.
- Date: Sat, 15 Oct 2016 14:50:10 +0000 (UTC)
commit fa14bc5262d177e04b357112d42db6ae06bedfcc
Author: Kjartan Maraas <kmaraas gnome org>
Date: Sat Oct 15 16:50:01 2016 +0200
Updated Norwegian bokmål translation.
po/nb.po | 1822 ++++++++++++++++++++++++++++++++------------------------------
1 files changed, 946 insertions(+), 876 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 08e6081..f772bdc 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,10 +7,10 @@
# Åka Sikrom <a4NOSPAMPLEASETHANKYOU alfakrøll hush dått com>, 2014-2015.
msgid ""
msgstr ""
-"Project-Id-Version: gnome-control-center 3.21.x\n"
+"Project-Id-Version: gnome-control-center 3.23.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-03 22:57+0200\n"
-"PO-Revision-Date: 2016-05-03 23:00+0200\n"
+"POT-Creation-Date: 2016-10-15 16:45+0200\n"
+"PO-Revision-Date: 2016-10-15 16:49+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
"Language-Team: Norwegian bokmål <i18n-nb lister ping uio no>\n"
"Language: nb\n"
@@ -90,7 +90,7 @@ msgstr "Fant ingen bilder"
#. * directory in the string below when XDG_PICTURES_DIR is
#. * undefined
#: ../panels/background/cc-background-chooser-dialog.c:561
-#: ../panels/search/cc-search-locations-dialog.c:274
+#: ../panels/search/cc-search-locations-dialog.c:302
msgid "Home"
msgstr "Hjem"
@@ -105,25 +105,24 @@ msgstr "Du kan legge til bilder i mappen «%s» for å vise dem her"
#: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
#: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:1561
-#: ../panels/display/cc-display-panel.c:2205
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+#: ../panels/display/cc-display-panel.c:1571
+#: ../panels/display/cc-display-panel.c:2217
#: ../panels/network/connection-editor/connection-editor.ui.h:1
-#: ../panels/network/connection-editor/vpn-helpers.c:250
-#: ../panels/network/connection-editor/vpn-helpers.c:379
-#: ../panels/network/net-device-wifi.c:1281
-#: ../panels/network/net-device-wifi.c:1481
+#: ../panels/network/connection-editor/vpn-helpers.c:181
+#: ../panels/network/connection-editor/vpn-helpers.c:310
+#: ../panels/network/net-device-wifi.c:1298
+#: ../panels/network/net-device-wifi.c:1535
#: ../panels/network/network-wifi.ui.h:1
-#: ../panels/printers/cc-printers-panel.c:2052
-#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:982
+#: ../panels/printers/cc-printers-panel.c:2091
+#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/privacy/cc-privacy-panel.c:1048
#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:681
+#: ../panels/search/cc-search-locations-dialog.c:637
#: ../panels/sharing/cc-sharing-panel.c:372
-#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#: ../panels/user-accounts/data/account-dialog.ui.h:2
+#: ../panels/user-accounts/data/join-dialog.ui.h:2
#: ../panels/user-accounts/data/password-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-dialog.c:1476
-#: ../panels/user-accounts/um-fingerprint-dialog.c:266
+#: ../panels/user-accounts/um-fingerprint-dialog.c:265
#: ../panels/user-accounts/um-photo-dialog.c:94
#: ../panels/user-accounts/um-photo-dialog.c:217
#: ../panels/user-accounts/um-user-panel.c:705
@@ -220,7 +219,7 @@ msgstr "del;deling;bluetooth;obex;"
#. TRANSLATORS: The user has to attach the sensor to the screen
#: ../panels/color/cc-color-calibrate.c:361
-msgid "Place your calibration device over the square and press 'Start'"
+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
@@ -228,7 +227,7 @@ msgstr "Plasser kalibreringsenheten over firkanten og trykk «Start»"
#. * what to do...
#: ../panels/color/cc-color-calibrate.c:367
msgid ""
-"Move your calibration device to the calibrate position and press 'Continue'"
+"Move your calibration device to the calibrate position and press “Continue”"
msgstr "Flytt kalibreringsenheten til kalibreringsposisjon og trykk «Fortsett»"
#. TRANSLATORS: Some calibration devices need the user to move a
@@ -236,7 +235,7 @@ msgstr "Flytt kalibreringsenheten til kalibreringsposisjon og trykk «Fortsett»
#. * what to do...
#: ../panels/color/cc-color-calibrate.c:373
msgid ""
-"Move your calibration device to the surface position and press 'Continue'"
+"Move your calibration device to the surface position and press “Continue”"
msgstr "Flytt kalibreringsenheten til overflateposisjon og trykk «Fortsett»"
#. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
@@ -383,7 +382,7 @@ msgstr "Støttede ICC-profiler"
#. TRANSLATORS: filter name on the file->open dialog
#: ../panels/color/cc-color-panel.c:244
-#: ../panels/network/wireless-security/eap-method-fast.c:420
+#: ../panels/network/wireless-security/eap-method-fast.c:417
msgid "All files"
msgstr "Alle filer"
@@ -424,7 +423,7 @@ msgid "Save Profile"
msgstr "Lagre profil"
#: ../panels/color/cc-color-panel.c:964
-#: ../panels/network/connection-editor/vpn-helpers.c:380
+#: ../panels/network/connection-editor/vpn-helpers.c:311
msgid "_Save"
msgstr "_Lagre"
@@ -680,23 +679,23 @@ msgstr ""
"Windows> systemer kan være nyttig."
#: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:731
+#: ../panels/user-accounts/um-fingerprint-dialog.c:730
msgid "Summary"
msgstr "Sammendrag"
#: ../panels/color/color.ui.h:28
-msgid "Add profile"
-msgstr "Legg til profil:"
+msgid "Add Profile"
+msgstr "Legg til profil"
#: ../panels/color/color.ui.h:29
msgid "_Import File…"
msgstr "_Importer fil …"
-#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3
-#: ../panels/network/connection-editor/net-connection-editor.c:518
-#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/color/color.ui.h:31
+#: ../panels/network/connection-editor/net-connection-editor.c:546
+#: ../panels/printers/new-printer-dialog.ui.h:4
#: ../panels/region/input-chooser.ui.h:3
-#: ../panels/user-accounts/um-account-dialog.c:1477
+#: ../panels/user-accounts/data/account-dialog.ui.h:3
msgid "_Add"
msgstr "_Legg til"
@@ -874,12 +873,12 @@ msgid "No languages found"
msgstr "Fant ingen språk"
#: ../panels/common/cc-util.c:127
-#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/network/connection-editor/ce-page-details.c:100
msgid "Today"
msgstr "I dag"
#: ../panels/common/cc-util.c:131
-#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/network/connection-editor/ce-page-details.c:102
msgid "Yesterday"
msgstr "I går"
@@ -1085,25 +1084,25 @@ 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:573
+#: ../panels/display/cc-display-panel.c:583
msgid "Lid Closed"
msgstr "Lokk lukket"
#. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:576
+#: ../panels/display/cc-display-panel.c:586
msgid "Mirrored"
msgstr "Speilet"
-#: ../panels/display/cc-display-panel.c:578
-#: ../panels/display/cc-display-panel.c:2429
+#: ../panels/display/cc-display-panel.c:588
+#: ../panels/display/cc-display-panel.c:2440
msgid "Primary"
msgstr "Primær"
-#: ../panels/display/cc-display-panel.c:580
+#: ../panels/display/cc-display-panel.c:590
#: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938
-#: ../panels/privacy/cc-privacy-panel.c:172
-#: ../panels/privacy/cc-privacy-panel.c:239
+#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
#: ../panels/universal-access/cc-ua-panel.c:269
#: ../panels/universal-access/cc-ua-panel.c:590
#: ../panels/universal-access/cc-ua-panel.c:603
@@ -1113,116 +1112,116 @@ msgstr "Primær"
msgid "Off"
msgstr "Av"
-#: ../panels/display/cc-display-panel.c:583
+#: ../panels/display/cc-display-panel.c:593
msgid "Secondary"
msgstr "Sekundær"
#. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1558
+#: ../panels/display/cc-display-panel.c:1568
msgid "Arrange Combined Displays"
msgstr "Organiser sammenslåtte skjermer"
-#: ../panels/display/cc-display-panel.c:1562
-#: ../panels/display/cc-display-panel.c:2206
+#: ../panels/display/cc-display-panel.c:1572
+#: ../panels/display/cc-display-panel.c:2218
#: ../panels/network/connection-editor/connection-editor.ui.h:2
#: ../panels/network/network-wifi.ui.h:2
msgid "_Apply"
msgstr "_Bruk"
-#: ../panels/display/cc-display-panel.c:1586
+#: ../panels/display/cc-display-panel.c:1596
msgid "Drag displays to rearrange them"
msgstr "Dra skjermer for å omorganisere dem"
#. translators: example string is "60 Hz (NTSC)"
#. * NTSC is https://en.wikipedia.org/wiki/NTSC
-#: ../panels/display/cc-display-panel.c:1792
+#: ../panels/display/cc-display-panel.c:1803
#, c-format
msgid "%d Hz (NTSC)"
msgstr "%d Hz (NTSC)"
#. translators: example string is "60 Hz"
-#: ../panels/display/cc-display-panel.c:1798
+#: ../panels/display/cc-display-panel.c:1809
#, c-format
msgid "%d Hz"
msgstr "%d Hz"
-#: ../panels/display/cc-display-panel.c:2258
+#: ../panels/display/cc-display-panel.c:2270
msgid "Rotate counterclockwise by 90°"
msgstr "Roter mot klokken med 90°"
-#: ../panels/display/cc-display-panel.c:2276
+#: ../panels/display/cc-display-panel.c:2288
msgid "Rotate by 180°"
msgstr "Roter med 180°"
-#: ../panels/display/cc-display-panel.c:2294
+#: ../panels/display/cc-display-panel.c:2306
msgid "Rotate clockwise by 90°"
msgstr "Roter med klokken med 90°"
-#: ../panels/display/cc-display-panel.c:2315
+#: ../panels/display/cc-display-panel.c:2327
msgid "Size"
msgstr "Størrelse"
#. aspect ratio
-#: ../panels/display/cc-display-panel.c:2330
+#: ../panels/display/cc-display-panel.c:2342
msgid "Aspect Ratio"
msgstr "Høyde-/breddeforhold"
-#: ../panels/display/cc-display-panel.c:2353
+#: ../panels/display/cc-display-panel.c:2365
#: ../panels/printers/pp-options-dialog.c:85
msgid "Resolution"
msgstr "Oppløsning"
-#: ../panels/display/cc-display-panel.c:2374
+#: ../panels/display/cc-display-panel.c:2385
msgid "Adjust for TV"
msgstr "Juster for TV"
-#: ../panels/display/cc-display-panel.c:2398
+#: ../panels/display/cc-display-panel.c:2409
msgid "Refresh Rate"
msgstr "Oppfriskingshastighet"
-#: ../panels/display/cc-display-panel.c:2430
+#: ../panels/display/cc-display-panel.c:2441
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:2436
+#: ../panels/display/cc-display-panel.c:2447
msgid "Secondary Display"
msgstr "Sekundær skjerm"
-#: ../panels/display/cc-display-panel.c:2437
+#: ../panels/display/cc-display-panel.c:2448
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:2444
+#: ../panels/display/cc-display-panel.c:2455
msgid "Presentation"
msgstr "Presentasjon"
-#: ../panels/display/cc-display-panel.c:2445
+#: ../panels/display/cc-display-panel.c:2456
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:2450
+#: ../panels/display/cc-display-panel.c:2461
msgid "Mirror"
msgstr "Speil"
-#: ../panels/display/cc-display-panel.c:2451
+#: ../panels/display/cc-display-panel.c:2462
msgid "Show your existing view on both displays"
msgstr "Vis eksisterende visning på begge skjermer"
-#: ../panels/display/cc-display-panel.c:2457
+#: ../panels/display/cc-display-panel.c:2468
msgid "Turn Off"
msgstr "Slå av"
-#: ../panels/display/cc-display-panel.c:2458
-msgid "Don't use this display"
+#: ../panels/display/cc-display-panel.c:2469
+msgid "Don’t use this display"
msgstr "Ikke bruk denne skjermen"
-#: ../panels/display/cc-display-panel.c:2769
+#: ../panels/display/cc-display-panel.c:2780
msgid "Could not get screen information"
msgstr "Fant ikke informasjon om skjermen"
-#: ../panels/display/cc-display-panel.c:2800
+#: ../panels/display/cc-display-panel.c:2811
msgid "_Arrange Combined Displays"
msgstr "Org_aniser sammenslåtte skjermer"
@@ -1245,53 +1244,63 @@ msgid "Wayland"
msgstr "Wayland"
#. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123
msgid "Unknown"
msgstr "Ukjent"
-#: ../panels/info/cc-info-panel.c:433
+#: ../panels/info/cc-info-panel.c:481
+#, c-format
+msgid "%s %d-bit (Build ID: %s)"
+msgstr "%s %d-bit (Bygg-ID: %s)"
+
+#: ../panels/info/cc-info-panel.c:483
+#, c-format
+msgid "%d-bit (Build ID: %s)"
+msgstr ""
+
+#: ../panels/info/cc-info-panel.c:491
#, c-format
msgid "%s %d-bit"
msgstr "%s %d-bit"
-#: ../panels/info/cc-info-panel.c:435
+#: ../panels/info/cc-info-panel.c:493
#, c-format
msgid "%d-bit"
msgstr "%d-bit"
-#: ../panels/info/cc-info-panel.c:1115
+#: ../panels/info/cc-info-panel.c:1174
msgid "Ask what to do"
msgstr "Spør hva som skal gjøres"
-#: ../panels/info/cc-info-panel.c:1119
+#: ../panels/info/cc-info-panel.c:1178
msgid "Do nothing"
msgstr "Ikke gjør noe"
-#: ../panels/info/cc-info-panel.c:1123
+#: ../panels/info/cc-info-panel.c:1182
msgid "Open folder"
msgstr "Åpne mappe"
-#: ../panels/info/cc-info-panel.c:1214
+#: ../panels/info/cc-info-panel.c:1273
msgid "Other Media"
msgstr "Annet medie"
-#: ../panels/info/cc-info-panel.c:1245
+#: ../panels/info/cc-info-panel.c:1304
msgid "Select an application for audio CDs"
msgstr "Velg et program for lyd-CDer"
-#: ../panels/info/cc-info-panel.c:1246
+#: ../panels/info/cc-info-panel.c:1305
msgid "Select an application for video DVDs"
msgstr "Velg et program for video-DVDer"
-#: ../panels/info/cc-info-panel.c:1247
+#: ../panels/info/cc-info-panel.c:1306
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:1248
+#: ../panels/info/cc-info-panel.c:1307
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:1249
+#: ../panels/info/cc-info-panel.c:1308
msgid "Select an application for software CDs"
msgstr "Velg et program for programvare-CDer"
@@ -1300,72 +1309,71 @@ 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:1261
+#: ../panels/info/cc-info-panel.c:1320
msgid "audio DVD"
msgstr "Lyd-DVD"
-#: ../panels/info/cc-info-panel.c:1262
+#: ../panels/info/cc-info-panel.c:1321
msgid "blank Blu-ray disc"
msgstr "Tom Blu-ray-plate"
-#: ../panels/info/cc-info-panel.c:1263
+#: ../panels/info/cc-info-panel.c:1322
msgid "blank CD disc"
msgstr "Tom CD-plate"
-#: ../panels/info/cc-info-panel.c:1264
+#: ../panels/info/cc-info-panel.c:1323
msgid "blank DVD disc"
msgstr "Tom DVD-plate"
-#: ../panels/info/cc-info-panel.c:1265
+#: ../panels/info/cc-info-panel.c:1324
msgid "blank HD DVD disc"
msgstr "tom HD-DVD plate"
-#: ../panels/info/cc-info-panel.c:1266
+#: ../panels/info/cc-info-panel.c:1325
msgid "Blu-ray video disc"
msgstr "Blu-ray videoplate"
-#: ../panels/info/cc-info-panel.c:1267
+#: ../panels/info/cc-info-panel.c:1326
msgid "e-book reader"
msgstr "E-bokleser"
-#: ../panels/info/cc-info-panel.c:1268
+#: ../panels/info/cc-info-panel.c:1327
msgid "HD DVD video disc"
msgstr "HD-DVD-videoplate"
-#: ../panels/info/cc-info-panel.c:1269
+#: ../panels/info/cc-info-panel.c:1328
msgid "Picture CD"
msgstr "Bilde-CD"
-#: ../panels/info/cc-info-panel.c:1270
+#: ../panels/info/cc-info-panel.c:1329
msgid "Super Video CD"
msgstr "Super Video CD"
-#: ../panels/info/cc-info-panel.c:1271
+#: ../panels/info/cc-info-panel.c:1330
msgid "Video CD"
msgstr "Video-CD"
-#: ../panels/info/cc-info-panel.c:1272
+#: ../panels/info/cc-info-panel.c:1331
msgid "Windows software"
msgstr "Windows programvare"
-#: ../panels/info/cc-info-panel.c:1395
-#: ../panels/keyboard/keyboard-shortcuts.c:1949
+#: ../panels/info/cc-info-panel.c:1454
msgid "Section"
msgstr "Seksjon"
-#: ../panels/info/cc-info-panel.c:1404 ../panels/info/info.ui.h:14
+#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14
msgid "Overview"
msgstr "Oversikt"
-#: ../panels/info/cc-info-panel.c:1410 ../panels/info/info.ui.h:21
+#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21
msgid "Default Applications"
msgstr "Forvalgte programmer"
-#: ../panels/info/cc-info-panel.c:1415 ../panels/info/info.ui.h:29
+#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29
msgid "Removable Media"
msgstr "Avtagbare medier"
-#: ../panels/info/cc-info-panel.c:1440
+#: ../panels/info/cc-info-panel.c:1499
#, c-format
msgid "Version %s"
msgstr "Versjon %s"
@@ -1554,8 +1562,9 @@ msgstr "Oppstartere"
msgid "Launch help browser"
msgstr "Start hjelpleser"
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606
-#: ../shell/gnome-control-center.desktop.in.in.h:1
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274
+#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584
+#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
msgid "Settings"
msgstr "Innstillinger"
@@ -1663,14 +1672,24 @@ msgstr "Mindre tekststørrelse"
msgid "High contrast on or off"
msgstr "Høy kontrast på eller av"
+#: ../panels/keyboard/cc-keyboard-manager.c:514
+#: ../panels/keyboard/cc-keyboard-manager.c:522
+#: ../panels/keyboard/cc-keyboard-manager.c:830
+msgid "Custom Shortcuts"
+msgstr "Egendefinerte snarveier"
+
+#. This label is displayed in a treeview cell displaying
+#. * a disabled accelerator key combination.
+#.
#. translators:
#. * The device has been disabled
#: ../panels/keyboard/cc-keyboard-option.c:276
#: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:1220
+#: ../panels/keyboard/keyboard-shortcuts.c:440
+#: ../panels/keyboard/shortcut-editor.ui.h:2
#: ../panels/network/network-wifi.ui.h:31
#: ../panels/sound/gvc/gvc-mixer-control.c:1830
-#: ../panels/user-accounts/um-fingerprint-dialog.c:215
+#: ../panels/user-accounts/um-fingerprint-dialog.c:213
msgid "Disabled"
msgstr "Slått av"
@@ -1694,6 +1713,36 @@ msgstr "Komponeringstast"
msgid "Modifiers-only switch to next source"
msgstr "Bytt til neste kilde kun med endringstaster"
+#: ../panels/keyboard/cc-keyboard-panel.c:217
+msgid "Reset the shortcut to its default value"
+msgstr "Nullstill snarveien til sin forvalgte verdi"
+
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357
+#, c-format
+msgid ""
+"%s is already being used for <b>%s</b>. If you replace it, %s will be "
+"disabled"
+msgstr ""
+"%s brukes allerede for <b>%s</b>. Hvis du erstatter den vil %s bli slått av"
+
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514
+msgid "Set Custom Shortcut"
+msgstr "Sett egendefinert snarvei"
+
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514
+msgid "Set Shortcut"
+msgstr "Sett snarvei"
+
+#. Setup the top label
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523
+#, c-format
+msgid "Enter new shortcut to change <b>%s</b>."
+msgstr "Oppgi ny snarvei for å endre <b>%s</b>."
+
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:945
+msgid "Add Custom Shortcut"
+msgstr "Legg til egendefinert snarvei"
+
#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
msgid "Keyboard"
@@ -1709,93 +1758,72 @@ msgid "Shortcut;Repeat;Blink;"
msgstr "Snarvei;Repetisjon;Blinking;"
#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
-msgid "Custom Shortcut"
-msgstr "Egendefinert snarvei"
+msgid "No keyboard shortcut found"
+msgstr "Ingen tastatursnarvei funnet"
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
-msgid "_Name:"
-msgstr "_Navn:"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+msgid "Try a different search"
+msgstr "Prøv et annet søk"
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
-msgid "C_ommand:"
-msgstr "K_ommando:"
+#: ../panels/keyboard/shortcut-editor.ui.h:1
+msgid "Press Esc to cancel."
+msgstr "Trykk Esc for å avbryte."
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
-msgid "Add Shortcut"
-msgstr "Legg til snarvei"
+#: ../panels/keyboard/shortcut-editor.ui.h:3
+#: ../panels/sound/gvc-mixer-dialog.c:1493
+#: ../panels/sound/gvc-sound-theme-chooser.c:564
+msgid "Name"
+msgstr "Navn"
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
-msgid "Remove Shortcut"
-msgstr "Fjern snarvei"
+#: ../panels/keyboard/shortcut-editor.ui.h:4
+msgid "Command"
+msgstr "Kommando"
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
-msgid ""
-"To edit a shortcut, click the row and hold down the new keys or press "
-"Backspace to clear."
-msgstr ""
-"Klikk på tilhørende rad og skriv inn en ny tastekombinasjon for å redigere "
-"en snarveitast, eller trykk slettetast for å fjerne den."
+#: ../panels/keyboard/shortcut-editor.ui.h:5
+msgid "Shortcut"
+msgstr "Snarvei"
-#: ../panels/keyboard/keyboard-shortcuts.c:633
-#: ../panels/keyboard/keyboard-shortcuts.c:641
-msgid "Custom Shortcuts"
-msgstr "Egendefinerte snarveier"
+#: ../panels/keyboard/shortcut-editor.ui.h:6
+msgid "Edit"
+msgstr "Rediger"
-#: ../panels/keyboard/keyboard-shortcuts.c:858
-msgid "<Unknown Action>"
-msgstr "<Ukjent handling>"
+#: ../panels/keyboard/shortcut-editor.ui.h:7
+msgctxt "button"
+msgid "Set Shortcut"
+msgstr "Sett snarvei"
-#: ../panels/keyboard/keyboard-shortcuts.c:1359
-#, c-format
-msgid ""
-"The shortcut \"%s\" cannot be used because it will become impossible to type "
-"using this key.\n"
-"Please try with a key such as Control, Alt or Shift at the same time."
-msgstr ""
-"Snarvei «%s» kan ikke brukes fordi det vil være umulig å skrive med denne "
-"tasten.\n"
-"Prøv en tastekombinasjon som består av Control, Alt eller Shift."
+#: ../panels/keyboard/shortcut-editor.ui.h:8
+#: ../panels/network/network-wifi.ui.h:20
+msgid "None"
+msgstr "Ingen"
-#: ../panels/keyboard/keyboard-shortcuts.c:1389
-#, c-format
-msgid ""
-"The shortcut \"%s\" is already used for\n"
-"\"%s\""
-msgstr ""
-"Snarvei «%s» er allerede brukt for\n"
-"«%s»"
+#: ../panels/keyboard/shortcut-editor.ui.h:9
+msgid "Remove"
+msgstr "Fjern"
-#: ../panels/keyboard/keyboard-shortcuts.c:1394
-#, c-format
-msgid ""
-"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
-msgstr "Hvis du omfordeler snarveien til «%s» fjernes snarveien til «%s»."
+#: ../panels/keyboard/shortcut-editor.ui.h:10
+msgid "Enter the new shortcut"
+msgstr "Oppgi den nye snarveien"
-#: ../panels/keyboard/keyboard-shortcuts.c:1400
-msgid "_Reassign"
-msgstr "_Omfordel"
+#: ../panels/keyboard/shortcut-editor.ui.h:11
+#: ../panels/printers/authentication-dialog.ui.h:2
+#: ../panels/printers/ppd-selection-dialog.ui.h:2
+msgid "Cancel"
+msgstr "Avbryt"
-#: ../panels/keyboard/keyboard-shortcuts.c:1441
-#, c-format
-msgid ""
-"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to "
-"automatically set it to \"%s\"?"
-msgstr ""
-"Snarveien «%s» forbindes med snarvei «%s». Vil du endre denne til «%s» "
-"automatisk?"
+#: ../panels/keyboard/shortcut-editor.ui.h:12
+#: ../panels/network/connection-editor/ce-page-ip4.c:305
+#: ../panels/network/connection-editor/ce-page-ip6.c:277
+msgid "Add"
+msgstr "Legg til"
-#: ../panels/keyboard/keyboard-shortcuts.c:1451
-#, c-format
-msgid ""
-"\"%s\" is currently associated with \"%s\", this shortcut will be disabled "
-"if you move forward."
-msgstr ""
-"«%s» er assosiert med «%s», denne snarveien vil bli slått av hvis du går "
-"videre."
+#: ../panels/keyboard/shortcut-editor.ui.h:13
+msgid "Replace"
+msgstr "Erstatt"
-#: ../panels/keyboard/keyboard-shortcuts.c:1458
-msgid "_Assign"
-msgstr "_Tildel"
+#: ../panels/keyboard/shortcut-editor.ui.h:14
+msgid "Set"
+msgstr "Sett"
#: ../panels/mouse/cc-mouse-panel.c:82
msgid "Test Your _Settings"
@@ -1872,6 +1900,10 @@ msgid "Tap to Click"
msgstr "Tapp for å klikke"
#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+msgid "Two-finger Scrolling"
+msgstr "Rulling med to fingre"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:16
msgid "Edge Scrolling"
msgstr "Kantrulling"
@@ -1910,11 +1942,11 @@ msgstr "Enkeltklikk, sekundærknapp"
#. TRANSLATORS: this is to disable the radio hardware in the
#. * network panel
-#: ../panels/network/cc-network-panel.c:358
+#: ../panels/network/cc-network-panel.c:349
msgid "Air_plane Mode"
msgstr "_Flymodus"
-#: ../panels/network/cc-network-panel.c:967
+#: ../panels/network/cc-network-panel.c:953
msgid "Network proxy"
msgstr "Nettverksmellomtjener"
@@ -1922,17 +1954,17 @@ msgstr "Nettverksmellomtjener"
#. * window for vpn connections, it is also used to display
#. * vpn connections in the device list.
#.
-#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278
-#: ../panels/network/net-vpn.c:432
+#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283
+#: ../panels/network/net-vpn.c:440
#, c-format
msgid "%s VPN"
msgstr "%s VPN"
-#: ../panels/network/cc-network-panel.c:1300
+#: ../panels/network/cc-network-panel.c:1194
msgid "Oops, something has gone wrong. Please contact your software vendor."
msgstr "Oi! Noe gikk galt. Kontakt programvareleverandøren."
-#: ../panels/network/cc-network-panel.c:1306
+#: ../panels/network/cc-network-panel.c:1200
msgid "NetworkManager needs to be running."
msgstr "NetworkManager må kjøre."
@@ -1948,7 +1980,7 @@ msgstr "side 1"
#: ../panels/network/connection-editor/8021x-security-page.ui.h:3
#: ../panels/network/connection-editor/security-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
msgid "Anony_mous identity"
@@ -1965,64 +1997,64 @@ msgstr "Indre _autentisering"
msgid "page 2"
msgstr "side 2"
-#: ../panels/network/connection-editor/ce-page-8021x-security.c:108
-#: ../panels/network/connection-editor/ce-page-security.c:469
+#: ../panels/network/connection-editor/ce-page-8021x-security.c:101
+#: ../panels/network/connection-editor/ce-page-security.c:459
#: ../panels/network/connection-editor/details-page.ui.h:3
#: ../panels/network/network-wifi.ui.h:6
msgid "Security"
msgstr "Sikkerhet"
-#: ../panels/network/connection-editor/ce-page.c:507
+#: ../panels/network/connection-editor/ce-page.c:481
msgid "automatic"
msgstr "automatisk"
-#: ../panels/network/connection-editor/ce-page.c:545
+#: ../panels/network/connection-editor/ce-page.c:521
#, c-format
msgid "Profile %d"
msgstr "Profil %d"
#. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:219
-#: ../panels/network/net-device-wifi.c:395
+#: ../panels/network/connection-editor/ce-page-details.c:50
+#: ../panels/network/net-device-wifi.c:214
+#: ../panels/network/net-device-wifi.c:390
msgid "WEP"
msgstr "WEP"
#. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:223
-#: ../panels/network/net-device-wifi.c:400
+#: ../panels/network/connection-editor/ce-page-details.c:54
+#: ../panels/network/net-device-wifi.c:218
+#: ../panels/network/net-device-wifi.c:395
#: ../panels/network/network-wifi.ui.h:19
msgid "WPA"
msgstr "WPA"
#. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:227
+#: ../panels/network/connection-editor/ce-page-details.c:58
+#: ../panels/network/net-device-wifi.c:222
msgid "WPA2"
msgstr "WPA2"
#. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:65
-#: ../panels/network/net-device-wifi.c:232
+#: ../panels/network/connection-editor/ce-page-details.c:63
+#: ../panels/network/net-device-wifi.c:227
msgid "Enterprise"
msgstr "Bedrift"
-#: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:237
-#: ../panels/network/net-device-wifi.c:385
+#: ../panels/network/connection-editor/ce-page-details.c:68
+#: ../panels/network/net-device-wifi.c:232
+#: ../panels/network/net-device-wifi.c:380
msgctxt "Wifi security"
msgid "None"
msgstr "Ingen"
-#: ../panels/network/connection-editor/ce-page-details.c:91
+#: ../panels/network/connection-editor/ce-page-details.c:89
#: ../panels/power/power.ui.h:17
msgid "Never"
msgstr "Aldri"
-#: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:124
-#: ../panels/network/net-device-wifi.c:489
+#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/network/net-device-ethernet.c:120
+#: ../panels/network/net-device-wifi.c:485
#, c-format
msgid "%i day ago"
msgid_plural "%i days ago"
@@ -2030,184 +2062,178 @@ msgstr[0] "%i dag siden"
msgstr[1] "%i dager siden"
#. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:155
-#: ../panels/network/net-device-ethernet.c:54
-#: ../panels/network/net-device-wifi.c:546
+#: ../panels/network/connection-editor/ce-page-details.c:153
+#: ../panels/network/net-device-ethernet.c:50
+#: ../panels/network/net-device-wifi.c:542
#, 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:575
+#: ../panels/network/connection-editor/ce-page-details.c:179
+#: ../panels/network/net-device-wifi.c:571
msgctxt "Signal strength"
msgid "None"
msgstr "Ingen"
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:577
+#: ../panels/network/connection-editor/ce-page-details.c:181
+#: ../panels/network/net-device-wifi.c:573
msgctxt "Signal strength"
msgid "Weak"
msgstr "Svak"
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:579
+#: ../panels/network/connection-editor/ce-page-details.c:183
+#: ../panels/network/net-device-wifi.c:575
msgctxt "Signal strength"
msgid "Ok"
msgstr "Ok"
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:581
+#: ../panels/network/connection-editor/ce-page-details.c:185
+#: ../panels/network/net-device-wifi.c:577
msgctxt "Signal strength"
msgid "Good"
msgstr "God"
-#: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:583
+#: ../panels/network/connection-editor/ce-page-details.c:187
+#: ../panels/network/net-device-wifi.c:579
msgctxt "Signal strength"
msgid "Excellent"
msgstr "Utmerket"
-#: ../panels/network/connection-editor/ce-page-details.c:240
-#: ../panels/network/network-wifi.ui.h:46
+#: ../panels/network/connection-editor/ce-page-details.c:225
+#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266
msgid "Details"
msgstr "Detaljer"
-#: ../panels/network/connection-editor/ce-page-ethernet.c:228
-#: ../panels/network/connection-editor/ce-page-vpn.c:222
-#: ../panels/network/connection-editor/ce-page-wifi.c:262
+#: ../panels/network/connection-editor/ce-page-ethernet.c:215
+#: ../panels/network/connection-editor/ce-page-vpn.c:221
+#: ../panels/network/connection-editor/ce-page-wifi.c:227
#: ../panels/network/network-wifi.ui.h:47
msgid "Identity"
msgstr "Identitet"
-#: ../panels/network/connection-editor/ce-page-ip4.c:177
-#: ../panels/network/connection-editor/ce-page-ip4.c:439
-#: ../panels/network/connection-editor/ce-page-ip6.c:179
-#: ../panels/network/connection-editor/ce-page-ip6.c:443
+#: ../panels/network/connection-editor/ce-page-ip4.c:202
+#: ../panels/network/connection-editor/ce-page-ip4.c:461
+#: ../panels/network/connection-editor/ce-page-ip6.c:180
+#: ../panels/network/connection-editor/ce-page-ip6.c:427
msgid "Address"
msgstr "Adresse"
-#: ../panels/network/connection-editor/ce-page-ip4.c:190
-#: ../panels/network/connection-editor/ce-page-ip4.c:452
+#: ../panels/network/connection-editor/ce-page-ip4.c:215
+#: ../panels/network/connection-editor/ce-page-ip4.c:474
msgid "Netmask"
msgstr "Nettverksmaske"
-#: ../panels/network/connection-editor/ce-page-ip4.c:204
-#: ../panels/network/connection-editor/ce-page-ip4.c:465
-#: ../panels/network/connection-editor/ce-page-ip6.c:205
-#: ../panels/network/connection-editor/ce-page-ip6.c:473
+#: ../panels/network/connection-editor/ce-page-ip4.c:229
+#: ../panels/network/connection-editor/ce-page-ip4.c:487
+#: ../panels/network/connection-editor/ce-page-ip6.c:206
+#: ../panels/network/connection-editor/ce-page-ip6.c:453
#: ../panels/network/network-vpn.ui.h:2
msgid "Gateway"
msgstr "Gateway"
-#: ../panels/network/connection-editor/ce-page-ip4.c:221
-#: ../panels/network/connection-editor/ce-page-ip6.c:222
+#: ../panels/network/connection-editor/ce-page-ip4.c:250
+#: ../panels/network/connection-editor/ce-page-ip6.c:223
msgid "Delete Address"
msgstr "Slett adresse"
-#: ../panels/network/connection-editor/ce-page-ip4.c:275
-#: ../panels/network/connection-editor/ce-page-ip6.c:276
-msgid "Add"
-msgstr "Legg til"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:343
-#: ../panels/network/connection-editor/ce-page-ip6.c:347
+#: ../panels/network/connection-editor/ce-page-ip4.c:368
+#: ../panels/network/connection-editor/ce-page-ip6.c:334
msgid "Server"
msgstr "Tjener"
-#: ../panels/network/connection-editor/ce-page-ip4.c:360
-#: ../panels/network/connection-editor/ce-page-ip6.c:364
+#: ../panels/network/connection-editor/ce-page-ip4.c:385
+#: ../panels/network/connection-editor/ce-page-ip6.c:351
msgid "Delete DNS Server"
msgstr "Slett DNS-tjener"
#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:479
-#: ../panels/network/connection-editor/ce-page-ip6.c:487
+#: ../panels/network/connection-editor/ce-page-ip4.c:501
+#: ../panels/network/connection-editor/ce-page-ip6.c:467
msgctxt "network parameters"
msgid "Metric"
msgstr "Metrisk"
-#: ../panels/network/connection-editor/ce-page-ip4.c:500
-#: ../panels/network/connection-editor/ce-page-ip6.c:508
+#: ../panels/network/connection-editor/ce-page-ip4.c:522
+#: ../panels/network/connection-editor/ce-page-ip6.c:484
msgid "Delete Route"
msgstr "Slett rute"
-#: ../panels/network/connection-editor/ce-page-ip4.c:615
+#: ../panels/network/connection-editor/ce-page-ip4.c:626
#: ../panels/network/network-wifi.ui.h:27
msgid "Automatic (DHCP)"
msgstr "Automatisk (DHCP)"
-#: ../panels/network/connection-editor/ce-page-ip4.c:619
-#: ../panels/network/connection-editor/ce-page-ip6.c:621
+#: ../panels/network/connection-editor/ce-page-ip4.c:630
+#: ../panels/network/connection-editor/ce-page-ip6.c:592
#: ../panels/network/network-wifi.ui.h:26
-#: ../panels/privacy/cc-privacy-panel.c:199
+#: ../panels/privacy/cc-privacy-panel.c:217
msgid "Manual"
msgstr "Manuell"
-#: ../panels/network/connection-editor/ce-page-ip4.c:623
-#: ../panels/network/connection-editor/ce-page-ip6.c:625
+#: ../panels/network/connection-editor/ce-page-ip4.c:634
+#: ../panels/network/connection-editor/ce-page-ip6.c:596
msgid "Link-Local Only"
msgstr "Kun link-local"
-#: ../panels/network/connection-editor/ce-page-ip4.c:967
+#: ../panels/network/connection-editor/ce-page-ip4.c:979
#: ../panels/network/network-wifi.ui.h:48
msgid "IPv4"
msgstr "IPv4"
-#: ../panels/network/connection-editor/ce-page-ip6.c:192
-#: ../panels/network/connection-editor/ce-page-ip6.c:456
+#: ../panels/network/connection-editor/ce-page-ip6.c:193
+#: ../panels/network/connection-editor/ce-page-ip6.c:440
msgid "Prefix"
msgstr "Prefiks"
-#: ../panels/network/connection-editor/ce-page-ip6.c:613
+#: ../panels/network/connection-editor/ce-page-ip6.c:584
#: ../panels/network/connection-editor/ethernet-page.ui.h:1
#: ../panels/network/connection-editor/ip4-page.ui.h:4
#: ../panels/network/connection-editor/ip6-page.ui.h:4
#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:199
+#: ../panels/privacy/cc-privacy-panel.c:217
msgid "Automatic"
msgstr "Automatisk"
-#: ../panels/network/connection-editor/ce-page-ip6.c:617
+#: ../panels/network/connection-editor/ce-page-ip6.c:588
msgid "Automatic, DHCP only"
msgstr "Automatisk. Kun DHCP"
-#: ../panels/network/connection-editor/ce-page-ip6.c:937
+#: ../panels/network/connection-editor/ce-page-ip6.c:898
#: ../panels/network/network-wifi.ui.h:49
msgid "IPv6"
msgstr "IPv6"
-#: ../panels/network/connection-editor/ce-page-reset.c:91
-#: ../panels/network/network-wifi.ui.h:51
+#: ../panels/network/connection-editor/ce-page-reset.c:78
msgid "Reset"
msgstr "Nullstill"
-#: ../panels/network/connection-editor/ce-page-security.c:253
+#: ../panels/network/connection-editor/ce-page-security.c:248
msgctxt "Wi-Fi/Ethernet security"
msgid "None"
msgstr "Ingen"
-#: ../panels/network/connection-editor/ce-page-security.c:276
+#: ../panels/network/connection-editor/ce-page-security.c:271
msgid "WEP 40/128-bit Key (Hex or ASCII)"
msgstr "WEP 40/128-bit nøkkel (heksadesimal eller ASCII)"
-#: ../panels/network/connection-editor/ce-page-security.c:286
+#: ../panels/network/connection-editor/ce-page-security.c:281
msgid "WEP 128-bit Passphrase"
msgstr "WEP 128-bit passordfrase"
-#: ../panels/network/connection-editor/ce-page-security.c:299
-#: ../panels/network/wireless-security/wireless-security.c:409
+#: ../panels/network/connection-editor/ce-page-security.c:294
+#: ../panels/network/wireless-security/wireless-security.c:463
msgid "LEAP"
msgstr "LEAP"
-#: ../panels/network/connection-editor/ce-page-security.c:312
+#: ../panels/network/connection-editor/ce-page-security.c:307
msgid "Dynamic WEP (802.1x)"
msgstr "Dynamisk WEP (802.1x)"
-#: ../panels/network/connection-editor/ce-page-security.c:326
+#: ../panels/network/connection-editor/ce-page-security.c:321
msgid "WPA & WPA2 Personal"
msgstr "WPA & WPA2 personlig"
-#: ../panels/network/connection-editor/ce-page-security.c:340
+#: ../panels/network/connection-editor/ce-page-security.c:335
msgid "WPA & WPA2 Enterprise"
msgstr "WPA & WPA2 bedrift"
@@ -2222,30 +2248,30 @@ msgid "Link speed"
msgstr "Hastighet for tilkobling"
#: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:157
+#: ../panels/network/net-device-ethernet.c:153
#: ../panels/network/network-simple.ui.h:3
-#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695
+#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
msgid "IPv4 Address"
msgstr "IPv4-adresse"
#: ../panels/network/connection-editor/details-page.ui.h:5
+#: ../panels/network/net-device-ethernet.c:154
#: ../panels/network/net-device-ethernet.c:158
-#: ../panels/network/net-device-ethernet.c:162
#: ../panels/network/network-mobile.ui.h:4
#: ../panels/network/network-simple.ui.h:4
-#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696
+#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
msgid "IPv6 Address"
msgstr "IPv6-adresse"
#: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:165
+#: ../panels/network/net-device-ethernet.c:161
#: ../panels/network/network-simple.ui.h:2
#: ../panels/network/network-wifi.ui.h:9
msgid "Hardware Address"
msgstr "Maskinvareadresse"
#: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:169
+#: ../panels/network/net-device-ethernet.c:165
#: ../panels/network/network-mobile.ui.h:5
#: ../panels/network/network-simple.ui.h:5
#: ../panels/network/network-wifi.ui.h:10
@@ -2255,7 +2281,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:171
+#: ../panels/network/net-device-ethernet.c:167
#: ../panels/network/network-mobile.ui.h:6
#: ../panels/network/network-simple.ui.h:6
#: ../panels/network/network-wifi.ui.h:11
@@ -2386,45 +2412,25 @@ msgstr "Bruk denne tilkoblingen _kun for ressurser på dette nettverket"
msgid "IPv_6"
msgstr "IPv_6"
-#: ../panels/network/connection-editor/net-connection-editor.c:275
+#: ../panels/network/connection-editor/net-connection-editor.c:296
msgid "Unable to open connection editor"
msgstr "Klarte ikke å åpne tilkoblingsbehandler"
-#: ../panels/network/connection-editor/net-connection-editor.c:293
+#: ../panels/network/connection-editor/net-connection-editor.c:314
msgid "New Profile"
msgstr "Ny profil"
-#: ../panels/network/connection-editor/net-connection-editor.c:583
+#: ../panels/network/connection-editor/net-connection-editor.c:635
msgid "VPN"
msgstr "VPN"
-#: ../panels/network/connection-editor/net-connection-editor.c:584
-msgid "Bond"
-msgstr "Bundet"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:586
-msgid "Team"
-msgstr "Koble sammen"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:588
-msgid "Bridge"
-msgstr "Bro"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:589
-msgid "VLAN"
-msgstr "VLAN"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:738
-msgid "Could not load VPN plugins"
-msgstr "Klarte ikke å laste VPN-tillegg"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:807
+#: ../panels/network/connection-editor/net-connection-editor.c:783
msgid "Import from file…"
msgstr "Importer fil …"
-#: ../panels/network/connection-editor/net-connection-editor.c:878
-msgid "Add Network Connection"
-msgstr "Legg til nettverkstilkobling"
+#: ../panels/network/connection-editor/net-connection-editor.c:817
+msgid "Add VPN"
+msgstr "Legg til VPN"
#: ../panels/network/connection-editor/reset-page.ui.h:1
#: ../panels/network/network-wifi.ui.h:41
@@ -2432,7 +2438,7 @@ msgid "_Reset"
msgstr "N_ullstill"
#: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1482
+#: ../panels/network/net-device-wifi.c:1536
#: ../panels/network/network-wifi.ui.h:42
msgid "_Forget"
msgstr "_Glem"
@@ -2458,56 +2464,55 @@ msgstr ""
msgid "S_ecurity"
msgstr "Sikk_erhet"
-#: ../panels/network/connection-editor/vpn-helpers.c:210
+#: ../panels/network/connection-editor/vpn-helpers.c:141
msgid "Cannot import VPN connection"
msgstr "Klarte ikke å importere VPN-forbindelse"
-#: ../panels/network/connection-editor/vpn-helpers.c:212
+#: ../panels/network/connection-editor/vpn-helpers.c:143
#, c-format
msgid ""
-"The file '%s' could not be read or does not contain recognized VPN "
+"The file “%s” could not be read or does not contain recognized VPN "
"connection information\n"
"\n"
"Error: %s."
msgstr ""
-"Fila «%s» kunne ikke leses, eller inneholder ikke gjenkjent informasjon om "
-"VPN-tilkobling\n"
+"Filen «%s» kunne ikke leses, eller inneholder ikke gjenkjent informasjon om VPN-tilkobling\n"
"\n"
"Feil: %s."
-#: ../panels/network/connection-editor/vpn-helpers.c:247
+#: ../panels/network/connection-editor/vpn-helpers.c:178
msgid "Select file to import"
msgstr "Velg fil som skal importeres"
-#: ../panels/network/connection-editor/vpn-helpers.c:251
-#: ../panels/printers/cc-printers-panel.c:2053
+#: ../panels/network/connection-editor/vpn-helpers.c:182
+#: ../panels/printers/cc-printers-panel.c:2092
#: ../panels/sharing/cc-sharing-panel.c:373
#: ../panels/user-accounts/um-photo-dialog.c:218
msgid "_Open"
msgstr "_Åpne"
-#: ../panels/network/connection-editor/vpn-helpers.c:299
+#: ../panels/network/connection-editor/vpn-helpers.c:230
#, c-format
-msgid "A file named \"%s\" already exists."
+msgid "A file named “%s” already exists."
msgstr "En fil med navn «%s» eksisterer allerede."
-#: ../panels/network/connection-editor/vpn-helpers.c:301
+#: ../panels/network/connection-editor/vpn-helpers.c:232
msgid "_Replace"
msgstr "E_rstatt"
-#: ../panels/network/connection-editor/vpn-helpers.c:303
+#: ../panels/network/connection-editor/vpn-helpers.c:234
#, c-format
msgid "Do you want to replace %s with the VPN connection you are saving?"
msgstr "Vil du erstatte %s med VPN-forbindelsen du lagrer?"
-#: ../panels/network/connection-editor/vpn-helpers.c:339
+#: ../panels/network/connection-editor/vpn-helpers.c:270
msgid "Cannot export VPN connection"
msgstr "Klarte ikke å eksportere VPN-forbindelse"
-#: ../panels/network/connection-editor/vpn-helpers.c:341
+#: ../panels/network/connection-editor/vpn-helpers.c:272
#, c-format
msgid ""
-"The VPN connection '%s' could not be exported to %s.\n"
+"The VPN connection “%s” could not be exported to %s.\n"
"\n"
"Error: %s."
msgstr ""
@@ -2515,7 +2520,7 @@ msgstr ""
"\n"
"Feil: %s."
-#: ../panels/network/connection-editor/vpn-helpers.c:376
+#: ../panels/network/connection-editor/vpn-helpers.c:307
msgid "Export VPN connection"
msgstr "Eksporter VPN-forbindelse"
@@ -2555,47 +2560,33 @@ msgstr "Kontroller hvordan du kobler til internett"
#: ../panels/network/gnome-network-panel.desktop.in.in.h:5
msgid ""
"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;DNS;"
+"DNS;"
msgstr ""
"Nettverk;Trådløst;Wi-Fi;Wifi;IP;LAN;Mellomtjener;WAN;Bredbånd;Modem;Blåtann;"
-"vpn;vlan;bro;bånd;DNS;"
+"vpn;DNS;"
-#: ../panels/network/net-device-bond.c:77
-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:110
-#: ../panels/network/net-device-wifi.c:475
+#: ../panels/network/net-device-ethernet.c:106
+#: ../panels/network/net-device-wifi.c:471
msgid "never"
msgstr "aldri"
-#: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:485
+#: ../panels/network/net-device-ethernet.c:116
+#: ../panels/network/net-device-wifi.c:481
msgid "today"
msgstr "i dag"
-#: ../panels/network/net-device-ethernet.c:122
-#: ../panels/network/net-device-wifi.c:487
+#: ../panels/network/net-device-ethernet.c:118
+#: ../panels/network/net-device-wifi.c:483
msgid "yesterday"
msgstr "i går"
-#: ../panels/network/net-device-ethernet.c:160
-#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698
-#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13
+#: ../panels/network/net-device-ethernet.c:156
+#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647
+#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13
msgid "IP Address"
msgstr "IP-adresse"
-#: ../panels/network/net-device-ethernet.c:176
+#: ../panels/network/net-device-ethernet.c:172
#: ../panels/network/network-wifi.ui.h:12
msgid "Last used"
msgstr "Sist brukt"
@@ -2605,29 +2596,25 @@ msgstr "Sist brukt"
#. * profile. It is also used to display ethernet in the
#. * device list.
#.
-#: ../panels/network/net-device-ethernet.c:286
+#: ../panels/network/net-device-ethernet.c:280
#: ../panels/network/network-ethernet.ui.h:1
#: ../panels/network/network-simple.ui.h:1
msgid "Wired"
msgstr "Kablet"
-#: ../panels/network/net-device-ethernet.c:354
-#: ../panels/network/net-device-wifi.c:1640
+#: ../panels/network/net-device-ethernet.c:348
+#: ../panels/network/net-device-wifi.c:1694
#: ../panels/network/network-ethernet.ui.h:3
#: ../panels/network/network-mobile.ui.h:8
#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
msgid "Options…"
msgstr "Valg …"
-#: ../panels/network/net-device-mobile.c:232
+#: ../panels/network/net-device-mobile.c:223
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:1188
+#: ../panels/network/net-device-wifi.c:1205
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."
@@ -2635,12 +2622,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:1192
+#: ../panels/network/net-device-wifi.c:1209
#, c-format
msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
msgstr "Hvis du slår på trådløst aksesspunkt, blir du koblet fra <b>%s</b>."
-#: ../panels/network/net-device-wifi.c:1196
+#: ../panels/network/net-device-wifi.c:1213
msgid ""
"It is not possible to access the Internet through your wireless while the "
"hotspot is active."
@@ -2648,23 +2635,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:1279
+#: ../panels/network/net-device-wifi.c:1296
msgid "Stop hotspot and disconnect any users?"
msgstr "Vil du slå av trådløst aksesspunkt og koble fra brukere?"
-#: ../panels/network/net-device-wifi.c:1282
+#: ../panels/network/net-device-wifi.c:1299
msgid "_Stop Hotspot"
msgstr "_Stopp hotspot"
-#: ../panels/network/net-device-wifi.c:1346
+#: ../panels/network/net-device-wifi.c:1397
msgid "System policy prohibits use as a Hotspot"
msgstr "Systemregler hindrer oppsett av aksesspunkt"
-#: ../panels/network/net-device-wifi.c:1349
+#: ../panels/network/net-device-wifi.c:1400
msgid "Wireless device does not support Hotspot mode"
msgstr "Trådløs enhet støtter ikke hotspotmodus"
-#: ../panels/network/net-device-wifi.c:1478
+#: ../panels/network/net-device-wifi.c:1532
msgid ""
"Network details for the selected networks, including passwords and any "
"custom configuration will be lost."
@@ -2672,11 +2659,11 @@ msgstr ""
"Nettverksdetaljer for valgte nettverk - inkludert passord og innstillinger - "
"går tapt."
-#: ../panels/network/net-device-wifi.c:1793
+#: ../panels/network/net-device-wifi.c:1842
msgid "History"
msgstr "Historikk"
-#: ../panels/network/net-device-wifi.c:1797
+#: ../panels/network/net-device-wifi.c:1846
#: ../panels/printers/options-dialog.ui.h:2
#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525
#: ../panels/wacom/gnome-wacom-properties.ui.h:5
@@ -2684,7 +2671,7 @@ msgid "_Close"
msgstr "_Lukk"
#. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1805
+#: ../panels/network/net-device-wifi.c:1854
msgctxt "Wi-Fi Network"
msgid "_Forget"
msgstr "_Glem"
@@ -2831,15 +2818,11 @@ msgstr "detaljer"
#: ../panels/network/wireless-security/ws-leap.ui.h:2
#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
#: ../panels/sharing/sharing.ui.h:9
-#: ../panels/user-accounts/data/account-dialog.ui.h:9
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: ../panels/user-accounts/data/account-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
msgid "_Password"
msgstr "_Passord"
-#: ../panels/network/network-wifi.ui.h:20
-msgid "None"
-msgstr "Ingen"
-
#: ../panels/network/network-wifi.ui.h:21
msgid "Show P_assword"
msgstr "Vis p_assord"
@@ -2908,6 +2891,11 @@ msgstr "nullstill"
msgid "Hardware"
msgstr "Maskinvare"
+#: ../panels/network/network-wifi.ui.h:51
+msgctxt "tab"
+msgid "Reset"
+msgstr "Nullstill"
+
#: ../panels/network/network-wifi.ui.h:52
msgid "Wi-Fi Hotspot"
msgstr "Trådløst aksesspunkt"
@@ -2933,7 +2921,6 @@ msgid "_Connect to Hidden Network…"
msgstr "_Koble til skjult nettverk …"
#: ../panels/network/network-wifi.ui.h:58
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
msgid "_History"
msgstr "_Historikk"
@@ -2955,360 +2942,336 @@ msgstr "Type sikkerhet"
#: ../panels/network/network-wifi.ui.h:63
#: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#: ../panels/user-accounts/data/account-dialog.ui.h:9
msgid "Password"
msgstr "Passord"
#. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:131
+#: ../panels/network/panel-common.c:127
msgid "Ad-hoc"
msgstr "Ad-hoc"
#. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:135
+#: ../panels/network/panel-common.c:131
msgid "Infrastructure"
msgstr "Infrastruktur"
#. TRANSLATORS: device status
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205
+#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201
msgid "Status unknown"
msgstr "Ukjent status"
#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:155
+#: ../panels/network/panel-common.c:151
msgid "Unmanaged"
msgstr "Ikke administrert"
#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:159
+#: ../panels/network/panel-common.c:155
msgid "Unavailable"
msgstr "Ikke tilgjengelig"
#. TRANSLATORS: device status
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
+#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207
msgid "Connecting"
msgstr "Kobler til"
#. TRANSLATORS: device status
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
+#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
msgid "Authentication required"
msgstr "Autentisering kreves"
#. TRANSLATORS: device status
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
+#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
msgid "Connected"
msgstr "Tilkoblet"
#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:181
+#: ../panels/network/panel-common.c:177
msgid "Disconnecting"
msgstr "Kobler fra"
#. TRANSLATORS: device status
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223
+#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219
msgid "Connection failed"
msgstr "Tilkobling mislyktes"
#. TRANSLATORS: device status
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231
+#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227
msgid "Status unknown (missing)"
msgstr "Ukjent status (mangler)"
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:227
+#: ../panels/network/panel-common.c:223
msgid "Not connected"
msgstr "Ikke tilkoblet"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:252
+#: ../panels/network/panel-common.c:248
msgid "Configuration failed"
msgstr "Oppsett mislyktes"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:256
+#: ../panels/network/panel-common.c:252
msgid "IP configuration failed"
msgstr "IP-oppsett mislyktes"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:260
+#: ../panels/network/panel-common.c:256
msgid "IP configuration expired"
msgstr "IP-oppsett er utgått"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:264
+#: ../panels/network/panel-common.c:260
msgid "Secrets were required, but not provided"
msgstr "Hemmeligheter kreves men ble ikke oppgitt"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:268
+#: ../panels/network/panel-common.c:264
msgid "802.1x supplicant disconnected"
msgstr "802.1x-hjelper frakoblet"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:272
+#: ../panels/network/panel-common.c:268
msgid "802.1x supplicant configuration failed"
msgstr "Oppsett av 802.1x-hjelper mislyktes"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:276
+#: ../panels/network/panel-common.c:272
msgid "802.1x supplicant failed"
msgstr "802.1x-hjelper mislyktes"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:280
+#: ../panels/network/panel-common.c:276
msgid "802.1x supplicant took too long to authenticate"
msgstr "802.1x-hjelper brukte for lang tid på autentisering"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:284
+#: ../panels/network/panel-common.c:280
msgid "PPP service failed to start"
msgstr "PPP-tjeneste klarte ikke å starte"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:288
+#: ../panels/network/panel-common.c:284
msgid "PPP service disconnected"
msgstr "PPP-tjeneste koblet fra"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:292
+#: ../panels/network/panel-common.c:288
msgid "PPP failed"
msgstr "PPP mislyktes"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:296
+#: ../panels/network/panel-common.c:292
msgid "DHCP client failed to start"
msgstr "DHCP-klient startet ikke"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:300
+#: ../panels/network/panel-common.c:296
msgid "DHCP client error"
msgstr "Feil i DHCP-klient"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:304
+#: ../panels/network/panel-common.c:300
msgid "DHCP client failed"
msgstr "DHCP-klient mislyktes"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:308
+#: ../panels/network/panel-common.c:304
msgid "Shared connection service failed to start"
msgstr "Tjeneste for delt tilkobling startet ikke"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:312
+#: ../panels/network/panel-common.c:308
msgid "Shared connection service failed"
msgstr "Tjeneste for delt tilkobling mislyktes"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:316
+#: ../panels/network/panel-common.c:312
msgid "AutoIP service failed to start"
msgstr "AutoIP-tjeneste startet ikke"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:320
+#: ../panels/network/panel-common.c:316
msgid "AutoIP service error"
msgstr "Feil i AutoIP-tjeneste"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:324
+#: ../panels/network/panel-common.c:320
msgid "AutoIP service failed"
msgstr "AutoIP-tjeneste mislyktes"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:328
+#: ../panels/network/panel-common.c:324
msgid "Line busy"
msgstr "Linjen er opptatt"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:332
+#: ../panels/network/panel-common.c:328
msgid "No dial tone"
msgstr "Ingen summetone"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:336
+#: ../panels/network/panel-common.c:332
msgid "No carrier could be established"
msgstr "Klarte ikke å etablere bærekanal"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:340
+#: ../panels/network/panel-common.c:336
msgid "Dialing request timed out"
msgstr "Tidsavbrudd for oppringing"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:344
+#: ../panels/network/panel-common.c:340
msgid "Dialing attempt failed"
msgstr "Oppringingsforsøk mislyktes"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:348
+#: ../panels/network/panel-common.c:344
msgid "Modem initialization failed"
msgstr "Oppstart av modem mislyktes"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:352
+#: ../panels/network/panel-common.c:348
msgid "Failed to select the specified APN"
msgstr "Klarte ikke å velge angitt APN"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:356
+#: ../panels/network/panel-common.c:352
msgid "Not searching for networks"
msgstr "Søker ikke etter nettverk"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:360
+#: ../panels/network/panel-common.c:356
msgid "Network registration denied"
msgstr "Nettverksregistrering nektet"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:364
+#: ../panels/network/panel-common.c:360
msgid "Network registration timed out"
msgstr "Tidsavbrudd for nettverksregistrering"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:368
+#: ../panels/network/panel-common.c:364
msgid "Failed to register with the requested network"
msgstr "Klarte ikke å registrere med forespurt nettverk"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:372
+#: ../panels/network/panel-common.c:368
msgid "PIN check failed"
msgstr "PIN-sjekk mislyktes"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:376
+#: ../panels/network/panel-common.c:372
msgid "Firmware for the device may be missing"
msgstr "Fastvare for enheten mangler kanskje"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:380
+#: ../panels/network/panel-common.c:376
msgid "Connection disappeared"
msgstr "Tilkobling forsvant"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:384
+#: ../panels/network/panel-common.c:380
msgid "Existing connection was assumed"
msgstr "Eksisterende tilkobling ble antatt"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:388
+#: ../panels/network/panel-common.c:384
msgid "Modem not found"
msgstr "Fant ikke modem"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:392
+#: ../panels/network/panel-common.c:388
msgid "Bluetooth connection failed"
msgstr "Tilkobling med Bluetooth mislyktes"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:396
+#: ../panels/network/panel-common.c:392
msgid "SIM Card not inserted"
msgstr "SIM-kort er ikke satt inn"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:400
+#: ../panels/network/panel-common.c:396
msgid "SIM Pin required"
msgstr "Pin for SIM kreves"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:404
+#: ../panels/network/panel-common.c:400
msgid "SIM Puk required"
msgstr "Puk for SIM kreves"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:408
+#: ../panels/network/panel-common.c:404
msgid "SIM wrong"
msgstr "Feil SIM"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:412
-msgid "InfiniBand device does not support connected mode"
-msgstr "InfiniBand-enhet støtter ikke tilkoblet modus"
-
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:416
+#: ../panels/network/panel-common.c:408
msgid "Connection dependency failed"
msgstr "Tilkoblingsavhengighet mislyktes"
#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:440
+#: ../panels/network/panel-common.c:433
msgid "Firmware missing"
msgstr "Fastvare mangler"
#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447
+#: ../panels/network/panel-common.c:437
msgid "Cable unplugged"
msgstr "Kabel koblet fra"
-#: ../panels/network/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "Ingen sertifikat fra sertifikatutsteder valgt"
+#: ../panels/network/wireless-security/eap-method.c:69
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr "udefinert feil i 802.1x sikkerhet (wpa-eap)"
-#: ../panels/network/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate "
-"Authority certificate?"
-msgstr ""
-"Hvis du ikke bruker et sertifikat fra en kjent sertifikatutsteder (CA), kan "
-"du risikere å bli koblet til usikre trådløse nettverk. Vil du velge et "
-"sertifikat fra en sertifikatutsteder?"
+#: ../panels/network/wireless-security/eap-method.c:245
+msgid "no file selected"
+msgstr "ingen fil valgt"
-#: ../panels/network/wireless-security/eap-method.c:281
-msgid "Ignore"
-msgstr "Ignorer"
-
-#: ../panels/network/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "Velg CA-sertifikat"
+#: ../panels/network/wireless-security/eap-method.c:276
+msgid "unspecified error validating eap-method file"
+msgstr "uspesifisert feil ved validering av fil for eap-metode"
-#: ../panels/network/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "DER, PEM eller PKCS#12 private nøkler (*.der, *.pem, *.p12)"
+#: ../panels/network/wireless-security/eap-method.c:480
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM eller PKCS#12 private nøkler (*.der, *.pem, *.p12, *.key)"
-#: ../panels/network/wireless-security/eap-method.c:648
+#: ../panels/network/wireless-security/eap-method.c:483
msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
msgstr "DER- eller PEM-sertifikater (*.der, *.pem, *.crt, *.cer)"
-#: ../panels/network/wireless-security/eap-method-fast.c:271
-#: ../panels/network/wireless-security/eap-method-peap.c:280
+#: ../panels/network/wireless-security/eap-method-fast.c:72
+msgid "missing EAP-FAST PAC file"
+msgstr "mangler EAP-FAST PAC-fil"
+
+#: ../panels/network/wireless-security/eap-method-fast.c:268
+#: ../panels/network/wireless-security/eap-method-peap.c:302
+#: ../panels/network/wireless-security/eap-method-ttls.c:333
msgid "GTC"
msgstr "GTC"
-#: ../panels/network/wireless-security/eap-method-fast.c:287
-#: ../panels/network/wireless-security/eap-method-peap.c:246
-#: ../panels/network/wireless-security/eap-method-ttls.c:263
+#: ../panels/network/wireless-security/eap-method-fast.c:283
+#: ../panels/network/wireless-security/eap-method-peap.c:272
+#: ../panels/network/wireless-security/eap-method-ttls.c:288
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
-#: ../panels/network/wireless-security/eap-method-fast.c:409
+#: ../panels/network/wireless-security/eap-method-fast.c:406
msgid "Choose a PAC file"
msgstr "Velg en PAC-fil"
-#: ../panels/network/wireless-security/eap-method-fast.c:416
+#: ../panels/network/wireless-security/eap-method-fast.c:413
msgid "PAC files (*.pac)"
msgstr "PAC-filer (*.pac)"
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
-msgid "PAC _file"
-msgstr "PAC-_fil"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
-msgid "_Inner authentication"
-msgstr "_Indre autentisering"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
-msgid "PAC pro_visioning"
-msgstr "PAC-pro_visjonering"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
@@ -3317,41 +3280,73 @@ msgstr "PAC-pro_visjonering"
msgid " "
msgstr " "
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
msgid "Anonymous"
msgstr "Anonym"
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
msgid "Authenticated"
msgstr "Autentisert"
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
msgid "Both"
msgstr "Begge"
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+msgid "PAC _file"
+msgstr "PAC-_fil"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5
+msgid "_Inner authentication"
+msgstr "_Indre autentisering"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr "Tillat automatisk PAC-pro_visjonering"
+
+#: ../panels/network/wireless-security/eap-method-leap.c:65
+msgid "missing EAP-LEAP username"
+msgstr "mangler brukernavn for EAP-LEAP"
+
+#: ../panels/network/wireless-security/eap-method-leap.c:74
+msgid "missing EAP-LEAP password"
+msgstr "mangler passord for EAP-LEAP"
+
#: ../panels/network/wireless-security/eap-method-leap.ui.h:1
#: ../panels/network/wireless-security/eap-method-simple.ui.h:1
#: ../panels/network/wireless-security/ws-leap.ui.h:1
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
+#: ../panels/user-accounts/data/account-dialog.ui.h:4
msgid "_Username"
msgstr "Br_ukernavn"
#: ../panels/network/wireless-security/eap-method-leap.ui.h:3
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:4
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:7
#: ../panels/network/wireless-security/ws-leap.ui.h:3
#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
msgid "Sho_w password"
msgstr "Vi_s passord"
-#: ../panels/network/wireless-security/eap-method-peap.c:263
-#: ../panels/network/wireless-security/wireless-security.c:385
+#: ../panels/network/wireless-security/eap-method-peap.c:63
+#, c-format
+msgid "invalid EAP-PEAP CA certificate: %s"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-peap.c:68
+msgid "invalid EAP-PEAP CA certificate: no certificate specified"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-peap.c:287
+#: ../panels/network/wireless-security/eap-method-ttls.c:318
+#: ../panels/network/wireless-security/wireless-security.c:439
msgid "MD5"
msgstr "MD5"
-#: ../panels/network/wireless-security/eap-method-peap.c:350
-#: ../panels/network/wireless-security/eap-method-tls.c:456
-#: ../panels/network/wireless-security/eap-method-ttls.c:350
+#: ../panels/network/wireless-security/eap-method-peap.c:381
+#: ../panels/network/wireless-security/eap-method-tls.c:501
+#: ../panels/network/wireless-security/eap-method-ttls.c:412
msgid "Choose a Certificate Authority certificate"
msgstr "Velg et sertifikat fra en sertifikatutsteder"
@@ -3369,19 +3364,56 @@ msgstr "Versjon 1"
msgid "C_A certificate"
msgstr "C_A-sertifikat"
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+msgid "No CA certificate is _required"
+msgstr "Ingen CA-sertifikat k_reves"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:9
msgid "PEAP _version"
msgstr "PEAP-_versjon"
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "Spør etter dette _passordet hver gang"
+#: ../panels/network/wireless-security/eap-method-simple.c:74
+msgid "missing EAP username"
+msgstr "mangler brukernavn for EAP"
+
+#: ../panels/network/wireless-security/eap-method-simple.c:87
+msgid "missing EAP password"
+msgstr "mangler passord for EAP"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:68
+msgid "missing EAP-TLS identity"
+msgstr "mangler identitet for EAP-TLS"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:77
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr ""
-#: ../panels/network/wireless-security/eap-method-tls.c:282
+#: ../panels/network/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:95
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:109
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:119
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:316
msgid "Unencrypted private keys are insecure"
msgstr "Ukrypterte private nøkler er usikre"
-#: ../panels/network/wireless-security/eap-method-tls.c:285
+#: ../panels/network/wireless-security/eap-method-tls.c:319
msgid ""
"The selected private key does not appear to be protected by a password. "
"This could allow your security credentials to be compromised. Please select "
@@ -3395,11 +3427,11 @@ msgstr ""
"\n"
"Privat nøkkel kan passordbeskyttes med openssl."
-#: ../panels/network/wireless-security/eap-method-tls.c:450
+#: ../panels/network/wireless-security/eap-method-tls.c:495
msgid "Choose your personal certificate"
msgstr "Velg personlig sertifikat"
-#: ../panels/network/wireless-security/eap-method-tls.c:462
+#: ../panels/network/wireless-security/eap-method-tls.c:507
msgid "Choose your private key"
msgstr "Velg privatnøkkel"
@@ -3411,51 +3443,56 @@ msgstr "I_dentitet"
msgid "_User certificate"
msgstr "Br_ukersertifikat"
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
msgid "Private _key"
msgstr "Privat nø_kkel"
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
msgid "_Private key password"
msgstr "_Passord for privat nøkkel"
-#: ../panels/network/wireless-security/eap-method-ttls.c:230
+#: ../panels/network/wireless-security/eap-method-ttls.c:63
+#, c-format
+msgid "invalid EAP-TTLS CA certificate: %s"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:68
+msgid "invalid EAP-TTLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:258
msgid "PAP"
msgstr "PAP"
-#: ../panels/network/wireless-security/eap-method-ttls.c:247
+#: ../panels/network/wireless-security/eap-method-ttls.c:273
msgid "MSCHAP"
msgstr "MSCHAP"
-#: ../panels/network/wireless-security/eap-method-ttls.c:280
+#: ../panels/network/wireless-security/eap-method-ttls.c:303
msgid "CHAP"
msgstr "CHAP"
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Ikke vis ad_varsel igjen"
-
-#: ../panels/network/wireless-security/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:87
+msgid "Unknown error validating 802.1x security"
+msgstr ""
-#: ../panels/network/wireless-security/wireless-security.c:397
+#: ../panels/network/wireless-security/wireless-security.c:451
msgid "TLS"
msgstr "TLS"
-#: ../panels/network/wireless-security/wireless-security.c:421
+#: ../panels/network/wireless-security/wireless-security.c:475
+msgid "PWD"
+msgstr ""
+
+#: ../panels/network/wireless-security/wireless-security.c:486
msgid "FAST"
msgstr "FAST"
-#: ../panels/network/wireless-security/wireless-security.c:432
+#: ../panels/network/wireless-security/wireless-security.c:497
msgid "Tunneled TLS"
msgstr "Tunnelert TLS"
-#: ../panels/network/wireless-security/wireless-security.c:443
+#: ../panels/network/wireless-security/wireless-security.c:508
msgid "Protected EAP (PEAP)"
msgstr "Beskyttet EAP (PEAP)"
@@ -3465,6 +3502,44 @@ msgstr "Beskyttet EAP (PEAP)"
msgid "Au_thentication"
msgstr "Au_tentisering"
+#: ../panels/network/wireless-security/ws-leap.c:63
+msgid "missing leap-username"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-leap.c:74
+msgid "missing leap-password"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wep-key.c:107
+msgid "missing wep-key"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wep-key.c:116
+#, c-format
+msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wep-key.c:124
+#, c-format
+msgid ""
+"invalid wep-key: key with a length of %zu must contain only ascii characters"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wep-key.c:130
+#, c-format
+msgid ""
+"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
+"(ascii) or 10/26 (hex)"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wep-key.c:137
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wep-key.c:139
+msgid "invalid wep-key: passphrase must be shorter than 64 characters"
+msgstr ""
+
#: ../panels/network/wireless-security/ws-wep-key.ui.h:1
msgid "1 (Default)"
msgstr "1 (forvalg)"
@@ -3501,14 +3576,25 @@ msgstr "_Vis nøkkel"
msgid "WEP inde_x"
msgstr "WEP-indeks"
+#: ../panels/network/wireless-security/ws-wpa-psk.c:70
+#, c-format
+msgid ""
+"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
+"digits"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wpa-psk.c:79
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
msgid "_Type"
msgstr "_Type"
#: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940
-#: ../panels/privacy/cc-privacy-panel.c:172
-#: ../panels/privacy/cc-privacy-panel.c:239
+#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
#: ../panels/universal-access/cc-ua-panel.c:269
#: ../panels/universal-access/cc-ua-panel.c:590
#: ../panels/universal-access/cc-ua-panel.c:603
@@ -3578,66 +3664,54 @@ msgstr "Vars_linger på låseskjerm"
msgid "Applications"
msgstr "Programmer"
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170
msgctxt "Online Account"
msgid "Other"
msgstr "Annen"
#. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291
#: ../panels/online-accounts/online-accounts.ui.h:2
msgid "Add Account"
msgstr "Legg til konto"
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328
msgid "Mail"
msgstr "E-post"
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334
+msgid "Calendar"
+msgstr "Kalender"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340
msgid "Contacts"
msgstr "Kontakter"
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346
msgid "Chat"
msgstr "Lynmeldinger"
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352
msgid "Resources"
msgstr "Ressurser"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:422
-msgid "Error logging into the account"
-msgstr "Feil ved innlogging på kontoen"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:492
-msgid "Credentials have expired."
-msgstr "Påloggingsinformasjonen er utgått."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:496
-msgid "Sign in to enable this account."
-msgstr "Logg inn for å ta denne kontoen i bruk."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:501
-msgid "_Sign In"
-msgstr "_Logg inn"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:748
+#: ../panels/online-accounts/cc-online-accounts-panel.c:640
msgid "Error creating account"
msgstr "Feil under oppretting av konto"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:808
+#: ../panels/online-accounts/cc-online-accounts-panel.c:700
msgid "Error removing account"
msgstr "Feil under fjerning av konto"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:844
+#: ../panels/online-accounts/cc-online-accounts-panel.c:736
msgid "Are you sure you want to remove the account?"
msgstr "Er du sikker på at du vil fjerne kontoen?"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:846
+#: ../panels/online-accounts/cc-online-accounts-panel.c:738
msgid "This will not remove the account on the server."
msgstr "Kontoen blir ikke fjernet fra tjeneren."
-#: ../panels/online-accounts/cc-online-accounts-panel.c:847
+#: ../panels/online-accounts/cc-online-accounts-panel.c:739
msgid "_Remove"
msgstr "Fje_rn"
@@ -3664,6 +3738,7 @@ msgid "No online accounts configured"
msgstr "Ingen nettkontoer er satt opp"
#: ../panels/online-accounts/online-accounts.ui.h:3
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
msgid "Remove Account"
msgstr "Fjern konto"
@@ -3806,7 +3881,7 @@ msgstr "Datamaskin"
#. TRANSLATORS: secondary battery, misc
#: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
-#: ../panels/power/cc-power-panel.c:2325
+#: ../panels/power/cc-power-panel.c:2366
msgid "Battery"
msgstr "Batteri"
@@ -3854,88 +3929,88 @@ msgstr "Batterier"
msgid "When _idle"
msgstr "Når led_ig"
-#: ../panels/power/cc-power-panel.c:1640
+#: ../panels/power/cc-power-panel.c:1681
msgid "Power Saving"
msgstr "Strømsparing"
-#: ../panels/power/cc-power-panel.c:1675
+#: ../panels/power/cc-power-panel.c:1716
msgid "_Screen brightness"
msgstr "Lysstyrke for _skjerm"
-#: ../panels/power/cc-power-panel.c:1694
+#: ../panels/power/cc-power-panel.c:1735
msgid "Automatic brightness"
msgstr "Automatisk lysstyrke"
-#: ../panels/power/cc-power-panel.c:1714
+#: ../panels/power/cc-power-panel.c:1755
msgid "_Keyboard brightness"
msgstr "Lysstyr_ke for tastatur"
-#: ../panels/power/cc-power-panel.c:1724
+#: ../panels/power/cc-power-panel.c:1765
msgid "_Dim screen when inactive"
msgstr "_Demp skjermen når inaktiv"
-#: ../panels/power/cc-power-panel.c:1749
+#: ../panels/power/cc-power-panel.c:1790
msgid "_Blank screen"
msgstr "_Slå av skjerm"
-#: ../panels/power/cc-power-panel.c:1786
+#: ../panels/power/cc-power-panel.c:1827
msgid "_Wi-Fi"
msgstr "_Trådløs"
-#: ../panels/power/cc-power-panel.c:1791
+#: ../panels/power/cc-power-panel.c:1832
msgid "Turn off Wi-Fi to save power."
msgstr "Slå av Wi-Fi for å spare strøm."
-#: ../panels/power/cc-power-panel.c:1816
+#: ../panels/power/cc-power-panel.c:1857
msgid "_Mobile broadband"
msgstr "_Mobilt bredbånd"
-#: ../panels/power/cc-power-panel.c:1821
+#: ../panels/power/cc-power-panel.c:1862
msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
msgstr "Slå av mobilt bredbånd (3G, 4G, LTE, etc.) for å spare strøm."
-#: ../panels/power/cc-power-panel.c:1873
+#: ../panels/power/cc-power-panel.c:1907
msgid "_Bluetooth"
msgstr "_Blåtann"
-#: ../panels/power/cc-power-panel.c:1929
+#: ../panels/power/cc-power-panel.c:1970
msgid "When on battery power"
msgstr "På batteristrøm"
-#: ../panels/power/cc-power-panel.c:1931
+#: ../panels/power/cc-power-panel.c:1972
msgid "When plugged in"
msgstr "Når den er koblet til strøm"
-#: ../panels/power/cc-power-panel.c:2026
+#: ../panels/power/cc-power-panel.c:2067
msgid "Suspend"
msgstr "Hvilemodus"
-#: ../panels/power/cc-power-panel.c:2027
+#: ../panels/power/cc-power-panel.c:2068
msgid "Hibernate"
msgstr "Dvalemodus"
-#: ../panels/power/cc-power-panel.c:2028
+#: ../panels/power/cc-power-panel.c:2069
msgid "Nothing"
msgstr "Ingenting"
#. Frame header
-#: ../panels/power/cc-power-panel.c:2142
+#: ../panels/power/cc-power-panel.c:2183
msgid "Suspend & Power Button"
msgstr "Hvilemodus og strømknapp"
-#: ../panels/power/cc-power-panel.c:2185
+#: ../panels/power/cc-power-panel.c:2226
msgid "_Automatic suspend"
msgstr "_Automatisk hvilemodus"
-#: ../panels/power/cc-power-panel.c:2186
+#: ../panels/power/cc-power-panel.c:2227
msgid "Automatic suspend"
msgstr "Automatisk hvilemodus"
-#: ../panels/power/cc-power-panel.c:2253
+#: ../panels/power/cc-power-panel.c:2294
msgid "_When the Power Button is pressed"
msgstr "_Når strømknappen trykkes"
-#: ../panels/power/cc-power-panel.c:2379
+#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:270
msgid "Devices"
msgstr "Enheter"
@@ -4027,11 +4102,6 @@ msgstr "På _batteristrøm"
msgid "Delay"
msgstr "Pause"
-#: ../panels/printers/authentication-dialog.ui.h:2
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
-msgid "Cancel"
-msgstr "Avbryt"
-
#: ../panels/printers/authentication-dialog.ui.h:3
msgid "Authenticate"
msgstr "Autentiser"
@@ -4041,138 +4111,138 @@ msgid "Authentication Required"
msgstr "Autentisering kreves"
#. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:678
+#: ../panels/printers/cc-printers-panel.c:698
msgid "Low on toner"
msgstr "Lite toner"
#. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:680
+#: ../panels/printers/cc-printers-panel.c:700
msgid "Out of toner"
msgstr "Ikke mer toner"
#. Translators: "Developer" is a chemical for photo development,
#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:683
+#: ../panels/printers/cc-printers-panel.c:703
msgid "Low on developer"
msgstr "Lite utvikler"
#. Translators: "Developer" is a chemical for photo development,
#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:686
+#: ../panels/printers/cc-printers-panel.c:706
msgid "Out of developer"
msgstr "Ikke mer utvikler"
#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:688
+#: ../panels/printers/cc-printers-panel.c:708
msgid "Low on a marker supply"
msgstr "Lite farge igjen"
#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:690
+#: ../panels/printers/cc-printers-panel.c:710
msgid "Out of a marker supply"
msgstr "Tom for farge"
#. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:692
+#: ../panels/printers/cc-printers-panel.c:712
msgid "Open cover"
msgstr "Åpne lokket"
#. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:694
+#: ../panels/printers/cc-printers-panel.c:714
msgid "Open door"
msgstr "Åpne døren"
#. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:696
+#: ../panels/printers/cc-printers-panel.c:716
msgid "Low on paper"
msgstr "Lite papir"
#. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:698
+#: ../panels/printers/cc-printers-panel.c:718
msgid "Out of paper"
msgstr "Ikke mer papir"
#. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:700
+#: ../panels/printers/cc-printers-panel.c:720
msgctxt "printer state"
msgid "Offline"
msgstr "Frakoblet"
#. Translators: Someone has stopped the Printer
#. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:702
-#: ../panels/printers/cc-printers-panel.c:893
+#: ../panels/printers/cc-printers-panel.c:722
+#: ../panels/printers/cc-printers-panel.c:912
msgctxt "printer state"
msgid "Stopped"
msgstr "Stoppet"
#. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:704
+#: ../panels/printers/cc-printers-panel.c:724
msgid "Waste receptacle almost full"
msgstr "Søppelkurven er nesten full"
#. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:706
+#: ../panels/printers/cc-printers-panel.c:726
msgid "Waste receptacle full"
msgstr "Søppelkurven er full"
#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:708
+#: ../panels/printers/cc-printers-panel.c:728
msgid "The optical photo conductor is near end of life"
msgstr "Bildetrommelen er snart utbrukt"
#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:710
+#: ../panels/printers/cc-printers-panel.c:730
msgid "The optical photo conductor is no longer functioning"
msgstr "Bildetrommelen fungerer ikke lenger"
#. Translators: Printer's state (printer is being configured right now)
-#: ../panels/printers/cc-printers-panel.c:820
+#: ../panels/printers/cc-printers-panel.c:839
msgctxt "printer state"
msgid "Configuring"
msgstr "Setter opp"
#. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:879
+#: ../panels/printers/cc-printers-panel.c:898
msgctxt "printer state"
msgid "Ready"
msgstr "Klar"
#. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/cc-printers-panel.c:884
+#: ../panels/printers/cc-printers-panel.c:903
msgctxt "printer state"
msgid "Does not accept jobs"
msgstr "Godtar ikke jobber"
#. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:889
+#: ../panels/printers/cc-printers-panel.c:908
msgctxt "printer state"
msgid "Processing"
msgstr "Prosesserer"
#. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:1009
+#: ../panels/printers/cc-printers-panel.c:1028
msgid "Toner Level"
msgstr "Tonernivå"
#. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:1012
+#: ../panels/printers/cc-printers-panel.c:1031
msgid "Ink Level"
msgstr "Blekknivå"
#. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:1015
+#: ../panels/printers/cc-printers-panel.c:1034
msgid "Supply Level"
msgstr "Beholdningsnivå"
#. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:1033
+#: ../panels/printers/cc-printers-panel.c:1052
msgctxt "printer state"
msgid "Installing"
msgstr "Installerer"
#. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1541
+#: ../panels/printers/cc-printers-panel.c:1566
#, c-format
msgid "%u active"
msgid_plural "%u active"
@@ -4180,15 +4250,15 @@ msgstr[0] "%u aktiv"
msgstr[1] "%u aktive"
#. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1882
+#: ../panels/printers/cc-printers-panel.c:1907
msgid "Failed to add new printer."
msgstr "Klarte ikke å legge til ny skriver."
-#: ../panels/printers/cc-printers-panel.c:2049
+#: ../panels/printers/cc-printers-panel.c:2088
msgid "Select PPD File"
msgstr "Velg PPD-fil"
-#: ../panels/printers/cc-printers-panel.c:2058
+#: ../panels/printers/cc-printers-panel.c:2097
msgid ""
"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
"PPD.GZ)"
@@ -4196,34 +4266,30 @@ msgstr ""
"PostScript Printer Description filer (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
"PPD.GZ)"
-#: ../panels/printers/cc-printers-panel.c:2365
+#: ../panels/printers/cc-printers-panel.c:2404
msgid "No suitable driver found"
msgstr "Fant ingen passende driver"
-#: ../panels/printers/cc-printers-panel.c:2436
+#: ../panels/printers/cc-printers-panel.c:2475
msgid "Searching for preferred drivers…"
msgstr "Søker etter foretrukne drivere …"
-#: ../panels/printers/cc-printers-panel.c:2457
+#: ../panels/printers/cc-printers-panel.c:2496
msgid "Select from database…"
msgstr "Velg fra database …"
-#: ../panels/printers/cc-printers-panel.c:2466
+#: ../panels/printers/cc-printers-panel.c:2505
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:2613
-#: ../panels/printers/cc-printers-panel.c:2636
+#: ../panels/printers/cc-printers-panel.c:2652
+#: ../panels/printers/cc-printers-panel.c:2675
msgid "Test page"
msgstr "Testside"
-#: ../panels/printers/cc-printers-panel.c:2749
-msgid "No printers"
-msgstr "Ingen skrivere"
-
#. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:3095
+#: ../panels/printers/cc-printers-panel.c:3133
#, c-format
msgid "Could not load ui: %s"
msgstr "Klarte ikke å laste brukergrensesnitt: %s"
@@ -4254,22 +4320,24 @@ msgstr "Tøm alle"
msgid "No Active Printer Jobs"
msgstr "Ingen aktive utskriftsjobber"
-#: ../panels/printers/new-printer-dialog.ui.h:1
-msgid "Add a New Printer"
-msgstr "Legg til ny skriver"
+#. Translators: This is the title presented at top of the dialog.
+#: ../panels/printers/new-printer-dialog.ui.h:2
+#: ../panels/printers/printers.ui.h:1
+msgid "Add Printer"
+msgstr "Legg til skriver"
#. Translators: This button opens authentication dialog for selected server.
-#: ../panels/printers/new-printer-dialog.ui.h:5
-msgid "A_uthenticate"
-msgstr "A_utentiser"
+#: ../panels/printers/new-printer-dialog.ui.h:6
+msgid "_Unlock"
+msgstr "Lås _opp"
-#. Translators: No printers were found
-#: ../panels/printers/new-printer-dialog.ui.h:7
-msgid "No printers detected."
-msgstr "Fant ingen skrivere."
+#. Translators: No printers were detected
+#: ../panels/printers/new-printer-dialog.ui.h:8
+msgid "No Printers Found"
+msgstr "Fant ingen skrivere"
#. Translators: The entered text should contain network address of a printer or a text which will filter
found devices (their names and locations)
-#: ../panels/printers/new-printer-dialog.ui.h:9
+#: ../panels/printers/new-printer-dialog.ui.h:10
msgid "Enter a network address or search for a printer"
msgstr "Skriv inn en nettverksadresse, eller søk etter en skriver"
@@ -4287,7 +4355,7 @@ msgid "Select"
msgstr "Velg"
#: ../panels/printers/ppd-selection-dialog.ui.h:4
-msgid "Loading drivers database..."
+msgid "Loading drivers database…"
msgstr "Laster driverdatabase …"
#. Translators: The found device is a JetDirect printer
@@ -4384,43 +4452,47 @@ msgstr "Fullført"
#: ../panels/printers/pp-jobs-dialog.c:289
#, c-format
msgctxt "Printer jobs dialog title"
-msgid "%s - Active Jobs"
-msgstr "%s - Aktive jobber"
+msgid "%s — Active Jobs"
+msgstr "%s – Aktive jobber"
+
+#: ../panels/printers/pp-new-printer-dialog.c:733
+msgid "Searching for Printers"
+msgstr "Søker etter skrivere"
#. Translators: The found device is a printer connected via USB
-#: ../panels/printers/pp-new-printer-dialog.c:1659
+#: ../panels/printers/pp-new-printer-dialog.c:1657
msgid "USB"
msgstr "USB"
#. Translators: The found device is a printer connected via serial port
-#: ../panels/printers/pp-new-printer-dialog.c:1664
+#: ../panels/printers/pp-new-printer-dialog.c:1662
msgid "Serial Port"
msgstr "Seriellport"
#. Translators: The found device is a printer connected via parallel port
-#: ../panels/printers/pp-new-printer-dialog.c:1671
+#: ../panels/printers/pp-new-printer-dialog.c:1669
msgid "Parallel Port"
msgstr "Parallellport"
#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/printers/pp-new-printer-dialog.c:1676
+#: ../panels/printers/pp-new-printer-dialog.c:1674
msgid "Bluetooth"
msgstr "Bluetooth"
#. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: ../panels/printers/pp-new-printer-dialog.c:1713
+#: ../panels/printers/pp-new-printer-dialog.c:1711
#, c-format
msgid "Location: %s"
msgstr "Plassering: %s"
#. Translators: Network address of found printer
-#: ../panels/printers/pp-new-printer-dialog.c:1718
+#: ../panels/printers/pp-new-printer-dialog.c:1716
#, c-format
msgid "Address: %s"
msgstr "Adresse: %s"
#. Translators: This item is a server which needs authentication to show its printers
-#: ../panels/printers/pp-new-printer-dialog.c:1747
+#: ../panels/printers/pp-new-printer-dialog.c:1745
msgid "Server requires authentication"
msgstr "Tjener krever autentisering"
@@ -4560,10 +4632,6 @@ msgid "Enter your username and password to view printers available on %s."
msgstr ""
"Oppgi brukernavn og passord for å vise skrivere som er tilgjengelig på %s."
-#: ../panels/printers/printers.ui.h:1
-msgid "Add Printer"
-msgstr "Legg til skriver"
-
#: ../panels/printers/printers.ui.h:2
msgid "Remove Printer"
msgstr "Fjern skriver"
@@ -4618,84 +4686,88 @@ msgstr "Skriv ut _testside"
msgid "_Options"
msgstr "_Alternativer"
+#: ../panels/printers/printers.ui.h:23
+msgid "No printers"
+msgstr "Ingen skrivere"
+
#. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:24
+#: ../panels/printers/printers.ui.h:25
msgid "Add a Printer"
msgstr "Legg til en skriver"
#. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:26
+#: ../panels/printers/printers.ui.h:27
msgid ""
"Sorry! The system printing service\n"
-"doesn't seem to be available."
+"doesn’t seem to be available."
msgstr ""
"Beklager! Systemets utskriftstjeneste\n"
"ser ikke ut til å være tilgjengelig."
-#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24
+#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24
msgid "Screen Lock"
msgstr "Lås skjerm"
-#: ../panels/privacy/cc-privacy-panel.c:420
+#: ../panels/privacy/cc-privacy-panel.c:438
msgid "In use"
msgstr "I bruk"
-#: ../panels/privacy/cc-privacy-panel.c:425
+#: ../panels/privacy/cc-privacy-panel.c:443
msgctxt "Location services status"
msgid "On"
msgstr "På"
-#: ../panels/privacy/cc-privacy-panel.c:426
+#: ../panels/privacy/cc-privacy-panel.c:444
msgctxt "Location services status"
msgid "Off"
msgstr "Av"
-#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42
+#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42
msgid "Location Services"
msgstr "Stedstjenester"
-#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19
+#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19
msgid "Usage & History"
msgstr "Bruk og historikk"
-#: ../panels/privacy/cc-privacy-panel.c:1001
+#: ../panels/privacy/cc-privacy-panel.c:1067
msgid "Empty all items from Trash?"
msgstr "Tøm alle oppføringer fra papirkurven?"
-#: ../panels/privacy/cc-privacy-panel.c:1002
+#: ../panels/privacy/cc-privacy-panel.c:1068
msgid "All items in the Trash will be permanently deleted."
msgstr "Alle elementer i papirkurven slettes permanent."
-#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34
msgid "_Empty Trash"
msgstr "_Tøm papirkurv"
-#: ../panels/privacy/cc-privacy-panel.c:1026
+#: ../panels/privacy/cc-privacy-panel.c:1092
msgid "Delete all the temporary files?"
msgstr "Slett alle midlertidige filer?"
-#: ../panels/privacy/cc-privacy-panel.c:1027
+#: ../panels/privacy/cc-privacy-panel.c:1093
msgid "All the temporary files will be permanently deleted."
msgstr "Alle midlertidige filer slettes permanent."
-#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35
+#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35
msgid "_Purge Temporary Files"
msgstr "_Fjern midlertidige filer"
-#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29
msgid "Purge Trash & Temporary Files"
msgstr "Tøm papirkurv og midlertidige filer"
-#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36
msgid "Software Usage"
msgstr "Bruk av programvare"
-#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46
+#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46
msgid "Problem Reporting"
msgstr "Problemrapportering"
#. translators: '%s' is the distributor's name, such as 'Fedora'
-#: ../panels/privacy/cc-privacy-panel.c:1145
+#: ../panels/privacy/cc-privacy-panel.c:1211
#, c-format
msgid ""
"Sending reports of technical problems helps us improve %s. Reports are sent "
@@ -4704,7 +4776,7 @@ msgstr ""
"Problemrapportering hjelper oss med å forbedre %s. Rapporter sendes anonymt, "
"og inneholder ikke personlig data."
-#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41
+#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41
msgid "Privacy Policy"
msgstr "Personvernregler"
@@ -4889,21 +4961,21 @@ msgctxt "Input Source"
msgid "Other"
msgstr "Annen"
-#: ../panels/region/cc-region-panel.c:248
-#: ../panels/user-accounts/um-user-panel.c:1069
+#: ../panels/region/cc-region-panel.c:247
+#: ../panels/user-accounts/um-user-panel.c:1087
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:252
-#: ../panels/user-accounts/um-user-panel.c:1073
+#: ../panels/region/cc-region-panel.c:251
+#: ../panels/user-accounts/um-user-panel.c:1091
msgid "Restart Now"
msgstr "Start på nytt nå"
-#: ../panels/region/cc-region-panel.c:889
+#: ../panels/region/cc-region-panel.c:888
msgid "No input source selected"
msgstr "Ingen inndatakilder valgt"
-#: ../panels/region/cc-region-panel.c:1807
+#: ../panels/region/cc-region-panel.c:1779
msgid "Login _Screen"
msgstr "Påloggings_skjerm"
@@ -4955,7 +5027,7 @@ msgid "Add an Input Source"
msgstr "Legg til en inndatakilde"
#: ../panels/region/input-chooser.ui.h:4
-msgid "Input methods can't be used on the login screen"
+msgid "Input methods can’t be used on the login screen"
msgstr "Inndatametoder kan ikke brukes på påloggingsskjermen"
#: ../panels/region/input-options.ui.h:1
@@ -5003,7 +5075,7 @@ msgid "Left+Right Alt"
msgstr "Venstre+høyre Alt"
#: ../panels/region/region.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
msgid "_Language"
msgstr "_Språk"
@@ -5052,26 +5124,11 @@ msgid "Login settings are used by all users when logging into the system"
msgstr ""
"Innstillinger for pålogging brukes av alle brukere når de logger på systemet"
-#: ../panels/search/cc-search-locations-dialog.c:476
-msgctxt "Search Location"
-msgid "Places"
-msgstr "Steder"
-
-#: ../panels/search/cc-search-locations-dialog.c:478
-msgctxt "Search Location"
-msgid "Bookmarks"
-msgstr "Bokmerker"
-
-#: ../panels/search/cc-search-locations-dialog.c:480
-msgctxt "Search Location"
-msgid "Other"
-msgstr "Annet"
-
-#: ../panels/search/cc-search-locations-dialog.c:678
+#: ../panels/search/cc-search-locations-dialog.c:634
msgid "Select Location"
msgstr "Velg lokasjon"
-#: ../panels/search/cc-search-locations-dialog.c:682
+#: ../panels/search/cc-search-locations-dialog.c:638
msgid "_OK"
msgstr "_OK"
@@ -5099,6 +5156,18 @@ msgstr "Søk;finn;Indeks;Skjul;Personvern;Resultater;"
msgid "Search Locations"
msgstr "Søkelokasjoner"
+#: ../panels/search/search-locations-dialog.ui.h:2
+msgid "Places"
+msgstr "Steder"
+
+#: ../panels/search/search-locations-dialog.ui.h:3
+msgid "Bookmarks"
+msgstr "Bokmerker"
+
+#: ../panels/search/search-locations-dialog.ui.h:4
+msgid "Other"
+msgstr "Annen"
+
#: ../panels/search/search.ui.h:1
msgid "Move Up"
msgstr "Flytt opp"
@@ -5111,6 +5180,11 @@ msgstr "Flytt ned"
msgid "Preferences"
msgstr "Brukervalg"
+#. Label
+#: ../panels/sharing/cc-sharing-networks.c:303
+msgid "No networks selected for sharing"
+msgstr "Ingen nettverk valgt for deling"
+
#: ../panels/sharing/cc-sharing-panel.c:263
msgctxt "service is enabled"
msgid "On"
@@ -5146,19 +5220,20 @@ msgstr ""
"nettverk ved å bruke: <a href=\"dav://%s\"dav://%s</a>"
#: ../panels/sharing/cc-sharing-panel.c:682
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Allow remote users to connect using the Secure Shell command:\n"
+"When remote login is enabled, remote users can connect using the Secure "
+"Shell command:\n"
"<a href=\"ssh %s\">ssh %s</a>"
msgstr ""
"Tillat at eksterne brukere kobler til med Secure Shell-kommandoen:\n"
"<a href=\"ssh %s\">ssh %s</a>"
#: ../panels/sharing/cc-sharing-panel.c:684
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Allow remote users to view or control your screen by connecting to: <a href="
-"\"vnc://%s\">vnc://%s</a>"
+"Screen sharing allows remote users to view or control your screen by "
+"connecting to <a href=\"vnc://%s\">vnc://%s</a>"
msgstr ""
"Tillat eksterne brukere å se eller kontrollere skjermen ved å koble til: <a "
"href=\"vnc://%s\">vnc://%s</a>"
@@ -5189,6 +5264,10 @@ msgstr ""
"del;deling;ssh;vert;navn;ekstern;skrivebord;media;lyd;video;bilder;foto;"
"filmer;tjener;visning;"
+#: ../panels/sharing/networks.ui.h:1
+msgid "Networks"
+msgstr "Nettverk"
+
#: ../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"
@@ -5197,25 +5276,13 @@ msgstr "Slå på eller av ekstern pålogging"
msgid "Authentication is required to enable or disable remote login"
msgstr "Du må autentisere deg for å slå av eller på ekstern pålogging"
-#. Label
-#: ../panels/sharing/cc-sharing-networks.c:303
-msgid "No networks selected for sharing"
-msgstr "Ingen nettverk valgt for deling"
-
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../panels/sharing/networks.ui.h:1
-msgid "Networks"
-msgstr "Nettverk"
-
#: ../panels/sharing/sharing.ui.h:1
msgid "_Computer Name"
msgstr "Navn på _datamaskin"
#: ../panels/sharing/sharing.ui.h:2
-msgid "_Personal File Sharing"
-msgstr "_Personlig fildeling"
+msgid "_File Sharing"
+msgstr "_Fildeling"
#: ../panels/sharing/sharing.ui.h:3
msgid "_Screen Sharing"
@@ -5234,8 +5301,8 @@ msgid "Some services are disabled because of no network access."
msgstr "Noen tjenester er slått av fordi det ikke finnes nettverk."
#: ../panels/sharing/sharing.ui.h:7
-msgid "Personal File Sharing"
-msgstr "Personlig fildeling"
+msgid "File Sharing"
+msgstr "Fildeling"
#: ../panels/sharing/sharing.ui.h:8
msgid "_Require Password"
@@ -5250,8 +5317,8 @@ msgid "Screen Sharing"
msgstr "Deling av skjerm"
#: ../panels/sharing/sharing.ui.h:12
-msgid "_Allow Remote Control"
-msgstr "Till_at fjernstyring"
+msgid "_Allow connections to control the screen"
+msgstr "Till_at tilkoblinger å kontrollere skjermen"
#: ../panels/sharing/sharing.ui.h:13
msgid "_Password:"
@@ -5278,10 +5345,8 @@ msgid "Media Sharing"
msgstr "Deling av media"
#: ../panels/sharing/sharing.ui.h:19
-msgid ""
-"Media sharing allows you to share music, photos and videos over the network."
-msgstr ""
-"Mediedeling lar deg dele musikk, bilder og videoer med andre over nettverket."
+msgid "Share music, photos and videos over the network."
+msgstr "Del musikk, bilder og videoer over nettverket."
#: ../panels/sharing/sharing.ui.h:20
msgid "Folders"
@@ -5411,11 +5476,6 @@ msgstr "_Test høyttalere"
msgid "Peak detect"
msgstr "Bestem høyeste nivå"
-#: ../panels/sound/gvc-mixer-dialog.c:1493
-#: ../panels/sound/gvc-sound-theme-chooser.c:564
-msgid "Name"
-msgstr "Navn"
-
#: ../panels/sound/gvc-mixer-dialog.c:1512
msgid "Device"
msgstr "Enhet"
@@ -6004,95 +6064,67 @@ msgid "Color Effects"
msgstr "Fargeeffekter"
#: ../panels/user-accounts/data/account-dialog.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
-#: ../panels/user-accounts/um-account-type.c:34
-msgctxt "Account type"
+#: ../panels/user-accounts/data/join-dialog.ui.h:1
+msgid "Add User"
+msgstr "Legg til bruker"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:5
+msgid "_Full Name"
+msgstr "_Fullt navn"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
msgid "Standard"
msgstr "Standard"
-#: ../panels/user-accounts/data/account-dialog.ui.h:2
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-type.c:36
-msgctxt "Account type"
+#: ../panels/user-accounts/data/account-dialog.ui.h:7
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
msgid "Administrator"
msgstr "Administrator"
-#: ../panels/user-accounts/data/account-dialog.ui.h:4
-msgid "_Full Name"
-msgstr "_Fullt navn"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:5
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: ../panels/user-accounts/data/account-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
msgid "Account _Type"
msgstr "_Type konto"
-#: ../panels/user-accounts/data/account-dialog.ui.h:7
+#: ../panels/user-accounts/data/account-dialog.ui.h:10
msgid "Allow user to set a password when they next _login"
msgstr "La bruker sette et passord ved neste på_logging"
-#: ../panels/user-accounts/data/account-dialog.ui.h:8
+#: ../panels/user-accounts/data/account-dialog.ui.h:11
msgid "Set a password _now"
msgstr "Sett et passord _nå"
-#: ../panels/user-accounts/data/account-dialog.ui.h:10
-msgid "_Verify"
-msgstr "_Verifiser"
+#: ../panels/user-accounts/data/account-dialog.ui.h:13
+msgid "_Confirm"
+msgstr "Be_kreft"
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
+#: ../panels/user-accounts/data/account-dialog.ui.h:14
+#, fuzzy
msgid ""
"Enterprise login allows an existing centrally managed user account to be "
-"used on this device."
+"used on this device. You can also use this account to access company "
+"resources on the internet."
msgstr ""
"Bedriftspålogging lar deg bruke en eksisterende og sentralt håndtert "
"brukerkoknto på denne enheten."
-#: ../panels/user-accounts/data/account-dialog.ui.h:12
+#: ../panels/user-accounts/data/account-dialog.ui.h:15
+#: ../panels/user-accounts/data/join-dialog.ui.h:9
msgid "_Domain"
msgstr "_Domene"
-#: ../panels/user-accounts/data/account-dialog.ui.h:13
-msgid ""
-"Go online to add\n"
-"enterprise login accounts."
-msgstr ""
-"Gå på nettet\n"
-"for å legge til bedriftspåloggingskontoer."
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:15
-msgid "_Enterprise Login"
-msgstr "Innlogging for b_edrifter"
-
#: ../panels/user-accounts/data/account-dialog.ui.h:16
-#: ../panels/user-accounts/um-account-dialog.c:1466
-msgid "Add User"
-msgstr "Legg til bruker"
-
-#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: ../panels/user-accounts/data/account-dialog.ui.h:19
-msgid "_Enroll"
-msgstr "_Meld inn"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:20
-msgid "Domain Administrator Login"
-msgstr "Brukernavn for domeneadministrator"
+msgid "You are Offline"
+msgstr "Du er frakoblet"
-#: ../panels/user-accounts/data/account-dialog.ui.h:21
-msgid ""
-"In order to use enterprise logins, this computer needs to be\n"
-"enrolled in the domain. Please have your network administrator\n"
-"type their domain password here."
-msgstr ""
-"For å bruke pålogging for bedrifter må datamaskinen være medlem\n"
-"i domenet. Be domeneadministrator om å skrive inn\n"
-"domenepassord her."
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:24
-msgid "Administrator _Name"
-msgstr "_Navn på administrator"
+#: ../panels/user-accounts/data/account-dialog.ui.h:17
+msgid "You must be online in order to add enterprise users."
+msgstr "Du må være tilkoblet for å legge til bedriftspåloggingskontoer."
-#: ../panels/user-accounts/data/account-dialog.ui.h:25
-msgid "Administrator Password"
-msgstr "Passord for administrator"
+#: ../panels/user-accounts/data/account-dialog.ui.h:18
+msgid "_Enterprise Login"
+msgstr "Innlogging for b_edrifter"
#: ../panels/user-accounts/data/account-fingerprint.ui.h:1
msgid "Left thumb"
@@ -6127,7 +6159,7 @@ msgid "Right little finger"
msgstr "Høyre lillefinger"
#: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:688
+#: ../panels/user-accounts/um-fingerprint-dialog.c:687
msgid "Enable Fingerprint Login"
msgstr "Slå på innlogging med fingeravtrykk"
@@ -6163,9 +6195,32 @@ msgstr "Legg til eller fjern brukere og bytt passord"
msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
msgstr "Login;Navn;Fingeravtrykk;Avatar;Logo;Ansikt;Passord;"
-#: ../panels/user-accounts/data/history-dialog.ui.h:1
-msgid "Login History"
-msgstr "Historikk for innlogging"
+#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
+#: ../panels/user-accounts/data/join-dialog.ui.h:4
+msgid "_Enroll"
+msgstr "_Meld inn"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:5
+msgid "Domain Administrator Login"
+msgstr "Brukernavn for domeneadministrator"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:6
+msgid ""
+"In order to use enterprise logins, this computer needs to be\n"
+"enrolled in the domain. Please have your network administrator\n"
+"type their domain password here."
+msgstr ""
+"For å bruke pålogging for bedrifter må datamaskinen være medlem\n"
+"i domenet. Be domeneadministrator om å skrive inn\n"
+"domenepassord her."
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:10
+msgid "Administrator _Name"
+msgstr "_Navn på administrator"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:11
+msgid "Administrator Password"
+msgstr "Passord for administrator"
#: ../panels/user-accounts/data/password-dialog.ui.h:1
msgid "Change Password"
@@ -6188,38 +6243,30 @@ msgid "Current _Password"
msgstr "Gjeldende _passord"
#: ../panels/user-accounts/data/password-dialog.ui.h:7
-msgid "Allow user to set a password when they next login"
-msgstr "La bruker velge passord ved neste pålogging"
+msgid "Allow user to change their password on next login"
+msgstr "La bruker endre sitt passord ved neste pålogging"
#: ../panels/user-accounts/data/password-dialog.ui.h:8
msgid "Set a password now"
msgstr "Velg passord nå"
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Add User Account"
-msgstr "Legg til brukerkonto"
-
-#: ../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:1
+msgid "_Add User…"
+msgstr "_Legg til bruker …"
#: ../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:8
msgid "A_utomatic Login"
msgstr "A_utomatisk pålogging"
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
msgid "_Fingerprint Login"
msgstr "Innlogging med _fingeravtrykk"
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
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:10
msgid "Last Login"
msgstr "Siste pålogging"
@@ -6322,8 +6369,8 @@ msgstr "Prøv å legge til flere bokstaver, tall og symboler."
#: ../panels/user-accounts/pw-utils.c:117
msgctxt "Password hint"
-msgid "Mix uppercase and lowercase and use a number or two."
-msgstr "Bland store og små bokstaver, og bruk et tall eller to."
+msgid "Mix uppercase and lowercase and try to use a number or two."
+msgstr "Bland store og små bokstaver, og prøv å bruke et tall eller to."
#: ../panels/user-accounts/pw-utils.c:119
msgctxt "Password hint"
@@ -6414,81 +6461,92 @@ msgid "Unknown error"
msgstr "Ukjent feil"
#: ../panels/user-accounts/um-account-dialog.c:34
-msgid "Should match the web address of your account provider."
+#, fuzzy
+msgid "Should match the web address of your login provider."
msgstr "Skal være lik kontotilbyders nettstedsadresse."
#: ../panels/user-accounts/um-account-dialog.c:228
msgid "Failed to add account"
msgstr "Klarte ikke å legge til en konto"
-#: ../panels/user-accounts/um-account-dialog.c:452
+#: ../panels/user-accounts/um-account-dialog.c:448
msgid "Passwords do not match."
msgstr "Passordene er ikke like."
-#: ../panels/user-accounts/um-account-dialog.c:733
-#: ../panels/user-accounts/um-account-dialog.c:779
-#: ../panels/user-accounts/um-account-dialog.c:800
+#: ../panels/user-accounts/um-account-dialog.c:702
+#: ../panels/user-accounts/um-account-dialog.c:748
+#: ../panels/user-accounts/um-account-dialog.c:769
msgid "Failed to register account"
msgstr "Klarte ikke å registrere konto"
-#: ../panels/user-accounts/um-account-dialog.c:923
+#: ../panels/user-accounts/um-account-dialog.c:892
msgid "No supported way to authenticate with this domain"
msgstr "Ingen støttet måte å autentisere med dette domenet"
-#: ../panels/user-accounts/um-account-dialog.c:982
+#: ../panels/user-accounts/um-account-dialog.c:965
msgid "Failed to join domain"
msgstr "Klarte ikke å bli med i domenet"
-#: ../panels/user-accounts/um-account-dialog.c:1043
+#: ../panels/user-accounts/um-account-dialog.c:1026
msgid ""
-"That login name didn't work.\n"
+"That login name didn’t work.\n"
"Please try again."
msgstr ""
"Brukernavnet virket ikke.\n"
"Vennligst prøv igjen."
-#: ../panels/user-accounts/um-account-dialog.c:1050
+#: ../panels/user-accounts/um-account-dialog.c:1033
msgid ""
-"That login password didn't work.\n"
+"That login password didn’t work.\n"
"Please try again."
msgstr ""
-"Passordet virket ikke.\n"
+"Passordet for påloggingen virket ikke.\n"
"Vennligst prøv igjen."
-#: ../panels/user-accounts/um-account-dialog.c:1058
+#: ../panels/user-accounts/um-account-dialog.c:1041
msgid "Failed to log into domain"
msgstr "Klarte ikke å logge inn i domenet"
-#: ../panels/user-accounts/um-account-dialog.c:1116
+#: ../panels/user-accounts/um-account-dialog.c:1099
msgid "Unable find the domain. Maybe you misspelled it?"
msgstr "Fant ikke domenet. Kanskje du stavet det feil?"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:140
+#: ../panels/user-accounts/um-account-type.c:34
+msgctxt "Account type"
+msgid "Standard"
+msgstr "Standard"
+
+#: ../panels/user-accounts/um-account-type.c:36
+msgctxt "Account type"
+msgid "Administrator"
+msgstr "Administrator"
+
+#: ../panels/user-accounts/um-fingerprint-dialog.c:138
msgid ""
"You are not allowed to access the device. Contact your system administrator."
msgstr "Du har ikke tilgang til enheten. Kontakt systemadministrator."
-#: ../panels/user-accounts/um-fingerprint-dialog.c:142
+#: ../panels/user-accounts/um-fingerprint-dialog.c:140
msgid "The device is already in use."
msgstr "Enheten er allerede i bruk."
-#: ../panels/user-accounts/um-fingerprint-dialog.c:144
+#: ../panels/user-accounts/um-fingerprint-dialog.c:142
msgid "An internal error occurred."
msgstr "En intern feil har oppstått."
-#: ../panels/user-accounts/um-fingerprint-dialog.c:218
+#: ../panels/user-accounts/um-fingerprint-dialog.c:216
msgid "Enabled"
msgstr "Slått på"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:265
+#: ../panels/user-accounts/um-fingerprint-dialog.c:264
msgid "Delete registered fingerprints?"
msgstr "Slett registrerte fingeravtrykk?"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:269
+#: ../panels/user-accounts/um-fingerprint-dialog.c:268
msgid "_Delete Fingerprints"
msgstr "_Slett fingeravtrykk"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:275
+#: ../panels/user-accounts/um-fingerprint-dialog.c:274
msgid ""
"Do you want to delete your registered fingerprints so fingerprint login is "
"disabled?"
@@ -6496,32 +6554,32 @@ msgstr ""
"Vil du slette dine registrerte fingeravtrykk slik at innlogging med "
"fingeravtrykk slås av?"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:445
+#: ../panels/user-accounts/um-fingerprint-dialog.c:444
msgid "Done!"
msgstr "Ferdig"
#. translators:
#. * The variable is the name of the device, for example:
#. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:506
-#: ../panels/user-accounts/um-fingerprint-dialog.c:548
+#: ../panels/user-accounts/um-fingerprint-dialog.c:505
+#: ../panels/user-accounts/um-fingerprint-dialog.c:547
#, c-format
-msgid "Could not access '%s' device"
+msgid "Could not access “%s” device"
msgstr "Kunne ikke aksessere enheten «%s»"
#. translators:
#. * The variable is the name of the device, for example:
#. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:589
-#, c-format
-msgid "Could not start finger capture on '%s' device"
+#: ../panels/user-accounts/um-fingerprint-dialog.c:588
+#, c-format, fuzzy
+msgid "Could not start finger capture on “%s” device"
msgstr "Kunne ikke starte innlesing av data på enhet «%s»"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:639
+#: ../panels/user-accounts/um-fingerprint-dialog.c:638
msgid "Could not access any fingerprint readers"
msgstr "Kunne ikke aksessere fingeravtrykkleser"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:640
+#: ../panels/user-accounts/um-fingerprint-dialog.c:639
msgid "Please contact your system administrator for help."
msgstr "Kontakt systemadministrator for hjelp."
@@ -6530,20 +6588,20 @@ msgstr "Kontakt systemadministrator for hjelp."
#. * "To enable fingerprint login, you need to save one of your fingerprints, using the
#. * 'Digital Persona U.are.U 4000/4000B' device."
#.
-#: ../panels/user-accounts/um-fingerprint-dialog.c:722
-#, c-format
+#: ../panels/user-accounts/um-fingerprint-dialog.c:721
+#, fuzzy, c-format
msgid ""
"To enable fingerprint login, you need to save one of your fingerprints, "
-"using the '%s' device."
+"using the “%s” device."
msgstr ""
"Du må lagre ett av dine fingeravtrykk med enheten «%s» for å slå på "
"innlogging med fingeravtrykk."
-#: ../panels/user-accounts/um-fingerprint-dialog.c:729
+#: ../panels/user-accounts/um-fingerprint-dialog.c:728
msgid "Selecting finger"
msgstr "Velger finger"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:730
+#: ../panels/user-accounts/um-fingerprint-dialog.c:729
msgid "Enrolling fingerprints"
msgstr "Registrerer fingeravtrykk"
@@ -6577,8 +6635,8 @@ msgstr "%e. %b, %Y"
#: ../panels/user-accounts/um-history-dialog.c:93
#, c-format
msgctxt "login history week label"
-msgid "%s - %s"
-msgstr "%s - %s"
+msgid "%s — %s"
+msgstr "%s – %s"
#. Translators: This is a time format string in the style of "22:58".
#. It indicates a login time which follows a date.
@@ -6597,14 +6655,21 @@ msgctxt "login date-time"
msgid "%s, %s"
msgstr "%s, %s"
-#: ../panels/user-accounts/um-history-dialog.c:249
+#: ../panels/user-accounts/um-history-dialog.c:250
msgid "Session Ended"
msgstr "Økten ble avsluttet"
-#: ../panels/user-accounts/um-history-dialog.c:255
+#: ../panels/user-accounts/um-history-dialog.c:256
msgid "Session Started"
msgstr "Økten startet"
+#. Translators: This is the title of the "Account Activity" dialog.
+#. The %s is the user real name.
+#: ../panels/user-accounts/um-history-dialog.c:299
+#, c-format
+msgid "%s — Account Activity"
+msgstr "%s – kontoaktivitet"
+
#: ../panels/user-accounts/um-password-dialog.c:145
msgid "Please choose another password."
msgstr "Velg et annet passord."
@@ -6662,11 +6727,11 @@ msgid "Invalid password, please try again"
msgstr "Ugyldig passord. Prøv igjen"
#: ../panels/user-accounts/um-realm-manager.c:834
-#, c-format
-msgid "Couldn't connect to the %s domain: %s"
+#, fuzzy, c-format
+msgid "Couldn’t connect to the %s domain: %s"
msgstr "Kunne ikke koble til domenet %s: %s"
-#: ../panels/user-accounts/um-user-panel.c:237
+#: ../panels/user-accounts/um-user-panel.c:239
msgid "Other Accounts"
msgstr "Andre kontoer"
@@ -6699,7 +6764,7 @@ msgstr ""
#: ../panels/user-accounts/um-user-panel.c:696
#, c-format
-msgid "Do you want to keep %s's files?"
+msgid "Do you want to keep %s’s files?"
msgstr "Vil du beholde filene til %s?"
#: ../panels/user-accounts/um-user-panel.c:700
@@ -6720,7 +6785,7 @@ msgstr "_Behold filer"
#: ../panels/user-accounts/um-user-panel.c:718
#, c-format
-msgid "Are you sure you want to revoke remotely managed %s's account?"
+msgid "Are you sure you want to revoke remotely managed %s’s account?"
msgstr ""
"Er du sikker på at du vil trekke tilbake eksternt håndtert konto for %s?"
@@ -6747,15 +6812,15 @@ msgstr "Ingen"
msgid "Logged in"
msgstr "Logget inn"
-#: ../panels/user-accounts/um-user-panel.c:1272
+#: ../panels/user-accounts/um-user-panel.c:1290
msgid "Failed to contact the accounts service"
msgstr "Klarte ikke å kontakte kontotjenesten"
-#: ../panels/user-accounts/um-user-panel.c:1274
+#: ../panels/user-accounts/um-user-panel.c:1292
msgid "Please make sure that the AccountService is installed and enabled."
msgstr "Sjekk at kontotjenesten er installert og aktivert."
-#: ../panels/user-accounts/um-user-panel.c:1315
+#: ../panels/user-accounts/um-user-panel.c:1334
msgid ""
"To make changes,\n"
"click the * icon first"
@@ -6763,12 +6828,12 @@ msgstr ""
"Klikk på *-ikonet\n"
"for å gjøre endringer"
-#: ../panels/user-accounts/um-user-panel.c:1353
+#: ../panels/user-accounts/um-user-panel.c:1374
msgid "Create a user account"
msgstr "Lag en ny brukerkonto"
-#: ../panels/user-accounts/um-user-panel.c:1364
-#: ../panels/user-accounts/um-user-panel.c:1676
+#: ../panels/user-accounts/um-user-panel.c:1385
+#: ../panels/user-accounts/um-user-panel.c:1677
msgid ""
"To create a user account,\n"
"click the * icon first"
@@ -6776,12 +6841,12 @@ msgstr ""
"Klikk på *-ikonet\n"
"for å lage en brukerkonto"
-#: ../panels/user-accounts/um-user-panel.c:1374
+#: ../panels/user-accounts/um-user-panel.c:1395
msgid "Delete the selected user account"
msgstr "Slett valgt brukerkonto"
-#: ../panels/user-accounts/um-user-panel.c:1386
-#: ../panels/user-accounts/um-user-panel.c:1681
+#: ../panels/user-accounts/um-user-panel.c:1407
+#: ../panels/user-accounts/um-user-panel.c:1682
msgid ""
"To delete the selected user account,\n"
"click the * icon first"
@@ -6789,34 +6854,33 @@ msgstr ""
"Klikk på *-ikonet\n"
"for å slette valgt brukerkonto"
-#: ../panels/user-accounts/um-user-panel.c:1590
+#: ../panels/user-accounts/um-user-panel.c:1591
msgid "My Account"
msgstr "Min konto"
#: ../panels/user-accounts/um-utils.c:563
-#, c-format
-msgid "A user with the username '%s' already exists."
-msgstr "Brukernavnet «%s» finnes allerede."
+msgid "Sorry, that user name isn’t available. Please try another."
+msgstr "Beklager, det brukernavnet er ikke tilgjengelig. Prøv et annet."
-#: ../panels/user-accounts/um-utils.c:567
+#: ../panels/user-accounts/um-utils.c:566
#, c-format
msgid "The username is too long."
msgstr "Brukernavnet er for langt."
-#: ../panels/user-accounts/um-utils.c:570
-msgid "The username cannot start with a '-'."
+#: ../panels/user-accounts/um-utils.c:569
+msgid "The username cannot start with a “-”."
msgstr "Brukernavnet kan ikke begynne med tegnet «-»."
-#: ../panels/user-accounts/um-utils.c:573
+#: ../panels/user-accounts/um-utils.c:572
msgid ""
-"The username should only consist of lower and upper case letters from a-z, "
-"digits and any of characters '.', '-' and '_'."
+"The username should only consist of upper and lower case letters from a-z, "
+"digits and the following characters: . - _"
msgstr ""
"Brukernavnet kan bare inneholde små og store bokstaver fra a-z, tall, samt "
"tegnene «.», «-» og «_»."
-#: ../panels/user-accounts/um-utils.c:577
-msgid "This will be used to name your home folder and can't be changed."
+#: ../panels/user-accounts/um-utils.c:576
+msgid "This will be used to name your home folder and can’t be changed."
msgstr "Dette brukes til å gi hjemmemappen et navn, og kan ikke endres."
#: ../panels/wacom/button-mapping.ui.h:1
@@ -6828,8 +6892,9 @@ msgid "Map buttons to functions"
msgstr "Koble knapper til funksjoner"
#: ../panels/wacom/button-mapping.ui.h:4
+#, fuzzy
msgid ""
-"To edit a shortcut, choose the \"Send Keystroke\" action, press the keyboard "
+"To edit a shortcut, choose the “Send Keystroke” action, press the keyboard "
"shortcut button and hold down the new keys or press Backspace to clear."
msgstr ""
"Velg handlingen «Send tastetrykk», trykk inn tastatursnarveiknappen og hold "
@@ -6844,7 +6909,7 @@ msgstr ""
"Trykk på målmarkørene når de vises på skjermen for å kalibrere tegnebrettet."
#: ../panels/wacom/calibrator/calibrator-gui.c:87
-msgid "Mis-click detected, restarting..."
+msgid "Mis-click detected, restarting…"
msgstr "Feil klikk oppdaget. Starter på nytt …"
#: ../panels/wacom/cc-wacom-button-row.c:442
@@ -7135,6 +7200,11 @@ msgstr "Nedre knapp"
msgid "Tip Pressure Feel"
msgstr "Følelse av trykk på tuppen"
+#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53
+#: ../shell/cc-window.c:1478
+msgid "All Settings"
+msgstr "Alle innstillinger"
+
#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
msgid "GNOME Control Center"
msgstr "GNOME kontrollsenter"
@@ -7145,11 +7215,9 @@ msgstr "Verktøy som lar deg tilpasse GNOME-skrivebordet"
#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:3
msgid ""
-"The control center is GNOME's main interface for configuration of various "
+"The control center is GNOME’s main interface for configuration of various "
"aspects of your desktop."
-msgstr ""
-"Kontrollsenter er oppsettsgrensesnittet for forskjellige aspekter av GNOME-"
-"skrivebordet."
+msgstr "Kontrollsenter er hovedgrensesnittet for konfigurasjon av forskjellige aspekter av
GNOME-skrivebordet."
#: ../shell/cc-application.c:45
msgid "Display version number"
@@ -7191,22 +7259,18 @@ msgstr "Hjelp"
msgid "Quit"
msgstr "Avslutt"
-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495
-msgid "All Settings"
-msgstr "Alle innstillinger"
-
#. Add categories
-#: ../shell/cc-window.c:881
+#: ../shell/cc-window.c:871
msgctxt "category"
msgid "Personal"
msgstr "Personlig"
-#: ../shell/cc-window.c:882
+#: ../shell/cc-window.c:872
msgctxt "category"
msgid "Hardware"
msgstr "Maskinvare"
-#: ../shell/cc-window.c:883
+#: ../shell/cc-window.c:873
msgctxt "category"
msgid "System"
msgstr "System"
@@ -7244,3 +7308,9 @@ msgstr "Gå tilbake til oversikten"
msgctxt "shortcut window"
msgid "Cancel search"
msgstr "Avbryt søk"
+
+#. translators: This is the default hotspot name, need to be less than 32-bytes
+#: ../shell/hostname-helper.c:189
+msgctxt "hotspot"
+msgid "Hotspot"
+msgstr "Hotspot"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
