merge with code

1 files changed, 107 insertions, 71 deletions

diff --git a/po/nb.po b/po/nb.po
index 297ad8c..09d0b48 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -19,7 +19,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
-"POT-Creation-Date: 2013-01-20 13:26+0100\n"
+"POT-Creation-Date: 2013-02-19 20:47+0100\n"
 "PO-Revision-Date: 2009-10-22 00:11+0200\n"
 "Last-Translator: Olav Dahlum <odahlum@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <mageia-i18n@mandrivalinux.org>\n"
@@ -4150,93 +4150,93 @@ msgstr "WPA/WPA2 forhåndsdelt nøkkel"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Bedrift"
 
-#: ../lib/network/connection/wireless.pm:292
+#: ../lib/network/connection/wireless.pm:284
 #, c-format
 msgid "Windows driver"
 msgstr "Driver for Windows"
 
-#: ../lib/network/connection/wireless.pm:366
+#: ../lib/network/connection/wireless.pm:358
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr "Ditt trådløse nettverkskort er slått av, vennligst slå det på først."
 
-#: ../lib/network/connection/wireless.pm:456
+#: ../lib/network/connection/wireless.pm:448
 #, c-format
 msgid "Wireless settings"
 msgstr "Trådløst oppsett"
 
-#: ../lib/network/connection/wireless.pm:461
+#: ../lib/network/connection/wireless.pm:453
 #: ../lib/network/connection_manager.pm:281
 #: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Operasjonsmodus"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:454
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:454
 #, c-format
 msgid "Managed"
 msgstr "Håndtert"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:454
 #, c-format
 msgid "Master"
 msgstr "Hoved"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:454
 #, c-format
 msgid "Repeater"
 msgstr "Repeterer"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:454
 #, c-format
 msgid "Secondary"
 msgstr "Sekundær"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:454
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:457
 #: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nettverksnavn (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:467
+#: ../lib/network/connection/wireless.pm:459
 #, c-format
 msgid "Encryption mode"
 msgstr "Krypteringsmodus"
 
-#: ../lib/network/connection/wireless.pm:469
+#: ../lib/network/connection/wireless.pm:461
 #: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Krypteringsnøkkel"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "Hide password"
 msgstr "Gjem passord"
 
-#: ../lib/network/connection/wireless.pm:474
+#: ../lib/network/connection/wireless.pm:466
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "Tving bruken av denne nøkkelen som ASCII-streng (f.eks for LiveBox)"
 
-#: ../lib/network/connection/wireless.pm:481
+#: ../lib/network/connection/wireless.pm:473
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP innlogging/brukernavn"
 
-#: ../lib/network/connection/wireless.pm:483
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4247,12 +4247,12 @@ msgstr ""
 "den utestede syntaksen DOMAIN\\username hvis du\n"
 "må å angi domenet."
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:478
 #, c-format
 msgid "EAP Password"
 msgstr "EAP passord"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:481
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4285,12 +4285,12 @@ msgstr ""
 "  Moduset TLS er fullstending sertifikatbasert og kan overse\n"
 "verdiene for brukernavn og passord angitt her."
 
-#: ../lib/network/connection/wireless.pm:503
+#: ../lib/network/connection/wireless.pm:495
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP klientsertifikat"
 
-#: ../lib/network/connection/wireless.pm:505
+#: ../lib/network/connection/wireless.pm:497
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4303,37 +4303,73 @@ msgstr ""
 "bli sett på som alternativet til brukernavn og passord.\n"
 " Merknad: andre relaterte instillinger er vist på siden Avansert."
 
+#: ../lib/network/connection/wireless.pm:501
+#, fuzzy, c-format
+msgid "EAP client private key"
+msgstr "EAP klientsertifikat"
+
+#: ../lib/network/connection/wireless.pm:503
+#, fuzzy, c-format
+msgid ""
+"The complete path and filename of client private key. This is\n"
+"only used for EAP certificate based authentication. It could be\n"
+"considered as the alternative to username/password combo.\n"
+" Note: other related settings are shown on the Advanced page."
+msgstr ""
+"Den komplette stien og filnavnet til klientsertifikatet. Dette blir\n"
+"bare brukt for sertifikatbasert autentisering basert på EAP. Den kan\n"
+"bli sett på som alternativet til brukernavn og passord.\n"
+" Merknad: andre relaterte instillinger er vist på siden Avansert."
+
+#: ../lib/network/connection/wireless.pm:507
+#, fuzzy, c-format
+msgid "EAP client private key password"
+msgstr "EAP klientsertifikat"
+
 #: ../lib/network/connection/wireless.pm:509
+#, fuzzy, c-format
+msgid ""
+"The complete password for the client private key. This is\n"
+"only used for EAP certificate based authentication. This password \n"
+"is used for protected client private keys only. It can be optional.\n"
+" Note: other related settings are shown on the Advanced page."
+msgstr ""
+"Den komplette stien og filnavnet til klientsertifikatet. Dette blir\n"
+"bare brukt for sertifikatbasert autentisering basert på EAP. Den kan\n"
+"bli sett på som alternativet til brukernavn og passord.\n"
+" Merknad: andre relaterte instillinger er vist på siden Avansert."
+
+#: ../lib/network/connection/wireless.pm:513
 #: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "NettverksID"
 
-#: ../lib/network/connection/wireless.pm:510
+#: ../lib/network/connection/wireless.pm:514
 #: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Operasjonsfrekvens"
 
-#: ../lib/network/connection/wireless.pm:511
+#: ../lib/network/connection/wireless.pm:515
 #: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Følsomhetsgrense"
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:516
 #: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (i b/s)"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:517
 #: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4358,19 +4394,19 @@ msgstr ""
 "parameteren til auto, fixed\n"
 "eller off."
 
-#: ../lib/network/connection/wireless.pm:521
+#: ../lib/network/connection/wireless.pm:525
 #: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentering"
 
-#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/connection/wireless.pm:526
 #: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "ekstra argumenter for kommandoen iwconfig"
 
-#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4386,13 +4422,13 @@ msgstr ""
 "Se manualsida iwconfig(8) for mer informasjon."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:530
+#: ../lib/network/connection/wireless.pm:534
 #: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "ekstra argumenter for kommandoen iwspy"
 
-#: ../lib/network/connection/wireless.pm:531
+#: ../lib/network/connection/wireless.pm:535
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4413,13 +4449,13 @@ msgstr ""
 "\n"
 "Se manualsida iwpspy(8) for mer informasjon."
 
-#: ../lib/network/connection/wireless.pm:539
+#: ../lib/network/connection/wireless.pm:543
 #: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "ekstra argumenter for kommandoen iwpriv"
 
-#: ../lib/network/connection/wireless.pm:541
+#: ../lib/network/connection/wireless.pm:545
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4448,28 +4484,28 @@ msgstr ""
 "\n"
 "Se manualsida iwpriv(8) for mer informasjon."
 
-#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/connection/wireless.pm:556
 #, c-format
 msgid "EAP Protocol"
 msgstr "Protokoll for EAP"
 
-#: ../lib/network/connection/wireless.pm:553
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:557
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "Auto Detect"
 msgstr "Automatisk oppdagelse"
 
-#: ../lib/network/connection/wireless.pm:553
+#: ../lib/network/connection/wireless.pm:557
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:553
+#: ../lib/network/connection/wireless.pm:557
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:559
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4478,67 +4514,67 @@ msgstr ""
 "Automatisk oppdagelse anbefales da den først prøver WPA\n"
 "versjon 2 med tilbakefall på WPA versjon 1"
 
-#: ../lib/network/connection/wireless.pm:557
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "EAP Mode"
 msgstr "Modus for EAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:562
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:564
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:562
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4547,12 +4583,12 @@ msgstr ""
 "En liste over aksepterte protokoller for håndtering av\n"
 "autentisering. Mulige valg er: WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:564
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid "EAP outer identity"
 msgstr "Ytre identitet for EAP"
 
-#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4563,12 +4599,12 @@ msgstr ""
 "ukrypterte identiteten med EAP-typer som støtter\n"
 "forskjellige identiteter gjennom tunnell, f.eks, TTLS"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP fase2"
 
-#: ../lib/network/connection/wireless.pm:571
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4581,12 +4617,12 @@ msgstr ""
 "auth=MSCHAPV2 for PEAP eller\n"
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 
-#: ../lib/network/connection/wireless.pm:575
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid "EAP CA certificate"
 msgstr "CA-sertifikat for EAP"
 
-#: ../lib/network/connection/wireless.pm:577
+#: ../lib/network/connection/wireless.pm:581
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4601,12 +4637,12 @@ msgstr ""
 "Hvis mulig, bør et pålitelig sertifikat alltid settes opp\n"
 "når man benytter TLS, TTLS eller PEAP."
 
-#: ../lib/network/connection/wireless.pm:582
+#: ../lib/network/connection/wireless.pm:586
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "Emnetreff for EAP-sertifikat"
 
-#: ../lib/network/connection/wireless.pm:584
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4620,12 +4656,12 @@ msgstr ""
 "finnes i emnet  Emnestrengen er ifølgende format:\n"
 "/C=US/ST=CA/L=Oslo/CN=Test AS/e-postadresse=test@example.com"
 
-#: ../lib/network/connection/wireless.pm:589
+#: ../lib/network/connection/wireless.pm:593
 #, c-format
 msgid "Extra directives"
 msgstr "Ekstra direktiver"
 
-#: ../lib/network/connection/wireless.pm:590
+#: ../lib/network/connection/wireless.pm:594
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4654,12 +4690,12 @@ msgstr ""
 "brukes for å tvinge<br> \tspesialinnstillinger forskjellige fra "
 "instillingene i brukergrensesnitet."
 
-#: ../lib/network/connection/wireless.pm:610
+#: ../lib/network/connection/wireless.pm:614
 #, c-format
 msgid "An encryption key is required."
 msgstr "Krever en krypteringsnøkkel."
 
-#: ../lib/network/connection/wireless.pm:617
+#: ../lib/network/connection/wireless.pm:621
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4668,7 +4704,7 @@ msgstr ""
 "Den forhåndsdelte nøkkelen bør ha mellom 8 og 63 ASCII-tegn eller 64 "
 "heksadesimaler."
 
-#: ../lib/network/connection/wireless.pm:623
+#: ../lib/network/connection/wireless.pm:627
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
@@ -4676,7 +4712,7 @@ msgid ""
 msgstr ""
 "WEP-nøkkelen bør på det meste ha %d ASCII-tegn eller %d heksadesimaler."
 
-#: ../lib/network/connection/wireless.pm:630
+#: ../lib/network/connection/wireless.pm:634
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4685,7 +4721,7 @@ msgstr ""
 "Frekvens skal ha fortegnet k, M eller G (For eksempel «2.46 G» for 2.46 "
 "GHz ) eller tilstrekkelig antall nuller."
 
-#: ../lib/network/connection/wireless.pm:636
+#: ../lib/network/connection/wireless.pm:640
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4694,17 +4730,17 @@ msgstr ""
 "Hastighet skal ha fortegnet k, M eller G (for eksempel «11 M» for 11 M), "
 "eller tilstrekkelig antall nuller."
 
-#: ../lib/network/connection/wireless.pm:648
+#: ../lib/network/connection/wireless.pm:652
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Tillat aksesspunktvandring"
 
-#: ../lib/network/connection/wireless.pm:773
+#: ../lib/network/connection/wireless.pm:777
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Tilegna til trådløst nettverk «%s» på grensesnitt %s"
 
-#: ../lib/network/connection/wireless.pm:774
+#: ../lib/network/connection/wireless.pm:778
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Mistet det tilegnede trådløse nettverket på grensesnitt %s"