sync with code

1 files changed, 153 insertions, 119 deletions

diff --git a/po/nn.po b/po/nn.po
index 99eac43..c3630b3 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-tools\n"
-"POT-Creation-Date: 2008-03-17 15:16+0100\n"
+"POT-Creation-Date: 2008-04-02 16:11+0200\n"
 "PO-Revision-Date: 2008-03-17 18:20+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -91,7 +91,7 @@ msgstr "Avbryt"
 msgid "Ok"
 msgstr "OK"
 
-#: ../bin/drakconnect-old:113 ../bin/drakgw:359 ../bin/draksambashare:228
+#: ../bin/drakconnect-old:113 ../bin/drakgw:344 ../bin/draksambashare:228
 #: ../bin/drakvpn-old:97 ../bin/drakvpn-old:127
 #: ../lib/network/connection_manager.pm:82
 #: ../lib/network/connection_manager.pm:186
@@ -431,29 +431,30 @@ msgstr "Mellomtenarport"
 msgid "Cache size (MB)"
 msgstr "Storleik på mellomlager (MB)"
 
-#: ../bin/drakgw:296
+#: ../bin/drakgw:292
 #, c-format
 msgid "Broadcast printer information"
 msgstr "Kringkast skrivarinformasjon"
 
-#: ../bin/drakgw:307
+#: ../bin/drakgw:303
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
-msgstr "Fann ikkje noko nettverkskort. Prøv å køyra maskinvareoppsettverktøyet."
+msgstr ""
+"Fann ikkje noko nettverkskort. Prøv å køyra maskinvareoppsettverktøyet."
 
-#: ../bin/drakgw:313
+#: ../bin/drakgw:309
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "Deling av Internett-samband er no slått på."
 
-#: ../bin/drakgw:319
+#: ../bin/drakgw:315
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "Deling av Internett-samband er no slått av."
 
-#: ../bin/drakgw:325
+#: ../bin/drakgw:321
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -466,17 +467,17 @@ msgstr ""
 "automatisk nettverksoppsett (DHCP) og ein transparent mellomlagringstenar "
 "(SQUID)."
 
-#: ../bin/drakgw:359
+#: ../bin/drakgw:344
 #, c-format
 msgid "Disabling servers..."
 msgstr "Slår av tenarar …"
 
-#: ../bin/drakgw:373
+#: ../bin/drakgw:358
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "Fann gammalt brannmuroppsett."
 
-#: ../bin/drakgw:374
+#: ../bin/drakgw:359
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
@@ -485,12 +486,12 @@ msgstr ""
 "Åtvaring! Det finst allereie eit gammalt brannmuroppsett. Du må kanskje "
 "gjera nokre manuelle rettingar når installeringa er fullført."
 
-#: ../bin/drakgw:379
+#: ../bin/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr "Set opp …"
 
-#: ../bin/drakgw:380
+#: ../bin/drakgw:365
 #, c-format
 msgid "Configuring firewall..."
 msgstr "Set opp brannmur …"
@@ -624,8 +625,8 @@ msgstr "Tilletne adresser"
 #: ../bin/drakids:40 ../bin/drakids:68 ../bin/drakids:187 ../bin/drakids:196
 #: ../bin/drakids:221 ../bin/drakids:230 ../bin/drakids:240 ../bin/drakids:332
 #: ../bin/net_applet:76 ../bin/net_applet:239 ../bin/net_applet:515
-#: ../bin/net_applet:543 ../lib/network/drakfirewall.pm:259
-#: ../lib/network/drakfirewall.pm:263
+#: ../bin/net_applet:543 ../lib/network/drakfirewall.pm:262
+#: ../lib/network/drakfirewall.pm:266
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interaktiv brannmur"
@@ -834,7 +835,8 @@ msgstr "Ny profil ..."
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
 "current one):"
-msgstr "Namn på den nye profilen (denne blir laga som ein kopi av gjeldande profil):"
+msgstr ""
+"Namn på den nye profilen (denne blir laga som ein kopi av gjeldande profil):"
 
 #: ../bin/draknetprofile:113
 #, c-format
@@ -1585,8 +1587,10 @@ msgstr "Legg til spesiell delt skrivarresurs"
 
 #: ../bin/draksambashare:447
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
-msgstr "Denne vegvisaren gjer det lett å laga spesielle delte Samba-skrivarresursar."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
+msgstr ""
+"Denne vegvisaren gjer det lett å laga spesielle delte Samba-skrivarresursar."
 
 #: ../bin/draksambashare:454
 #, c-format
@@ -1688,7 +1692,8 @@ msgstr "DrakSamba-oppføring"
 #: ../bin/draksambashare:696
 #, c-format
 msgid "Please add or select a Samba share to be able to modify it."
-msgstr "Du må leggja til eller velja ein delt Samba-resurs for å kunna endra han."
+msgstr ""
+"Du må leggja til eller velja ein delt Samba-resurs for å kunna endra han."
 
 #: ../bin/draksambashare:719
 #, c-format
@@ -1722,7 +1727,8 @@ msgstr "Offentleg:"
 
 #: ../bin/draksambashare:796
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
 msgstr ""
 "Opprettingsmaske, opprettingsmodus og mappemaska må vera numerisk. Eksempel: "
 "0755."
@@ -1797,8 +1803,10 @@ msgstr ""
 
 #: ../bin/draksambashare:1073
 #, c-format
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
-msgstr "Éintenarinstallasjonar kan bruka smbpasswd- eller tdbsam-passordmotorane."
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
+msgstr ""
+"Éintenarinstallasjonar kan bruka smbpasswd- eller tdbsam-passordmotorane."
 
 #: ../bin/draksambashare:1073
 #, c-format
@@ -1917,7 +1925,8 @@ msgstr "Tenarbanner."
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
-msgstr "Banneren definerer korleis tenaren vert skildra på Windows-arbeidsstasjonar."
+msgstr ""
+"Banneren definerer korleis tenaren vert skildra på Windows-arbeidsstasjonar."
 
 #: ../bin/draksambashare:1143
 #, c-format
@@ -1946,12 +1955,14 @@ msgstr ""
 #: ../bin/draksambashare:1154
 #, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
-msgstr "Loggingsnivå: Definerer kor detaljert loggføringa skal vera (frå 0 til 10)."
+msgstr ""
+"Loggingsnivå: Definerer kor detaljert loggføringa skal vera (frå 0 til 10)."
 
 #: ../bin/draksambashare:1154
 #, c-format
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
-msgstr "Største loggstorleik: Set ei grense på storleiken til loggfilene (i Kb)."
+msgstr ""
+"Største loggstorleik: Set ei grense på storleiken til loggfilene (i Kb)."
 
 #: ../bin/draksambashare:1161 ../bin/draksambashare:1176
 #, c-format
@@ -3722,7 +3733,7 @@ msgid "Address settings"
 msgstr "Adresseoppsett"
 
 #: ../lib/network/connection.pm:192 ../lib/network/connection/cable.pm:41
-#: ../lib/network/connection/wireless.pm:40 ../lib/network/vpn/openvpn.pm:127
+#: ../lib/network/connection/wireless.pm:42 ../lib/network/vpn/openvpn.pm:127
 #: ../lib/network/vpn/openvpn.pm:171 ../lib/network/vpn/openvpn.pm:339
 #, c-format
 msgid "None"
@@ -3873,7 +3884,8 @@ msgstr "Virtuelt grensesnitt"
 #: ../lib/network/connection/ethernet.pm:59
 #, c-format
 msgid "Unable to find network interface for selected device (using %s driver)."
-msgstr "Klarte ikkje finna nettverksgrensesnitt for vald eining (med drivaren «%s»)."
+msgstr ""
+"Klarte ikkje finna nettverksgrensesnitt for vald eining (med drivaren «%s»)."
 
 #: ../lib/network/connection/ethernet.pm:67 ../lib/network/vpn/openvpn.pm:207
 #, c-format
@@ -4405,100 +4417,106 @@ msgstr "Trådlaus"
 msgid "Use a Windows driver (with ndiswrapper)"
 msgstr "Bruk ein Windows-drivar (med ndiswrapper)"
 
-#: ../lib/network/connection/wireless.pm:41
+#: ../lib/network/connection/wireless.pm:43
 #, c-format
 msgid "Open WEP"
 msgstr "Open WEP"
 
-#: ../lib/network/connection/wireless.pm:42
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
 msgid "Restricted WEP"
 msgstr "Avgrensa WEP"
 
-#: ../lib/network/connection/wireless.pm:43
+#: ../lib/network/connection/wireless.pm:45
 #, c-format
 msgid "WPA/WPA2 Pre-Shared Key"
 msgstr "WPA/WPA2 Førehandsdelt nøkkel"
 
-#: ../lib/network/connection/wireless.pm:44
+#: ../lib/network/connection/wireless.pm:46
 #, c-format
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:231
+#: ../lib/network/connection/wireless.pm:234
 #, c-format
 msgid "Windows driver"
 msgstr "Windows-drivar"
 
-#: ../lib/network/connection/wireless.pm:298
+#: ../lib/network/connection/wireless.pm:301
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
-msgstr "Trådlauskortet er sett ut av bruk. Slå på trådlausbrytaren (RF kill switch)."
+msgstr ""
+"Trådlauskortet er sett ut av bruk. Slå på trådlausbrytaren (RF kill switch)."
 
-#: ../lib/network/connection/wireless.pm:361
+#: ../lib/network/connection/wireless.pm:366
 #, c-format
 msgid "Wireless settings"
 msgstr "Trådlaust-oppsett"
 
-#: ../lib/network/connection/wireless.pm:366
+#: ../lib/network/connection/wireless.pm:371
 #: ../lib/network/connection_manager.pm:243
 #, c-format
 msgid "Operating Mode"
 msgstr "Operasjonsmodus"
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Managed"
 msgstr "Handtert"
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Master"
 msgstr "Hovud"
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Repeater"
 msgstr "Gjentakar"
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Secondary"
 msgstr "Sekundær"
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Auto"
 msgstr "Automatisk"
 
-#: ../lib/network/connection/wireless.pm:370
+#: ../lib/network/connection/wireless.pm:375
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nettverksnamn (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:372
+#: ../lib/network/connection/wireless.pm:377
 #, c-format
 msgid "Encryption mode"
 msgstr "Krypteringsmodus"
 
-#: ../lib/network/connection/wireless.pm:374
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid "Encryption key"
 msgstr "Krypteringsnøkkel"
 
-#: ../lib/network/connection/wireless.pm:376
+#: ../lib/network/connection/wireless.pm:381
+#, c-format
+msgid "Force using this key as ASCII string (e.g. for Livebox)"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:388
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP-brukarnamn"
 
-#: ../lib/network/connection/wireless.pm:378
+#: ../lib/network/connection/wireless.pm:390
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4509,12 +4527,12 @@ msgstr ""
 "spesifisera domenet, så prøv den utesta syntaksen\n"
 "  DOMENE\\brukarnamn"
 
-#: ../lib/network/connection/wireless.pm:381
+#: ../lib/network/connection/wireless.pm:393
 #, c-format
 msgid "EAP Password"
 msgstr "EAP-passord"
 
-#: ../lib/network/connection/wireless.pm:383
+#: ../lib/network/connection/wireless.pm:395
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4547,12 +4565,12 @@ msgstr ""
 "  TLS-modus er fullstendig sertifikatbasert, og kan ignorera\n"
 "brukarnamnet og passordet skrivne inn her."
 
-#: ../lib/network/connection/wireless.pm:397
+#: ../lib/network/connection/wireless.pm:409
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP-klientsertifikat"
 
-#: ../lib/network/connection/wireless.pm:399
+#: ../lib/network/connection/wireless.pm:411
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4565,32 +4583,32 @@ msgstr ""
 "alternativ til bruk av brukarnamn og passord.\n"
 "Merk: Andre relevante innstillingar vert vist på «Avansert»-sida."
 
-#: ../lib/network/connection/wireless.pm:403
+#: ../lib/network/connection/wireless.pm:415
 #, c-format
 msgid "Network ID"
 msgstr "Nettverks-ID"
 
-#: ../lib/network/connection/wireless.pm:404
+#: ../lib/network/connection/wireless.pm:416
 #, c-format
 msgid "Operating frequency"
 msgstr "Operasjonsfrekvens"
 
-#: ../lib/network/connection/wireless.pm:405
+#: ../lib/network/connection/wireless.pm:417
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Følsemdsgrense"
 
-#: ../lib/network/connection/wireless.pm:406
+#: ../lib/network/connection/wireless.pm:418
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (i b/s)"
 
-#: ../lib/network/connection/wireless.pm:407
+#: ../lib/network/connection/wireless.pm:419
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:408
+#: ../lib/network/connection/wireless.pm:420
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4612,17 +4630,17 @@ msgstr ""
 "«fixed»\n"
 "eller «off»."
 
-#: ../lib/network/connection/wireless.pm:415
+#: ../lib/network/connection/wireless.pm:427
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentering"
 
-#: ../lib/network/connection/wireless.pm:416
+#: ../lib/network/connection/wireless.pm:428
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Ekstraargument for lwconfig-kommandoen"
 
-#: ../lib/network/connection/wireless.pm:417
+#: ../lib/network/connection/wireless.pm:429
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4638,12 +4656,12 @@ msgstr ""
 "Sjå man-sida iwconfig(8) for meir 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:424
+#: ../lib/network/connection/wireless.pm:436
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Ekstraargument for lwspy-kommandoen"
 
-#: ../lib/network/connection/wireless.pm:425
+#: ../lib/network/connection/wireless.pm:437
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4663,12 +4681,12 @@ msgstr ""
 "\n"
 "Sjå man-sida iwpspy(8) for meir informasjon."
 
-#: ../lib/network/connection/wireless.pm:433
+#: ../lib/network/connection/wireless.pm:445
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Ekstraargument for lwpriv-kommandoen"
 
-#: ../lib/network/connection/wireless.pm:435
+#: ../lib/network/connection/wireless.pm:447
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4698,28 +4716,28 @@ msgstr ""
 "\n"
 "Sjå manualsida iwpriv(8) for meir informasjon."
 
-#: ../lib/network/connection/wireless.pm:446
+#: ../lib/network/connection/wireless.pm:458
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP-protokoll"
 
-#: ../lib/network/connection/wireless.pm:447
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "Auto Detect"
 msgstr "Finn automatisk"
 
-#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:459
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:459
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:449
+#: ../lib/network/connection/wireless.pm:461
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4728,67 +4746,67 @@ msgstr ""
 "Det er anbefalt å bruka «Finn automatisk», då denne først prøver WPA\n"
 "versjon 2, med WPA versjon 1 som reserve."
 
-#: ../lib/network/connection/wireless.pm:451
+#: ../lib/network/connection/wireless.pm:463
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP-modus"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:454
+#: ../lib/network/connection/wireless.pm:466
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:456
+#: ../lib/network/connection/wireless.pm:468
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4797,12 +4815,12 @@ msgstr ""
 "Liste over moglege autentiseringsnøkkelprotokollar.\n"
 "Moglege verdiar: WPA-EAP, IEEE8021X og NONE."
 
-#: ../lib/network/connection/wireless.pm:458
+#: ../lib/network/connection/wireless.pm:470
 #, c-format
 msgid "EAP outer identity"
 msgstr "ytre EAP-identitet"
 
-#: ../lib/network/connection/wireless.pm:460
+#: ../lib/network/connection/wireless.pm:472
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4813,12 +4831,12 @@ msgstr ""
 "ukryptert identitet med EAP-typar som støttar\n"
 "forskjellige tunellerte identitetar, som TTLS."
 
-#: ../lib/network/connection/wireless.pm:463
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:477
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4831,12 +4849,12 @@ msgstr ""
 "auth=MSCHAPV2 for PEAP, eller\n"
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 
-#: ../lib/network/connection/wireless.pm:469
+#: ../lib/network/connection/wireless.pm:481
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA-sertifikat"
 
-#: ../lib/network/connection/wireless.pm:471
+#: ../lib/network/connection/wireless.pm:483
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4851,12 +4869,12 @@ msgstr ""
 "mogleg bør eit tiltrudd CA-sertifikat alltid setjast opp ved\n"
 "bruk av TLS, TTLS eller PEAP."
 
-#: ../lib/network/connection/wireless.pm:476
+#: ../lib/network/connection/wireless.pm:488
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "«Subject»-samsvar for EAP-sertifikat"
 
-#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/connection/wireless.pm:490
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4871,12 +4889,12 @@ msgstr ""
 "«Subject»-teksten har følgjande format:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:483
+#: ../lib/network/connection/wireless.pm:495
 #, c-format
 msgid "EAP extra directives"
 msgstr "EAP-ekstradirektiv"
 
-#: ../lib/network/connection/wireless.pm:485
+#: ../lib/network/connection/wireless.pm:497
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4908,12 +4926,26 @@ msgstr ""
 "\tAndre, slike som key_mgmt, eap kan brukast til å tvinga\n"
 "\tspesielle innstillingar som er forskjellige frå UI-innstillingane."
 
-#: ../lib/network/connection/wireless.pm:505
+#: ../lib/network/connection/wireless.pm:517
 #, c-format
 msgid "An encryption key is required."
 msgstr "Det trengst ein krypteringsnøkkel."
 
-#: ../lib/network/connection/wireless.pm:511
+#: ../lib/network/connection/wireless.pm:524
+#, c-format
+msgid ""
+"The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
+"hexadecimal characters."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:530
+#, c-format
+msgid ""
+"The WEP key should have at most %d ASCII characters or %d hexadecimal "
+"characters."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:537
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4922,24 +4954,24 @@ msgstr ""
 "Frekvensen må ha eitt av suffiksa k, M eller G (eksempel: «2.46G» for 2,46 "
 "GHz), eller nok nullar."
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:543
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr "Raten må ha eitt av suffiksa k, M eller G (eks.: 11M), eller nok 0-ar."
 
-#: ../lib/network/connection/wireless.pm:529
+#: ../lib/network/connection/wireless.pm:555
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Godta nettveksling"
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:665
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Knytt til trådlausnettverket «%s» på grensesnittet «%s»."
 
-#: ../lib/network/connection/wireless.pm:640
+#: ../lib/network/connection/wireless.pm:666
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Mista tilknyting til trådlausnettverk på grensesnittet «%s»."
@@ -5140,13 +5172,13 @@ msgstr "BitTorrent"
 msgid "Port scan detection"
 msgstr "Oppdaging av portskanning"
 
-#: ../lib/network/drakfirewall.pm:166 ../lib/network/drakfirewall.pm:172
+#: ../lib/network/drakfirewall.pm:169 ../lib/network/drakfirewall.pm:175
 #: ../lib/network/shorewall.pm:63
 #, c-format
 msgid "Firewall configuration"
 msgstr "Brannmuroppsett"
 
-#: ../lib/network/drakfirewall.pm:166
+#: ../lib/network/drakfirewall.pm:169
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -5161,7 +5193,7 @@ msgstr ""
 "Sjå «Mandriva Security Firewall»-distribusjonen om du treng ein\n"
 "kraftigare, særtileigna brannmur."
 
-#: ../lib/network/drakfirewall.pm:172
+#: ../lib/network/drakfirewall.pm:175
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -5173,18 +5205,18 @@ msgstr ""
 "\n"
 "Sjå til at du har sett opp nettverks- og Internett-sambanda før du held fram."
 
-#: ../lib/network/drakfirewall.pm:189
+#: ../lib/network/drakfirewall.pm:192
 #, c-format
 msgid "Which services would you like to allow the Internet to connect to?"
 msgstr "Kva tenester vil du la andre på Internett kopla seg til?"
 
-#: ../lib/network/drakfirewall.pm:190 ../lib/network/drakfirewall.pm:192
-#: ../lib/network/shorewall.pm:150
+#: ../lib/network/drakfirewall.pm:193 ../lib/network/drakfirewall.pm:195
+#: ../lib/network/shorewall.pm:152
 #, c-format
 msgid "Firewall"
 msgstr "Brannmur"
 
-#: ../lib/network/drakfirewall.pm:193
+#: ../lib/network/drakfirewall.pm:196
 #, c-format
 msgid ""
 "You can enter miscellaneous ports. \n"
@@ -5195,7 +5227,7 @@ msgstr ""
 "Eksempel: 139/tcp 139/udp 600:610/tcp 600:610/udp.\n"
 "Sjå i «/etc/services» for meir informasjon."
 
-#: ../lib/network/drakfirewall.pm:199
+#: ../lib/network/drakfirewall.pm:202
 #, c-format
 msgid ""
 "Invalid port given: %s.\n"
@@ -5210,22 +5242,22 @@ msgstr ""
 "\n"
 "Du kan òg velja eit portområde (eks.: 24300:24350/udp)"
 
-#: ../lib/network/drakfirewall.pm:209
+#: ../lib/network/drakfirewall.pm:212
 #, c-format
 msgid "Everything (no firewall)"
 msgstr "Alle (ingen brannmur)"
 
-#: ../lib/network/drakfirewall.pm:211
+#: ../lib/network/drakfirewall.pm:214
 #, c-format
 msgid "Other ports"
 msgstr "Andre portar"
 
-#: ../lib/network/drakfirewall.pm:212
+#: ../lib/network/drakfirewall.pm:215
 #, c-format
 msgid "Log firewall messages in system logs"
 msgstr "Loggfør brannmurmeldingar i systemloggar"
 
-#: ../lib/network/drakfirewall.pm:261
+#: ../lib/network/drakfirewall.pm:264
 #, c-format
 msgid ""
 "You can be warned when someone accesses to a service or tries to intrude "
@@ -5236,7 +5268,7 @@ msgstr ""
 "eller prøver å bryta seg inn på maskina.\n"
 "Vel kva nettverksaktivitet du vil overvaka."
 
-#: ../lib/network/drakfirewall.pm:266
+#: ../lib/network/drakfirewall.pm:269
 #, c-format
 msgid "Use Interactive Firewall"
 msgstr "Bruk interaktiv brannmur"
@@ -5402,7 +5434,8 @@ msgstr "Eit «%s»-angrep vart forsøkt av «%s»."
 msgid ""
 "The \"%s\" application is trying to make a service (%s) available to the "
 "network."
-msgstr "Programmet «%s» prøver å gjera ei teneste (%s) tilgjengeleg til nettverket."
+msgstr ""
+"Programmet «%s» prøver å gjera ei teneste (%s) tilgjengeleg til nettverket."
 
 #. -PO: this should be kept lowercase since the expression is meant to be used between brackets
 #: ../lib/network/ifw.pm:152
@@ -6136,7 +6169,8 @@ msgstr "Mellomtenaroppsett"
 msgid ""
 "Here you can set up your proxies configuration (eg: http://"
 "my_caching_server:8080)"
-msgstr "Her kan du setja opp mellomtenarar (eksempel: http://min_mellomtenar:8080)"
+msgstr ""
+"Her kan du setja opp mellomtenarar (eksempel: http://min_mellomtenar:8080)"
 
 #: ../lib/network/network.pm:431
 #, c-format
@@ -6195,17 +6229,17 @@ msgstr ""
 "\n"
 "Kva grensesnitt vil du verna?\n"
 
-#: ../lib/network/shorewall.pm:141
+#: ../lib/network/shorewall.pm:143
 #, c-format
 msgid "Keep custom rules"
 msgstr "Behald sjølvlaga reglar"
 
-#: ../lib/network/shorewall.pm:142
+#: ../lib/network/shorewall.pm:144
 #, c-format
 msgid "Drop custom rules"
 msgstr "Fjern sjølvlaga reglar"
 
-#: ../lib/network/shorewall.pm:147
+#: ../lib/network/shorewall.pm:149
 #, c-format
 msgid ""
 "Your firewall configuration has been manually edited and contains\n"
@@ -6232,7 +6266,8 @@ msgstr "Nokre pakkar («%s») trengst, men er ikkje tilgjengelege."
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
-msgid "These packages can be found in %s, or in the official %s package repository."
+msgid ""
+"These packages can be found in %s, or in the official %s package repository."
 msgstr "Desse pakkane finn du i %s, og i det offisielle %s-pakkelageret."
 
 #: ../lib/network/thirdparty.pm:154
@@ -6576,4 +6611,3 @@ msgstr "Bruk vald UDP-port"
 
 #~ msgid "Get Online Help"
 #~ msgstr "Få hjelp på nettet"
-