merge last updates

1 files changed, 370 insertions, 364 deletions

diff --git a/po/nb.po b/po/nb.po
index c24d1e2..73e21df 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -19,7 +19,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
-"POT-Creation-Date: 2009-10-20 08:41-0200\n"
+"POT-Creation-Date: 2011-05-03 15:42+0200\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"
@@ -41,9 +41,9 @@ msgstr "Nettverksoppsett (%d adaptere)"
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:196
-#: ../lib/network/connection/ethernet.pm:138 ../lib/network/netconnect.pm:633
-#: ../lib/network/vpn/openvpn.pm:221
+#: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
+#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP-adresse"
@@ -84,7 +84,7 @@ msgstr "Oppsett av lokalnettverk"
 msgid "Configure Local Area Network..."
 msgstr "Sett opp lokalt nettverk …"
 
-#: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:190
+#: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
 #, c-format
 msgid "Help"
 msgstr "Hjelp"
@@ -111,11 +111,11 @@ msgstr "OK"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:351 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
-#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:354
-#: ../lib/network/thirdparty.pm:369
+#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
+#: ../lib/network/thirdparty.pm:367
 #, c-format
 msgid "Please wait"
 msgstr "Vent litt"
@@ -155,7 +155,7 @@ msgid "Adapter %s: %s"
 msgstr "Adapter %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
-#: ../lib/network/connection/ethernet.pm:145
+#: ../lib/network/connection/ethernet.pm:148
 #, c-format
 msgid "Netmask"
 msgstr "Nettmaske"
@@ -170,21 +170,21 @@ msgstr "Oppstartsprotokoll"
 msgid "Started on boot"
 msgstr "På oppstart"
 
-#: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:156
+#: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP-klient"
 
 #: ../bin/drakconnect-old:247
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mageia Control Center"
+"Run the \"%s\" assistant from the Mageia Linux Control Center"
 msgstr ""
 "Dette grensesnittet har ikke blitt satt opp ennå.\n"
 "Kjør «%s» fra Mageia Kontrollsenter"
 
-#: ../bin/drakconnect-old:247 ../bin/net_applet:104
+#: ../bin/drakconnect-old:247 ../bin/net_applet:105
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Sett opp et nytt nettverksgrensesnitt (LAN, ISDN, ADSL, …)"
@@ -329,7 +329,7 @@ msgstr "Velg hvilket nettverkskort som skal kobles til lokalnettverket (LAN)."
 msgid "Local Area Network settings"
 msgstr "Innstillinger for lokalnettverk"
 
-#: ../bin/drakgw:180 ../lib/network/vpn/openvpn.pm:227
+#: ../bin/drakgw:180 ../lib/network/vpn/openvpn.pm:229
 #, c-format
 msgid "Local IP address"
 msgstr "Lokal IP-adresse"
@@ -339,8 +339,8 @@ msgstr "Lokal IP-adresse"
 msgid "The internal domain name"
 msgstr "Det interne domenenavnet"
 
-#: ../bin/drakgw:188 ../bin/drakhosts:100 ../bin/drakhosts:245
-#: ../bin/drakhosts:252 ../bin/drakhosts:259 ../bin/drakinvictus:72
+#: ../bin/drakgw:188 ../bin/drakhosts:100 ../bin/drakhosts:236
+#: ../bin/drakhosts:243 ../bin/drakhosts:250 ../bin/drakinvictus:72
 #: ../bin/draknetprofile:166 ../bin/draknetprofile:186 ../bin/draknfs:93
 #: ../bin/draknfs:282 ../bin/draknfs:429 ../bin/draknfs:431 ../bin/draknfs:434
 #: ../bin/draknfs:526 ../bin/draknfs:533 ../bin/draknfs:605 ../bin/draknfs:612
@@ -348,13 +348,13 @@ msgstr "Det interne domenenavnet"
 #: ../bin/draksambashare:403 ../bin/draksambashare:455
 #: ../bin/draksambashare:479 ../bin/draksambashare:552
 #: ../bin/draksambashare:629 ../bin/draksambashare:695
-#: ../bin/draksambashare:795 ../bin/draksambashare:802
-#: ../bin/draksambashare:941 ../bin/draksambashare:1095
-#: ../bin/draksambashare:1114 ../bin/draksambashare:1146
-#: ../bin/draksambashare:1252 ../bin/draksambashare:1354
-#: ../bin/draksambashare:1363 ../bin/draksambashare:1385
-#: ../bin/draksambashare:1394 ../bin/draksambashare:1413
-#: ../bin/draksambashare:1422 ../bin/draksambashare:1434
+#: ../bin/draksambashare:795 ../bin/draksambashare:803
+#: ../bin/draksambashare:942 ../bin/draksambashare:1096
+#: ../bin/draksambashare:1115 ../bin/draksambashare:1147
+#: ../bin/draksambashare:1253 ../bin/draksambashare:1355
+#: ../bin/draksambashare:1364 ../bin/draksambashare:1386
+#: ../bin/draksambashare:1395 ../bin/draksambashare:1414
+#: ../bin/draksambashare:1423 ../bin/draksambashare:1435
 #: ../lib/network/connection/xdsl.pm:361
 #: ../lib/network/connection_manager.pm:62
 #: ../lib/network/connection_manager.pm:68
@@ -363,16 +363,15 @@ msgstr "Det interne domenenavnet"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:479
-#: ../lib/network/connection_manager.pm:492 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
 #: ../lib/network/netconnect.pm:188 ../lib/network/netconnect.pm:234
 #: ../lib/network/netconnect.pm:275 ../lib/network/netconnect.pm:847
 #: ../lib/network/thirdparty.pm:123 ../lib/network/thirdparty.pm:141
-#: ../lib/network/thirdparty.pm:232 ../lib/network/thirdparty.pm:234
-#: ../lib/network/thirdparty.pm:255
+#: ../lib/network/thirdparty.pm:230 ../lib/network/thirdparty.pm:232
+#: ../lib/network/thirdparty.pm:253
 #, c-format
 msgid "Error"
 msgstr "Feil"
@@ -574,10 +573,9 @@ msgstr "Vertsnavn:"
 msgid "Host Aliases:"
 msgstr "Vertsaliaser:"
 
-#: ../bin/drakhosts:122 ../bin/drakhosts:128 ../bin/draknfs:116
-#: ../bin/draksambashare:230 ../bin/draksambashare:253
-#: ../bin/draksambashare:397 ../bin/draksambashare:625
-#: ../bin/draksambashare:791
+#: ../bin/drakhosts:122 ../bin/draknfs:116 ../bin/draksambashare:230
+#: ../bin/draksambashare:253 ../bin/draksambashare:397
+#: ../bin/draksambashare:625 ../bin/draksambashare:791
 #, c-format
 msgid "Error!"
 msgstr "Feil!"
@@ -587,73 +585,68 @@ msgstr "Feil!"
 msgid "Please enter a valid IP address."
 msgstr "Tast inn en gyldig IP-adresse."
 
-#: ../bin/drakhosts:128
-#, c-format
-msgid "Same IP is already in %s file."
-msgstr "Samme IP eksisterer allerede i fila %s."
-
-#: ../bin/drakhosts:196 ../lib/network/connection/ethernet.pm:222
+#: ../bin/drakhosts:187 ../lib/network/connection/ethernet.pm:225
 #, c-format
 msgid "Host name"
 msgstr "Vertsnavn"
 
-#: ../bin/drakhosts:196
+#: ../bin/drakhosts:187
 #, c-format
 msgid "Host Aliases"
 msgstr "Vertsaliaser"
 
-#: ../bin/drakhosts:206 ../bin/drakhosts:236
+#: ../bin/drakhosts:197 ../bin/drakhosts:227
 #, c-format
 msgid "Manage hosts definitions"
 msgstr "Håndter vertsangivelser"
 
-#: ../bin/drakhosts:222 ../bin/drakhosts:249 ../bin/draknfs:369
+#: ../bin/drakhosts:213 ../bin/drakhosts:240 ../bin/draknfs:369
 #, c-format
 msgid "Modify entry"
 msgstr "Endre oppføring"
 
-#: ../bin/drakhosts:241 ../bin/draknfs:601 ../bin/draksambashare:1347
-#: ../bin/draksambashare:1378 ../bin/draksambashare:1409
+#: ../bin/drakhosts:232 ../bin/draknfs:601 ../bin/draksambashare:1348
+#: ../bin/draksambashare:1379 ../bin/draksambashare:1410
 #, c-format
 msgid "Add"
 msgstr "Legg til"
 
-#: ../bin/drakhosts:242
+#: ../bin/drakhosts:233
 #, c-format
 msgid "Add entry"
 msgstr "Legg til oppføring"
 
-#: ../bin/drakhosts:245
+#: ../bin/drakhosts:236
 #, c-format
 msgid "Failed to add host."
 msgstr "Klarte ikke å legge til vert."
 
-#: ../bin/drakhosts:248 ../bin/draknfs:608 ../bin/draksambashare:1304
-#: ../bin/draksambashare:1349 ../bin/draksambashare:1380
-#: ../bin/draksambashare:1417
+#: ../bin/drakhosts:239 ../bin/draknfs:608 ../bin/draksambashare:1305
+#: ../bin/draksambashare:1350 ../bin/draksambashare:1381
+#: ../bin/draksambashare:1418
 #, c-format
 msgid "Modify"
 msgstr "Endre"
 
-#: ../bin/drakhosts:252
+#: ../bin/drakhosts:243
 #, c-format
 msgid "Failed to Modify host."
 msgstr "Klarte ikke å endre vert."
 
-#: ../bin/drakhosts:255 ../bin/drakids:95 ../bin/drakids:104
-#: ../bin/draknfs:615 ../bin/draksambashare:1305 ../bin/draksambashare:1357
-#: ../bin/draksambashare:1388 ../bin/draksambashare:1425
+#: ../bin/drakhosts:246 ../bin/drakids:95 ../bin/drakids:104
+#: ../bin/draknfs:615 ../bin/draksambashare:1306 ../bin/draksambashare:1358
+#: ../bin/draksambashare:1389 ../bin/draksambashare:1426
 #, c-format
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../bin/drakhosts:259
+#: ../bin/drakhosts:250
 #, c-format
 msgid "Failed to remove host."
 msgstr "Klarte ikke å fjerne vert."
 
-#: ../bin/drakhosts:262 ../bin/drakinvictus:141 ../bin/draknetprofile:219
-#: ../bin/net_applet:191 ../lib/network/drakroam.pm:93
+#: ../bin/drakhosts:253 ../bin/drakinvictus:141 ../bin/draknetprofile:219
+#: ../bin/net_applet:221 ../lib/network/drakroam.pm:93
 #: ../lib/network/netcenter.pm:178
 #, c-format
 msgid "Quit"
@@ -666,15 +659,15 @@ msgstr "Tillatte adresser"
 
 #: ../bin/drakids:40 ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:134 ../bin/net_applet:313
-#: ../lib/network/drakfirewall.pm:311 ../lib/network/drakfirewall.pm:315
+#: ../bin/net_applet:145 ../bin/net_applet:353
+#: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interaktiv brannmur"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:313
+#: ../bin/net_applet:353
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Klarte ikke å kontakte tjeneste"
@@ -751,7 +744,7 @@ msgstr "Dato"
 msgid "Remote host"
 msgstr "Ekstern vert"
 
-#: ../bin/drakids:258 ../lib/network/vpn/openvpn.pm:115
+#: ../bin/drakids:258 ../lib/network/vpn/openvpn.pm:117
 #, c-format
 msgid "Type"
 msgstr "Type"
@@ -1567,8 +1560,8 @@ msgid "Draksambashare"
 msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
-#, c-format
-msgid "Copyright (C) %s by Mageia"
+#, fuzzy, c-format
+msgid "Copyright (C) %s by Mandriva"
 msgstr "Alle rettigheter (C) %s Mageia"
 
 #: ../bin/draksambashare:198
@@ -1686,7 +1679,7 @@ msgstr "En PDF-generator eksisterer allerede."
 msgid "Printers and print$ already exist."
 msgstr "Skrivere og print$ eksisterer allerede."
 
-#: ../bin/draksambashare:529 ../bin/draksambashare:1197
+#: ../bin/draksambashare:529 ../bin/draksambashare:1198
 #, c-format
 msgid "Congratulations"
 msgstr "Gratulerer"
@@ -1819,52 +1812,52 @@ msgstr ""
 "Opprettelsesmaske, opprettelsesmodus og katalogmaske bør være numerisk. "
 "Feks.: 0755."
 
-#: ../bin/draksambashare:802
+#: ../bin/draksambashare:803
 #, c-format
 msgid "Please create this Samba user: %s"
 msgstr "Vennligst opprett denne Samba-brukeren: %s"
 
-#: ../bin/draksambashare:914
+#: ../bin/draksambashare:915
 #, c-format
 msgid "Add Samba user"
 msgstr "Legg til Samba-bruker"
 
-#: ../bin/draksambashare:929
+#: ../bin/draksambashare:930
 #, c-format
 msgid "User information"
 msgstr "Brukerinformasjon"
 
-#: ../bin/draksambashare:931
+#: ../bin/draksambashare:932
 #, c-format
 msgid "User name:"
 msgstr "Brukernavn:"
 
-#: ../bin/draksambashare:932
+#: ../bin/draksambashare:933
 #, c-format
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../bin/draksambashare:1046
+#: ../bin/draksambashare:1047
 #, c-format
 msgid "PDC - primary domain controller"
 msgstr "PDC - primær domenekontroller"
 
-#: ../bin/draksambashare:1047
+#: ../bin/draksambashare:1048
 #, c-format
 msgid "Standalone - standalone server"
 msgstr "Dedikert - dedikert tjener"
 
-#: ../bin/draksambashare:1053
+#: ../bin/draksambashare:1054
 #, c-format
 msgid "Samba Wizard"
 msgstr "Veiviser for Samba"
 
-#: ../bin/draksambashare:1056
+#: ../bin/draksambashare:1057
 #, c-format
 msgid "Samba server configuration Wizard"
 msgstr "Veiviser for oppsett av tjener for Samba"
 
-#: ../bin/draksambashare:1056
+#: ../bin/draksambashare:1057
 #, c-format
 msgid ""
 "Samba allows your server to behave as a file and print server for "
@@ -1873,12 +1866,12 @@ msgstr ""
 "Samba lar tjeneren din oppføre seg som en fil og skrivertjener for "
 "arbeidsstasjoner som kjører andre systemer enn Linux."
 
-#: ../bin/draksambashare:1072
+#: ../bin/draksambashare:1073
 #, c-format
 msgid "PDC server: primary domain controller"
 msgstr "PDC-tjener: primær domenekontroller"
 
-#: ../bin/draksambashare:1072
+#: ../bin/draksambashare:1073
 #, c-format
 msgid ""
 "Server configured as a PDC is responsible for Windows authentication "
@@ -1887,7 +1880,7 @@ msgstr ""
 "Tjeneren satt opp som en PDC er ansvarlig for autentisering av Windows "
 "gjennom hele domenent."
 
-#: ../bin/draksambashare:1072
+#: ../bin/draksambashare:1073
 #, c-format
 msgid ""
 "Single server installations may use smbpasswd or tdbsam password backends"
@@ -1895,7 +1888,7 @@ msgstr ""
 "Enkeltjenerinstallasjoner kan benytte smbpassord eller tdbsam "
 "passordbakstykker"
 
-#: ../bin/draksambashare:1072
+#: ../bin/draksambashare:1073
 #, c-format
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -1904,27 +1897,27 @@ msgstr ""
 "Domainmaster = ja, gjør at tjeneren registrerer NetBIOS-navnet <pdc-navn>. "
 "Dette navnet vil bli gjenkjent av andre tjenere."
 
-#: ../bin/draksambashare:1089
+#: ../bin/draksambashare:1090
 #, c-format
 msgid "Wins support:"
 msgstr "Wins-støtte:"
 
-#: ../bin/draksambashare:1090
+#: ../bin/draksambashare:1091
 #, c-format
 msgid "admin users:"
 msgstr "adminbrukere:"
 
-#: ../bin/draksambashare:1090
+#: ../bin/draksambashare:1091
 #, c-format
 msgid "root @adm"
 msgstr "root @ adm"
 
-#: ../bin/draksambashare:1091
+#: ../bin/draksambashare:1092
 #, c-format
 msgid "Os level:"
 msgstr "OS-nivå:"
 
-#: ../bin/draksambashare:1091
+#: ../bin/draksambashare:1092
 #, c-format
 msgid ""
 "The global os level option dictates the operating system level at which "
@@ -1938,42 +1931,42 @@ msgstr ""
 "hovedleser kan du sette nivået over det operativsystemet på nettverket som "
 "har den høyeste verdien for øyeblikket. F.eks: os-level = 34"
 
-#: ../bin/draksambashare:1095
+#: ../bin/draksambashare:1096
 #, c-format
 msgid "The domain is wrong."
 msgstr "Domenet er feil."
 
-#: ../bin/draksambashare:1102
+#: ../bin/draksambashare:1103
 #, c-format
 msgid "Workgroup"
 msgstr "Arbeidsgruppe"
 
-#: ../bin/draksambashare:1102
+#: ../bin/draksambashare:1103
 #, c-format
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba må vite hvilken arbeidsgruppe den skal betjene."
 
-#: ../bin/draksambashare:1109 ../bin/draksambashare:1176
+#: ../bin/draksambashare:1110 ../bin/draksambashare:1177
 #, c-format
 msgid "Workgroup:"
 msgstr "Arbeidsgruppe:"
 
-#: ../bin/draksambashare:1110
+#: ../bin/draksambashare:1111
 #, c-format
 msgid "Netbios name:"
 msgstr "Netbios-navn:"
 
-#: ../bin/draksambashare:1114
+#: ../bin/draksambashare:1115
 #, c-format
 msgid "The Workgroup is wrong."
 msgstr "Arbeidsgruppen er feil."
 
-#: ../bin/draksambashare:1121 ../bin/draksambashare:1131
+#: ../bin/draksambashare:1122 ../bin/draksambashare:1132
 #, c-format
 msgid "Security mode"
 msgstr "Sikkerhetsmodus"
 
-#: ../bin/draksambashare:1121
+#: ../bin/draksambashare:1122
 #, c-format
 msgid ""
 "User level: the client sends a session setup request directly following "
@@ -1983,12 +1976,12 @@ msgstr ""
 "forfulgt av en protokollformidling. Denne forespørselen gir et brukernavn og "
 "passord."
 
-#: ../bin/draksambashare:1121
+#: ../bin/draksambashare:1122
 #, c-format
 msgid "Share level: the client authenticates itself separately for each share"
 msgstr "Ressursnivå: klienten autentiserer seg selv for hver enkelt ressurs"
 
-#: ../bin/draksambashare:1121
+#: ../bin/draksambashare:1122
 #, c-format
 msgid ""
 "Domain level: provides a mechanism for storing all user and group accounts "
@@ -1999,17 +1992,17 @@ msgstr ""
 "et sentralt og delt kontoarkiv. Det sentraliserte kontoarkivet er delt "
 "mellom domene- og sikkerhetskontrollere."
 
-#: ../bin/draksambashare:1132
+#: ../bin/draksambashare:1133
 #, c-format
 msgid "Hosts allow"
 msgstr "Tillatte verter"
 
-#: ../bin/draksambashare:1137
+#: ../bin/draksambashare:1138
 #, c-format
 msgid "Server Banner."
 msgstr "Tjenerbeskrivelse."
 
-#: ../bin/draksambashare:1137
+#: ../bin/draksambashare:1138
 #, c-format
 msgid ""
 "The banner is the way this server will be described in the Windows "
@@ -2018,22 +2011,22 @@ msgstr ""
 "Beskrivelsen er det tjeneren vil bli beskrevet som på arbeidsstasjoner med "
 "Windows."
 
-#: ../bin/draksambashare:1142
+#: ../bin/draksambashare:1143
 #, c-format
 msgid "Banner:"
 msgstr "Beskrivelse:"
 
-#: ../bin/draksambashare:1146
+#: ../bin/draksambashare:1147
 #, c-format
 msgid "The Server Banner is incorrect."
 msgstr "Tjenerbeskrivelsen er feil."
 
-#: ../bin/draksambashare:1153
+#: ../bin/draksambashare:1154
 #, c-format
 msgid "Samba Log"
 msgstr "Samba-logg"
 
-#: ../bin/draksambashare:1153
+#: ../bin/draksambashare:1154
 #, c-format
 msgid ""
 "Log file: use file.%m to use a separate log file for each machine that "
@@ -2042,38 +2035,38 @@ msgstr ""
 "Loggfil: bruk file.%m for å benytte en separat logg for hver enkelt maskin "
 "som kobler seg til"
 
-#: ../bin/draksambashare:1153
+#: ../bin/draksambashare:1154
 #, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
 msgstr "Loggingsnivå: sett nøyaktigheten på logging (0 <=log <= 10)"
 
-#: ../bin/draksambashare:1153
+#: ../bin/draksambashare:1154
 #, c-format
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
 msgstr ""
 "Maksimal loggstørrelse: sett en topp på størrelsen for loggfilene (i Kb)."
 
-#: ../bin/draksambashare:1160 ../bin/draksambashare:1178
+#: ../bin/draksambashare:1161 ../bin/draksambashare:1179
 #, c-format
 msgid "Log file:"
 msgstr "Loggfil:"
 
-#: ../bin/draksambashare:1161
+#: ../bin/draksambashare:1162
 #, c-format
 msgid "Max log size:"
 msgstr "Maksimal loggstørrelse:"
 
-#: ../bin/draksambashare:1162
+#: ../bin/draksambashare:1163
 #, c-format
 msgid "Log level:"
 msgstr "Nivå for logging:"
 
-#: ../bin/draksambashare:1167
+#: ../bin/draksambashare:1168
 #, c-format
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Veiviseren samlet følgende parametere for å sette opp Samba."
 
-#: ../bin/draksambashare:1167
+#: ../bin/draksambashare:1168
 #, c-format
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -2082,7 +2075,7 @@ msgstr ""
 "Klikk på Neste for å godta disse verdiene og sette opp tjeneren. Klikk "
 "Tilbake for å rette på dem."
 
-#: ../bin/draksambashare:1167
+#: ../bin/draksambashare:1168
 #, c-format
 msgid ""
 "If you have previously create some shares, they will appear in this "
@@ -2091,112 +2084,112 @@ msgstr ""
 "Hvis du har opprettet ressurser tidligere, vil disse dukke opp i dette "
 "oppsettet. Kjør veiviser for ressurser for å administrere dem."
 
-#: ../bin/draksambashare:1175
+#: ../bin/draksambashare:1176
 #, c-format
 msgid "Samba type:"
 msgstr "Samba-type:"
 
-#: ../bin/draksambashare:1177
+#: ../bin/draksambashare:1178
 #, c-format
 msgid "Server banner:"
 msgstr "Tjenerbeskrivelse:"
 
-#: ../bin/draksambashare:1179
+#: ../bin/draksambashare:1180
 #, c-format
 msgid " "
 msgstr " "
 
-#: ../bin/draksambashare:1180
+#: ../bin/draksambashare:1181
 #, c-format
 msgid "Unix Charset:"
 msgstr "Unix tegnsett:"
 
-#: ../bin/draksambashare:1181
+#: ../bin/draksambashare:1182
 #, c-format
 msgid "Dos Charset:"
 msgstr "DOS tegnsett:"
 
-#: ../bin/draksambashare:1182
+#: ../bin/draksambashare:1183
 #, c-format
 msgid "Display Charset:"
 msgstr "Vis tegnsett:"
 
-#: ../bin/draksambashare:1197
+#: ../bin/draksambashare:1198
 #, c-format
 msgid "The wizard successfully configured your Samba server."
 msgstr "Veiviseren konfigurerte Samba-tjeneren."
 
-#: ../bin/draksambashare:1252
+#: ../bin/draksambashare:1253
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "Veiviseren for Samba har feilet:"
 
-#: ../bin/draksambashare:1266
+#: ../bin/draksambashare:1267
 #, c-format
 msgid "Manage Samba configuration"
 msgstr "Håndter oppsett for Samba"
 
-#: ../bin/draksambashare:1354
+#: ../bin/draksambashare:1355
 #, c-format
 msgid "Failed to Modify Samba share."
 msgstr "Klarte ikke å endre på delt ressurs."
 
-#: ../bin/draksambashare:1363
+#: ../bin/draksambashare:1364
 #, c-format
 msgid "Failed to remove a Samba share."
 msgstr "Klarte ikke å fjerne delt ressurs."
 
-#: ../bin/draksambashare:1370
+#: ../bin/draksambashare:1371
 #, c-format
 msgid "File share"
 msgstr "Filressurs"
 
-#: ../bin/draksambashare:1385
+#: ../bin/draksambashare:1386
 #, c-format
 msgid "Failed to Modify."
 msgstr "Klarte ikke å endre."
 
-#: ../bin/draksambashare:1394
+#: ../bin/draksambashare:1395
 #, c-format
 msgid "Failed to remove."
 msgstr "Klarte ikke å fjerne."
 
-#: ../bin/draksambashare:1401
+#: ../bin/draksambashare:1402
 #, c-format
 msgid "Printers"
 msgstr "Skrivere"
 
-#: ../bin/draksambashare:1413
+#: ../bin/draksambashare:1414
 #, c-format
 msgid "Failed to add user."
 msgstr "Klarte ikke å legge til bruker."
 
-#: ../bin/draksambashare:1422
+#: ../bin/draksambashare:1423
 #, c-format
 msgid "Failed to change user password."
 msgstr "Klarte ikke å endre brukerpassord."
 
-#: ../bin/draksambashare:1434
+#: ../bin/draksambashare:1435
 #, c-format
 msgid "Failed to delete user."
 msgstr "Klarte ikke å slette bruker."
 
-#: ../bin/draksambashare:1439
+#: ../bin/draksambashare:1440
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../bin/draksambashare:1447
+#: ../bin/draksambashare:1448
 #, c-format
 msgid "Samba Users"
 msgstr "Samba-brukere"
 
-#: ../bin/draksambashare:1455
+#: ../bin/draksambashare:1456
 #, c-format
 msgid "Please configure your Samba server"
 msgstr "Vær vennlig sette opp Samba-tjeneren"
 
-#: ../bin/draksambashare:1455
+#: ../bin/draksambashare:1456
 #, c-format
 msgid ""
 "It seems this is the first time you run this tool.\n"
@@ -2205,138 +2198,138 @@ msgstr ""
 "Det se ut til å være første gang du kjører dette verktøyet.\n"
 " En veiviser for å sette opp en enkel Samba-tjener vil åpnes."
 
-#: ../bin/draksambashare:1464
+#: ../bin/draksambashare:1465
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba håndterer delte Samba-ressurser"
 
-#: ../bin/net_applet:95
+#: ../bin/net_applet:96
 #, c-format
 msgid "Network is up on interface %s."
 msgstr "Nettverk er oppe på grensesnitt %s."
 
-#: ../bin/net_applet:96
+#: ../bin/net_applet:97
 #, c-format
 msgid "IP address: %s"
 msgstr "IP-adresse: %s"
 
-#: ../bin/net_applet:97
+#: ../bin/net_applet:98
 #, c-format
 msgid "Gateway: %s"
 msgstr "Gateway: %s"
 
-#: ../bin/net_applet:98
+#: ../bin/net_applet:99
 #, c-format
 msgid "DNS: %s"
 msgstr "DNS %s"
 
-#: ../bin/net_applet:99
+#: ../bin/net_applet:100
 #, c-format
 msgid "Connected to %s (link level: %d %%)"
 msgstr "Koblet til %s (linknivå: %d %%)"
 
-#: ../bin/net_applet:101
+#: ../bin/net_applet:102
 #, c-format
 msgid "Network is down on interface %s."
 msgstr "Nettverk er nede på grensesnitt %s."
 
-#: ../bin/net_applet:103
-#, c-format
+#: ../bin/net_applet:104
+#, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mageia Control Center"
+"Run the \"%s\" assistant from the Mageia Linux Control Center"
 msgstr ""
 "Du har ennå ikke satt opp en internettilkobling.\n"
 "Kjør «%s» fra Mageia Kontrollsenter."
 
-#: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
+#: ../bin/net_applet:107 ../lib/network/connection_manager.pm:206
 #, c-format
 msgid "Connecting..."
 msgstr "Kobler til …"
 
-#: ../bin/net_applet:131 ../bin/net_monitor:519
+#: ../bin/net_applet:133 ../bin/net_monitor:519
 #, c-format
 msgid "Connect %s"
 msgstr "Koble til %s"
 
-#: ../bin/net_applet:132 ../bin/net_monitor:519
+#: ../bin/net_applet:137 ../bin/net_monitor:519
 #, c-format
 msgid "Disconnect %s"
 msgstr "Koble fra %s"
 
-#: ../bin/net_applet:133
+#: ../bin/net_applet:141
 #, c-format
 msgid "Monitor Network"
 msgstr "Overvåk nettverket"
 
-#: ../bin/net_applet:135
+#: ../bin/net_applet:149
 #, c-format
 msgid "Manage wireless networks"
 msgstr "Håndter trådløse nettverk"
 
-#: ../bin/net_applet:137
+#: ../bin/net_applet:153
 #, c-format
 msgid "Manage VPN connections"
 msgstr "Håndter VPN-tilkoblinger"
 
-#: ../bin/net_applet:141
+#: ../bin/net_applet:157
 #, c-format
 msgid "Configure Network"
 msgstr "Sett opp nettverk"
 
-#: ../bin/net_applet:143
+#: ../bin/net_applet:161
 #, c-format
 msgid "Watched interface"
 msgstr "Grensesnitt som følges med på"
 
-#: ../bin/net_applet:144 ../bin/net_applet:145 ../bin/net_applet:147
+#: ../bin/net_applet:162 ../bin/net_applet:165 ../bin/net_applet:168
 #, c-format
 msgid "Auto-detect"
 msgstr "Automatisk oppdagelse"
 
-#: ../bin/net_applet:152
+#: ../bin/net_applet:173
 #, c-format
 msgid "Active interfaces"
 msgstr "Aktive grensesnitt"
 
-#: ../bin/net_applet:172
+#: ../bin/net_applet:193
 #, c-format
 msgid "Profiles"
 msgstr "Profiler"
 
-#: ../bin/net_applet:182 ../lib/network/connection.pm:229
-#: ../lib/network/drakvpn.pm:62 ../lib/network/vpn/openvpn.pm:365
-#: ../lib/network/vpn/openvpn.pm:379 ../lib/network/vpn/openvpn.pm:390
+#: ../bin/net_applet:203 ../lib/network/connection.pm:233
+#: ../lib/network/drakvpn.pm:62 ../lib/network/vpn/openvpn.pm:367
+#: ../lib/network/vpn/openvpn.pm:381 ../lib/network/vpn/openvpn.pm:392
 #, c-format
 msgid "VPN connection"
 msgstr "VPN-tilkobling"
 
-#: ../bin/net_applet:394
+#: ../bin/net_applet:434
 #, c-format
 msgid "Network connection"
 msgstr "Nettverkstilkobling"
 
-#: ../bin/net_applet:481
+#: ../bin/net_applet:521
 #, c-format
 msgid "More networks"
 msgstr "Flere nettverk"
 
-#: ../bin/net_applet:508
+#: ../bin/net_applet:548
 #, c-format
 msgid "Interactive Firewall automatic mode"
 msgstr "Automatisk interaktiv brannmursmodus"
 
-#: ../bin/net_applet:513
+#: ../bin/net_applet:553
 #, c-format
 msgid "Always launch on startup"
 msgstr "På oppstart"
 
-#: ../bin/net_applet:518
+#: ../bin/net_applet:558
 #, c-format
 msgid "Wireless networks"
 msgstr "Trådløse nettverk"
 
-#: ../bin/net_applet:525 ../bin/net_monitor:96
+#: ../bin/net_applet:565 ../bin/net_monitor:96
 #, c-format
 msgid "Settings"
 msgstr "Innstillinger"
@@ -2431,10 +2424,10 @@ msgid "Connection complete."
 msgstr "Oppkobling ferdig."
 
 #: ../bin/net_monitor:258
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mageia Control Center."
+"Verify your configuration in the Mageia Linux Control Center."
 msgstr ""
 "Feil ved tilkobling.\n"
 "Kontroller oppsettet ditt i Mageia Kontrollsenter."
@@ -2503,22 +2496,22 @@ msgstr "Ingen Internetttilkobling er satt opp"
 msgid "Unknown connection type"
 msgstr "Ukjent tilkoblingstype"
 
-#: ../lib/network/connection.pm:162
+#: ../lib/network/connection.pm:166
 #, c-format
 msgid "Network access settings"
 msgstr "Oppsett for nettverkstilgang"
 
-#: ../lib/network/connection.pm:163
+#: ../lib/network/connection.pm:167
 #, c-format
 msgid "Access settings"
 msgstr "Tilgangsoppsett"
 
-#: ../lib/network/connection.pm:164
+#: ../lib/network/connection.pm:168
 #, c-format
 msgid "Address settings"
 msgstr "Adresseoppsett"
 
-#: ../lib/network/connection.pm:178 ../lib/network/connection.pm:198
+#: ../lib/network/connection.pm:182 ../lib/network/connection.pm:202
 #: ../lib/network/connection/isdn.pm:155 ../lib/network/netconnect.pm:217
 #: ../lib/network/netconnect.pm:492 ../lib/network/netconnect.pm:588
 #: ../lib/network/netconnect.pm:591
@@ -2526,51 +2519,56 @@ msgstr "Adresseoppsett"
 msgid "Unlisted - edit manually"
 msgstr "Ulistet - endre manuelt"
 
-#: ../lib/network/connection.pm:231 ../lib/network/connection/cable.pm:41
-#: ../lib/network/connection/wireless.pm:46 ../lib/network/vpn/openvpn.pm:127
-#: ../lib/network/vpn/openvpn.pm:171 ../lib/network/vpn/openvpn.pm:339
+#: ../lib/network/connection.pm:235 ../lib/network/connection/cable.pm:41
+#: ../lib/network/connection/wireless.pm:46 ../lib/network/vpn/openvpn.pm:129
+#: ../lib/network/vpn/openvpn.pm:173 ../lib/network/vpn/openvpn.pm:341
 #, c-format
 msgid "None"
 msgstr "Ingen"
 
-#: ../lib/network/connection.pm:243
+#: ../lib/network/connection.pm:247
 #, c-format
 msgid "Allow users to manage the connection"
 msgstr "Tillat brukere å håndtere tilkoblingen"
 
-#: ../lib/network/connection.pm:244
+#: ../lib/network/connection.pm:248
 #, c-format
 msgid "Start the connection at boot"
 msgstr "Start tilkoblingen under oppstart"
 
-#: ../lib/network/connection.pm:245
+#: ../lib/network/connection.pm:249
 #, c-format
 msgid "Enable traffic accounting"
 msgstr "Slå på trafikkutregning"
 
-#: ../lib/network/connection.pm:246
+#: ../lib/network/connection.pm:250
+#, c-format
+msgid "Allow interface to be controlled by Network Manager"
+msgstr ""
+
+#: ../lib/network/connection.pm:251
 #, c-format
 msgid "Metric"
 msgstr "Metrisk"
 
-#: ../lib/network/connection.pm:247
+#: ../lib/network/connection.pm:252
 #, c-format
 msgid "MTU"
 msgstr "MTU"
 
-#: ../lib/network/connection.pm:248
+#: ../lib/network/connection.pm:253
 #, c-format
 msgid "Maximum size of network message (MTU). If unsure, left blank."
 msgstr ""
 "Maksimumsstørrelsen for nettverksmelding (MTU). La den være blank hvis du er "
 "usikker."
 
-#: ../lib/network/connection.pm:324
+#: ../lib/network/connection.pm:333
 #, c-format
 msgid "Link detected on interface %s"
 msgstr "Tilkoblingslivstegn oppdaget på grensesnitt %s"
 
-#: ../lib/network/connection.pm:325 ../lib/network/connection/ethernet.pm:302
+#: ../lib/network/connection.pm:334 ../lib/network/connection/ethernet.pm:305
 #, c-format
 msgid "Link beat lost on interface %s"
 msgstr "Tilkoblingslivstegn borte på grensesnitt %s"
@@ -2596,13 +2594,13 @@ msgid "Authentication"
 msgstr "Autentisering"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:393
+#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Innloggingskonto (brukernavn)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:394
+#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Kontopassord"
@@ -2632,22 +2630,22 @@ msgstr "Feil nummerformat, det må være 4 sifre."
 msgid "GPRS/Edge/3G"
 msgstr "GPRS/EDGE/3G"
 
-#: ../lib/network/connection/cellular_card.pm:110
+#: ../lib/network/connection/cellular_card.pm:140
 #, c-format
 msgid "PIN number (4 digits). Leave empty if PIN is not required."
 msgstr "PIN (4 sifre). La det være blankt hvis ingen PIN kreves."
 
-#: ../lib/network/connection/cellular_card.pm:186
+#: ../lib/network/connection/cellular_card.pm:216
 #, c-format
 msgid "Unable to open device %s"
 msgstr "Klarte ikke å åpne enhet %s"
 
-#: ../lib/network/connection/cellular_card.pm:218
+#: ../lib/network/connection/cellular_card.pm:248
 #, c-format
 msgid "Please check that your SIM card is inserted."
 msgstr "Kontroller at SIM-kortet er satt inn."
 
-#: ../lib/network/connection/cellular_card.pm:229
+#: ../lib/network/connection/cellular_card.pm:259
 #, c-format
 msgid ""
 "You entered a wrong PIN code.\n"
@@ -2703,7 +2701,7 @@ msgstr ""
 "Klarte ikke å finne nettverksgrensesnitt for den valgte enheten (bruker "
 "driver %s)."
 
-#: ../lib/network/connection/ethernet.pm:70 ../lib/network/vpn/openvpn.pm:207
+#: ../lib/network/connection/ethernet.pm:70 ../lib/network/vpn/openvpn.pm:209
 #, c-format
 msgid "Manual configuration"
 msgstr "Manuelt oppsett"
@@ -2713,12 +2711,12 @@ msgstr "Manuelt oppsett"
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "Automatisk IP (BOOTP/DHCP)"
 
-#: ../lib/network/connection/ethernet.pm:129
+#: ../lib/network/connection/ethernet.pm:132
 #, c-format
 msgid "IP settings"
 msgstr "Oppsett for IP"
 
-#: ../lib/network/connection/ethernet.pm:142
+#: ../lib/network/connection/ethernet.pm:145
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -2729,80 +2727,80 @@ msgstr ""
 "Hvert element bør skrives som en IP-adresse i\n"
 "punkt-/desimalnotasjon (f.eks. 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:146 ../lib/network/netconnect.pm:665
-#: ../lib/network/vpn/openvpn.pm:212 ../lib/network/vpn/vpnc.pm:39
+#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/connection/ethernet.pm:152
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Hent DNS-tjenere fra DHCP"
 
-#: ../lib/network/connection/ethernet.pm:151
+#: ../lib/network/connection/ethernet.pm:154
 #, c-format
 msgid "DNS server 1"
 msgstr "DNS-tjener 1"
 
-#: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/connection/ethernet.pm:155
 #, c-format
 msgid "DNS server 2"
 msgstr "DNS-tjener 2"
 
-#: ../lib/network/connection/ethernet.pm:153
+#: ../lib/network/connection/ethernet.pm:156
 #, c-format
 msgid "Search domain"
 msgstr "Søk gjennom domene"
 
-#: ../lib/network/connection/ethernet.pm:154
+#: ../lib/network/connection/ethernet.pm:157
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 "Som standard vil søkedomenet bli satt ut i fra det fullt kvalifiserte "
 "vertsnavnet"
 
-#: ../lib/network/connection/ethernet.pm:157
+#: ../lib/network/connection/ethernet.pm:160
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP-tidsavbrudd (i sekunder)"
 
-#: ../lib/network/connection/ethernet.pm:158
+#: ../lib/network/connection/ethernet.pm:161
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Hent YP-tjenere fra DHCP"
 
-#: ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/connection/ethernet.pm:162
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Hent NTPD-tjenere fra DHCP"
 
-#: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/connection/ethernet.pm:163
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP-vertsnavn"
 
-#: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/connection/ethernet.pm:165
 #, c-format
 msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Ikke fall tilbake til Zeroconf (169.254.0.0)"
 
-#: ../lib/network/connection/ethernet.pm:173
+#: ../lib/network/connection/ethernet.pm:176
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-adresse bør være i formatet 1.2.3.4"
 
-#: ../lib/network/connection/ethernet.pm:178
+#: ../lib/network/connection/ethernet.pm:181
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Nettmaske bør være i formatet 255.255.224.0"
 
-#: ../lib/network/connection/ethernet.pm:183
+#: ../lib/network/connection/ethernet.pm:186
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
 msgstr "Advarsel : IP-adresse %s er vanligvis reservert."
 
-#: ../lib/network/connection/ethernet.pm:192
+#: ../lib/network/connection/ethernet.pm:195
 #, c-format
 msgid ""
 "%s is already used by a connection that starts on boot (%s). To use this "
@@ -2814,12 +2812,12 @@ msgstr ""
 "slå av alle andre enheter som bruker den eller sette de opp slik at de ikke "
 "slås på ved oppstart."
 
-#: ../lib/network/connection/ethernet.pm:219
+#: ../lib/network/connection/ethernet.pm:222
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Tilegn vertsnavn fra DHCP-tjener (eller opprett et unikt)"
 
-#: ../lib/network/connection/ethernet.pm:220
+#: ../lib/network/connection/ethernet.pm:223
 #, c-format
 msgid ""
 "This will allow the server to attribute a name for this machine. If the "
@@ -2829,7 +2827,7 @@ msgstr ""
 "Dette vil tillate tjeneren til å legge til et navn for denne maskinen. Hvis "
 "tjeneren ikke tilbyr et gylid vertsnavn, vil dette bli opprettet automatisk."
 
-#: ../lib/network/connection/ethernet.pm:223
+#: ../lib/network/connection/ethernet.pm:226
 #, c-format
 msgid ""
 "You should define a hostname for this machine, which will identify this PC. "
@@ -2840,32 +2838,32 @@ msgstr ""
 "vertsnavnet vil bli delt av alle nettverkstilkoblinger. Hvis er blankt vil "
 "«localhost.localdomain» bli brukt."
 
-#: ../lib/network/connection/ethernet.pm:241
+#: ../lib/network/connection/ethernet.pm:244
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Hurtigkobling for nettverk"
 
-#: ../lib/network/connection/ethernet.pm:245
+#: ../lib/network/connection/ethernet.pm:248
 #, c-format
 msgid "Enable IPv6 to IPv4 tunnel"
 msgstr "Slå på tunnell for IPv6 til IPv4"
 
-#: ../lib/network/connection/ethernet.pm:301
+#: ../lib/network/connection/ethernet.pm:304
 #, c-format
 msgid "Link beat detected on interface %s"
 msgstr "Tilkoblingslivstegn oppdaget på grensesnitt %s"
 
-#: ../lib/network/connection/ethernet.pm:304
+#: ../lib/network/connection/ethernet.pm:307
 #, c-format
 msgid "Requesting a network address on interface %s (%s protocol)..."
 msgstr "Forespør en nettverksadresse på grensesnitt %s (%s-protokoll) …"
 
-#: ../lib/network/connection/ethernet.pm:305
+#: ../lib/network/connection/ethernet.pm:308
 #, c-format
 msgid "Got a network address on interface %s (%s protocol)"
 msgstr "Mottok en nettverksadresse på grensesnitt %s (protokoll %s)"
 
-#: ../lib/network/connection/ethernet.pm:306
+#: ../lib/network/connection/ethernet.pm:309
 #, c-format
 msgid "Failed to get a network address on interface %s (%s protocol)"
 msgstr ""
@@ -4089,90 +4087,90 @@ msgstr "WPA/WPA2 forhåndsdelt nøkkel"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Bedrift"
 
-#: ../lib/network/connection/wireless.pm:269
+#: ../lib/network/connection/wireless.pm:281
 #, c-format
 msgid "Windows driver"
 msgstr "Driver for Windows"
 
-#: ../lib/network/connection/wireless.pm:366
+#: ../lib/network/connection/wireless.pm:369
 #, 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:459
 #, c-format
 msgid "Wireless settings"
 msgstr "Trådløst oppsett"
 
-#: ../lib/network/connection/wireless.pm:461
+#: ../lib/network/connection/wireless.pm:464
 #: ../lib/network/connection_manager.pm:280
 #, c-format
 msgid "Operating Mode"
 msgstr "Operasjonsmodus"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Managed"
 msgstr "Håndtert"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Master"
 msgstr "Hoved"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Repeater"
 msgstr "Repeterer"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Secondary"
 msgstr "Sekundær"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:468
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nettverksnavn (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:467
+#: ../lib/network/connection/wireless.pm:470
 #, c-format
 msgid "Encryption mode"
 msgstr "Krypteringsmodus"
 
-#: ../lib/network/connection/wireless.pm:469
+#: ../lib/network/connection/wireless.pm:472
 #, c-format
 msgid "Encryption key"
 msgstr "Krypteringsnøkkel"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Hide password"
 msgstr "Gjem passord"
 
-#: ../lib/network/connection/wireless.pm:474
+#: ../lib/network/connection/wireless.pm:477
 #, 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:484
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP innlogging/brukernavn"
 
-#: ../lib/network/connection/wireless.pm:483
+#: ../lib/network/connection/wireless.pm:486
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4183,12 +4181,12 @@ msgstr ""
 "den utestede syntaksen DOMAIN\\username hvis du\n"
 "må å angi domenet."
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:489
 #, c-format
 msgid "EAP Password"
 msgstr "EAP passord"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:492
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4221,12 +4219,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:506
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP klientsertifikat"
 
-#: ../lib/network/connection/wireless.pm:505
+#: ../lib/network/connection/wireless.pm:508
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4239,32 +4237,32 @@ 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:509
+#: ../lib/network/connection/wireless.pm:512
 #, c-format
 msgid "Network ID"
 msgstr "NettverksID"
 
-#: ../lib/network/connection/wireless.pm:510
+#: ../lib/network/connection/wireless.pm:513
 #, c-format
 msgid "Operating frequency"
 msgstr "Operasjonsfrekvens"
 
-#: ../lib/network/connection/wireless.pm:511
+#: ../lib/network/connection/wireless.pm:514
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Følsomhetsgrense"
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:515
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (i b/s)"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:517
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4289,17 +4287,17 @@ msgstr ""
 "parameteren til auto, fixed\n"
 "eller off."
 
-#: ../lib/network/connection/wireless.pm:521
+#: ../lib/network/connection/wireless.pm:524
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentering"
 
-#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/connection/wireless.pm:525
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "ekstra argumenter for kommandoen iwconfig"
 
-#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/connection/wireless.pm:526
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4315,12 +4313,12 @@ 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:533
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "ekstra argumenter for kommandoen iwspy"
 
-#: ../lib/network/connection/wireless.pm:531
+#: ../lib/network/connection/wireless.pm:534
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4341,12 +4339,12 @@ msgstr ""
 "\n"
 "Se manualsida iwpspy(8) for mer informasjon."
 
-#: ../lib/network/connection/wireless.pm:539
+#: ../lib/network/connection/wireless.pm:542
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "ekstra argumenter for kommandoen iwpriv"
 
-#: ../lib/network/connection/wireless.pm:541
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4375,28 +4373,28 @@ msgstr ""
 "\n"
 "Se manualsida iwpriv(8) for mer informasjon."
 
-#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/connection/wireless.pm:555
 #, 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:556
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "Auto Detect"
 msgstr "Automatisk oppdagelse"
 
-#: ../lib/network/connection/wireless.pm:553
+#: ../lib/network/connection/wireless.pm:556
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:553
+#: ../lib/network/connection/wireless.pm:556
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:558
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4405,67 +4403,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:560
 #, c-format
 msgid "EAP Mode"
 msgstr "Modus for EAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:563
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:562
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4474,12 +4472,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:567
 #, c-format
 msgid "EAP outer identity"
 msgstr "Ytre identitet for EAP"
 
-#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:569
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4490,12 +4488,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:572
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP fase2"
 
-#: ../lib/network/connection/wireless.pm:571
+#: ../lib/network/connection/wireless.pm:574
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4508,12 +4506,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:578
 #, c-format
 msgid "EAP CA certificate"
 msgstr "CA-sertifikat for EAP"
 
-#: ../lib/network/connection/wireless.pm:577
+#: ../lib/network/connection/wireless.pm:580
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4528,12 +4526,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:585
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "Emnetreff for EAP-sertifikat"
 
-#: ../lib/network/connection/wireless.pm:584
+#: ../lib/network/connection/wireless.pm:587
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4547,12 +4545,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:592
 #, c-format
 msgid "Extra directives"
 msgstr "Ekstra direktiver"
 
-#: ../lib/network/connection/wireless.pm:590
+#: ../lib/network/connection/wireless.pm:593
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4581,12 +4579,12 @@ msgstr ""
 "brukes for å tvinge<br> \tspesialinnstillinger forskjellige fra "
 "instillingene i brukergrensesnitet."
 
-#: ../lib/network/connection/wireless.pm:610
+#: ../lib/network/connection/wireless.pm:613
 #, c-format
 msgid "An encryption key is required."
 msgstr "Krever en krypteringsnøkkel."
 
-#: ../lib/network/connection/wireless.pm:617
+#: ../lib/network/connection/wireless.pm:620
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4595,7 +4593,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:626
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
@@ -4603,7 +4601,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:633
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4612,7 +4610,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:639
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4621,17 +4619,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:651
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Tillat aksesspunktvandring"
 
-#: ../lib/network/connection/wireless.pm:773
+#: ../lib/network/connection/wireless.pm:776
 #, 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:777
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Mistet det tilegnede trådløse nettverket på grensesnitt %s"
@@ -4734,8 +4732,7 @@ msgid "Please enter settings for network"
 msgstr "Skriv inn nettverksinnstillinger"
 
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:479
-#: ../lib/network/connection_manager.pm:492 ../lib/network/drakvpn.pm:100
+#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:100
 #, c-format
 msgid "Connection failed."
 msgstr "Tilkobling mislyktes."
@@ -4760,22 +4757,22 @@ msgstr "Signalstyrke"
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: ../lib/network/connection_manager.pm:351 ../lib/network/netconnect.pm:208
+#: ../lib/network/connection_manager.pm:353 ../lib/network/netconnect.pm:208
 #, c-format
 msgid "Scanning for networks..."
 msgstr "Leter etter nettverk …"
 
-#: ../lib/network/connection_manager.pm:400 ../lib/network/drakroam.pm:91
+#: ../lib/network/connection_manager.pm:402 ../lib/network/drakroam.pm:91
 #, c-format
 msgid "Disconnect"
 msgstr "Koble fra"
 
-#: ../lib/network/connection_manager.pm:400 ../lib/network/drakroam.pm:90
+#: ../lib/network/connection_manager.pm:402 ../lib/network/drakroam.pm:90
 #, c-format
 msgid "Connect"
 msgstr "Koble til"
 
-#: ../lib/network/connection_manager.pm:445
+#: ../lib/network/connection_manager.pm:447
 #, c-format
 msgid "Hostname changed to \"%s\""
 msgstr "Vertsnavn endret til «%s»"
@@ -4880,7 +4877,7 @@ msgstr "Enhetssynkronisering for Windows Mobile"
 msgid "Port scan detection"
 msgstr "Oppdagelse av portskanning"
 
-#: ../lib/network/drakfirewall.pm:224 ../lib/network/drakfirewall.pm:230
+#: ../lib/network/drakfirewall.pm:224 ../lib/network/drakfirewall.pm:228
 #: ../lib/network/shorewall.pm:75
 #, c-format
 msgid "Firewall configuration"
@@ -4891,17 +4888,10 @@ msgstr "Innstilling av brannmuren"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mageia machine.\n"
-"For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mageia Security Firewall distribution."
+"This configures a personal firewall for this Mageia machine."
 msgstr ""
-"Innstilling av brannmuren\n"
-"\n"
-"Dette setter opp en personlig brannmur for denne maskina.\n"
-"For en kraftig dedikert brannmurløsning bør du ta en kikk på\n"
-"Mageia Security Firewall."
 
-#: ../lib/network/drakfirewall.pm:230
+#: ../lib/network/drakfirewall.pm:228
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -4914,13 +4904,13 @@ msgstr ""
 "Forsikre deg om at du har satt opp nettverkets- eller Internett-tilgang\n"
 "med drakconnect før du fortsetter."
 
-#: ../lib/network/drakfirewall.pm:247 ../lib/network/drakfirewall.pm:249
+#: ../lib/network/drakfirewall.pm:245 ../lib/network/drakfirewall.pm:247
 #: ../lib/network/shorewall.pm:167
 #, c-format
 msgid "Firewall"
 msgstr "Brannmur"
 
-#: ../lib/network/drakfirewall.pm:250
+#: ../lib/network/drakfirewall.pm:248
 #, c-format
 msgid ""
 "You can enter miscellaneous ports. \n"
@@ -4931,7 +4921,7 @@ msgstr ""
 "Gyldige eksempler er: 139/tcp 139/udp 600:610/tcp 600:610/udp.\n"
 "Se på /etc/services for mer informasjon."
 
-#: ../lib/network/drakfirewall.pm:256
+#: ../lib/network/drakfirewall.pm:254
 #, c-format
 msgid ""
 "Invalid port given: %s.\n"
@@ -4946,33 +4936,33 @@ msgstr ""
 "\n"
 "Du kan også gi portrekker (feks. 24300:24350/udp)"
 
-#: ../lib/network/drakfirewall.pm:266
+#: ../lib/network/drakfirewall.pm:264
 #, c-format
 msgid "Which services would you like to allow the Internet to connect to?"
 msgstr "For hvilke tjenester vil du tillate tilkobling fra Internett?"
 
-#: ../lib/network/drakfirewall.pm:267 ../lib/network/netconnect.pm:127
-#: ../lib/network/network.pm:540
+#: ../lib/network/drakfirewall.pm:265 ../lib/network/netconnect.pm:127
+#: ../lib/network/network.pm:549
 #, c-format
 msgid "Those settings will be saved for the network profile <b>%s</b>"
 msgstr "Disse innstillingene vil bli lagret i nettverksprofilen <b>%s</b>"
 
-#: ../lib/network/drakfirewall.pm:268
+#: ../lib/network/drakfirewall.pm:266
 #, c-format
 msgid "Everything (no firewall)"
 msgstr "Alt (ingen brannmur)"
 
-#: ../lib/network/drakfirewall.pm:270
+#: ../lib/network/drakfirewall.pm:268
 #, c-format
 msgid "Other ports"
 msgstr "Andre porter"
 
-#: ../lib/network/drakfirewall.pm:271
+#: ../lib/network/drakfirewall.pm:269
 #, c-format
 msgid "Log firewall messages in system logs"
 msgstr "Logg brannmurmeldinger i systemlogger"
 
-#: ../lib/network/drakfirewall.pm:313
+#: ../lib/network/drakfirewall.pm:311
 #, c-format
 msgid ""
 "You can be warned when someone accesses to a service or tries to intrude "
@@ -4983,7 +4973,7 @@ msgstr ""
 "forsøker å bryte seg inn på maskina.\n"
 "Velg hvilke nettverksaktiviter som skal overvåkes."
 
-#: ../lib/network/drakfirewall.pm:318
+#: ../lib/network/drakfirewall.pm:316
 #, c-format
 msgid "Use Interactive Firewall"
 msgstr "Bruk interaktiv brannmur"
@@ -5915,12 +5905,12 @@ msgstr ""
 "En uventet feil oppstod:\n"
 "%s"
 
-#: ../lib/network/network.pm:514
+#: ../lib/network/network.pm:523
 #, c-format
 msgid "Advanced network settings"
 msgstr "Avansert nettverksoppsett"
 
-#: ../lib/network/network.pm:515
+#: ../lib/network/network.pm:524
 #, c-format
 msgid ""
 "Here you can configure advanced network settings. Please note that you have "
@@ -5929,62 +5919,62 @@ msgstr ""
 "Her kan du sette opp avanserte nettverksinnstillinger. Du må starte maskinen "
 "på nytt for å bruke forandringene."
 
-#: ../lib/network/network.pm:517
+#: ../lib/network/network.pm:526
 #, c-format
 msgid "Wireless regulatory domain"
 msgstr "Trådløst regulatordomene"
 
-#: ../lib/network/network.pm:518
+#: ../lib/network/network.pm:527
 #, c-format
 msgid "TCP/IP settings"
 msgstr "TCP/IP-oppsett"
 
-#: ../lib/network/network.pm:519
+#: ../lib/network/network.pm:528
 #, c-format
 msgid "Disable IPv6"
 msgstr "Slå av IPv6"
 
-#: ../lib/network/network.pm:520
+#: ../lib/network/network.pm:529
 #, c-format
 msgid "Disable TCP Window Scaling"
 msgstr "Slå av TCP vindusskalering"
 
-#: ../lib/network/network.pm:521
+#: ../lib/network/network.pm:530
 #, c-format
 msgid "Disable TCP Timestamps"
 msgstr "Slå av TCP-tidsstempler"
 
-#: ../lib/network/network.pm:522
+#: ../lib/network/network.pm:531
 #, c-format
 msgid "Security settings (defined by MSEC policy)"
 msgstr "Sikkerhetsoppsett (angitt av MSEC)"
 
-#: ../lib/network/network.pm:523
+#: ../lib/network/network.pm:532
 #, c-format
 msgid "Disable ICMP echo"
 msgstr "Slå av ICMP-ekko"
 
-#: ../lib/network/network.pm:524
+#: ../lib/network/network.pm:533
 #, c-format
 msgid "Disable ICMP echo for broadcasting messages"
 msgstr "Slår av ICMP-ekko for kringkasting av meldinger"
 
-#: ../lib/network/network.pm:525
+#: ../lib/network/network.pm:534
 #, c-format
 msgid "Disable invalid ICMP error responses"
 msgstr "Slå av ugyldige responser for ICMP-feil"
 
-#: ../lib/network/network.pm:526
+#: ../lib/network/network.pm:535
 #, c-format
 msgid "Log strange packets"
 msgstr "Loggfør merkelige pakker"
 
-#: ../lib/network/network.pm:539
+#: ../lib/network/network.pm:548
 #, c-format
 msgid "Proxies configuration"
 msgstr "Oppsett av mellomtjener"
 
-#: ../lib/network/network.pm:540
+#: ../lib/network/network.pm:549
 #, c-format
 msgid ""
 "Here you can set up your proxies configuration (eg: http://"
@@ -5992,42 +5982,42 @@ msgid ""
 msgstr ""
 "Her kan du sette opp mellomtjenere (feks: http://min_mellomtjener:8080)"
 
-#: ../lib/network/network.pm:541
+#: ../lib/network/network.pm:550
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP-mellomtjener"
 
-#: ../lib/network/network.pm:542
+#: ../lib/network/network.pm:551
 #, c-format
 msgid "Use HTTP proxy for HTTPS connections"
 msgstr "Bruk HTTP-mellomtjener for HTTPS-tilkoblinger"
 
-#: ../lib/network/network.pm:543
+#: ../lib/network/network.pm:552
 #, c-format
 msgid "HTTPS proxy"
 msgstr "HTTPS-mellomtjener"
 
-#: ../lib/network/network.pm:544
+#: ../lib/network/network.pm:553
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP-mellomtjener"
 
-#: ../lib/network/network.pm:545
+#: ../lib/network/network.pm:554
 #, c-format
 msgid "No proxy for (comma separated list):"
 msgstr "Ingen mellomtjener for (kommaseparert liste):"
 
-#: ../lib/network/network.pm:550
+#: ../lib/network/network.pm:559
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "Mellomtjeneren bør være http://..."
 
-#: ../lib/network/network.pm:551
+#: ../lib/network/network.pm:560
 #, c-format
 msgid "Proxy should be http://... or https://..."
 msgstr "Mellomtjeneren bør være http:// eller https://..."
 
-#: ../lib/network/network.pm:552
+#: ../lib/network/network.pm:561
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URLen bør begynne med «ftp:» eller «http:»"
@@ -6098,12 +6088,12 @@ msgid ""
 msgstr ""
 "Disse pakkene kan bli funnet i %s, eller i det offisielle %s pakketreet."
 
-#: ../lib/network/thirdparty.pm:154
+#: ../lib/network/thirdparty.pm:152
 #, c-format
 msgid "The following component is missing: %s"
 msgstr "Følgende komponenter mangler: %s"
 
-#: ../lib/network/thirdparty.pm:156
+#: ../lib/network/thirdparty.pm:154
 #, c-format
 msgid ""
 "The required files can also be installed from this URL:\n"
@@ -6112,47 +6102,47 @@ msgstr ""
 "Filene som er ndøvendige kan også installeres fra denne adressen:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:192
+#: ../lib/network/thirdparty.pm:190
 #, c-format
 msgid "Firmware files are required for this device."
 msgstr "Fastvarefiler er ndøvendige for denne enheten."
 
-#: ../lib/network/thirdparty.pm:195 ../lib/network/thirdparty.pm:200
+#: ../lib/network/thirdparty.pm:193 ../lib/network/thirdparty.pm:198
 #, c-format
 msgid "Use a floppy"
 msgstr "Bruk en diskett"
 
-#: ../lib/network/thirdparty.pm:196 ../lib/network/thirdparty.pm:203
+#: ../lib/network/thirdparty.pm:194 ../lib/network/thirdparty.pm:201
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Bruk Windows-partisjon"
 
-#: ../lib/network/thirdparty.pm:197
+#: ../lib/network/thirdparty.pm:195
 #, c-format
 msgid "Select file"
 msgstr "Velg fila"
 
-#: ../lib/network/thirdparty.pm:208
+#: ../lib/network/thirdparty.pm:206
 #, c-format
 msgid "Please select the firmware file (for example: %s)"
 msgstr "Vennligst velg fastvarefila (for eksempel: %s)"
 
-#: ../lib/network/thirdparty.pm:232
+#: ../lib/network/thirdparty.pm:230
 #, c-format
 msgid "Unable to find \"%s\" on your Windows system!"
 msgstr "Klarte ikke å finne «%s» på Windows."
 
-#: ../lib/network/thirdparty.pm:234
+#: ../lib/network/thirdparty.pm:232
 #, c-format
 msgid "No Windows system has been detected!"
 msgstr "Windows ble ikke oppdaget."
 
-#: ../lib/network/thirdparty.pm:244
+#: ../lib/network/thirdparty.pm:242
 #, c-format
 msgid "Insert floppy"
 msgstr "Sett inn diskett"
 
-#: ../lib/network/thirdparty.pm:245
+#: ../lib/network/thirdparty.pm:243
 #, c-format
 msgid ""
 "Insert a FAT formatted floppy in drive %s with %s in root directory and "
@@ -6161,128 +6151,128 @@ msgstr ""
 "Sett inn en FAT-formatert diskett i stasjon %s med %s i rotkatalogen og "
 "trykk på %s"
 
-#: ../lib/network/thirdparty.pm:245
+#: ../lib/network/thirdparty.pm:243
 #, c-format
 msgid "Next"
 msgstr "Neste"
 
-#: ../lib/network/thirdparty.pm:255
+#: ../lib/network/thirdparty.pm:253
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "Tilgangsfeil på diskett, kan ikke montere enhet %s"
 
-#: ../lib/network/thirdparty.pm:354
+#: ../lib/network/thirdparty.pm:352
 #, c-format
 msgid "Looking for required software and drivers..."
 msgstr "Ser etter nødvendige drivere og programvare …"
 
-#: ../lib/network/thirdparty.pm:369
+#: ../lib/network/thirdparty.pm:367
 #, c-format
 msgid "Please wait, running device configuration commands..."
 msgstr "Vent litt, kjører kommandoer for å sette opp enheter …"
 
-#: ../lib/network/vpn/openvpn.pm:107
+#: ../lib/network/vpn/openvpn.pm:109
 #, c-format
 msgid "X509 Public Key Infrastructure"
 msgstr "X509 offentlig nøkkelinfrastruktur"
 
-#: ../lib/network/vpn/openvpn.pm:108
+#: ../lib/network/vpn/openvpn.pm:110
 #, c-format
 msgid "Static Key"
 msgstr "Statisk nøkkel"
 
 #. -PO: please don't translate the CA acronym
-#: ../lib/network/vpn/openvpn.pm:142
+#: ../lib/network/vpn/openvpn.pm:144
 #, c-format
 msgid "Certificate Authority (CA)"
 msgstr "Sertifikatutsteder (CA)"
 
-#: ../lib/network/vpn/openvpn.pm:148
+#: ../lib/network/vpn/openvpn.pm:150
 #, c-format
 msgid "Certificate"
 msgstr "Sertifikat"
 
-#: ../lib/network/vpn/openvpn.pm:154
+#: ../lib/network/vpn/openvpn.pm:156
 #, c-format
 msgid "Key"
 msgstr "Nøkkel"
 
-#: ../lib/network/vpn/openvpn.pm:160
+#: ../lib/network/vpn/openvpn.pm:162
 #, c-format
 msgid "TLS control channel key"
 msgstr "TLS kontrollkanalnøkkel"
 
-#: ../lib/network/vpn/openvpn.pm:167
+#: ../lib/network/vpn/openvpn.pm:169
 #, c-format
 msgid "Key direction"
 msgstr "Nøkkelretning"
 
-#: ../lib/network/vpn/openvpn.pm:175
+#: ../lib/network/vpn/openvpn.pm:177
 #, c-format
 msgid "Authenticate using username and password"
 msgstr "Autentiser med brukernavn og passord"
 
-#: ../lib/network/vpn/openvpn.pm:181
+#: ../lib/network/vpn/openvpn.pm:183
 #, c-format
 msgid "Check server certificate"
 msgstr "Sjekk tjenersertifikat"
 
-#: ../lib/network/vpn/openvpn.pm:187
+#: ../lib/network/vpn/openvpn.pm:189
 #, c-format
 msgid "Cipher algorithm"
 msgstr "Krypteringsalgoritme"
 
-#: ../lib/network/vpn/openvpn.pm:191
+#: ../lib/network/vpn/openvpn.pm:193
 #, c-format
 msgid "Default"
 msgstr "Standard"
 
-#: ../lib/network/vpn/openvpn.pm:195
+#: ../lib/network/vpn/openvpn.pm:197
 #, c-format
 msgid "Size of cipher key"
 msgstr "Størrelse på krypteringsnøkkel"
 
-#: ../lib/network/vpn/openvpn.pm:206
+#: ../lib/network/vpn/openvpn.pm:208
 #, c-format
 msgid "Get from server"
 msgstr "Motta fra tjener"
 
-#: ../lib/network/vpn/openvpn.pm:216
+#: ../lib/network/vpn/openvpn.pm:218
 #, c-format
 msgid "Gateway port"
 msgstr "Gateway-port"
 
-#: ../lib/network/vpn/openvpn.pm:232
+#: ../lib/network/vpn/openvpn.pm:234
 #, c-format
 msgid "Remote IP address"
 msgstr "Ekstern IP-adresse"
 
-#: ../lib/network/vpn/openvpn.pm:237
+#: ../lib/network/vpn/openvpn.pm:239
 #, c-format
 msgid "Use TCP protocol"
 msgstr "Bruk TCP-protokoll"
 
-#: ../lib/network/vpn/openvpn.pm:243
+#: ../lib/network/vpn/openvpn.pm:245
 #, c-format
 msgid "Virtual network device type"
 msgstr "Enhetstype for virtuelt nettverk"
 
-#: ../lib/network/vpn/openvpn.pm:250
+#: ../lib/network/vpn/openvpn.pm:252
 #, c-format
 msgid "Virtual network device number (optional)"
 msgstr "Enhetsnummer for virtuelt nettverk (valgfritt)"
 
-#: ../lib/network/vpn/openvpn.pm:365
+#: ../lib/network/vpn/openvpn.pm:367
 #, c-format
 msgid "Starting connection.."
 msgstr "Starter tilkobling …"
 
-#: ../lib/network/vpn/openvpn.pm:380
+#: ../lib/network/vpn/openvpn.pm:382
 #, c-format
 msgid "Please insert your token"
 msgstr "Sett inn symbolet ditt"
 
-#: ../lib/network/vpn/openvpn.pm:391
+#: ../lib/network/vpn/openvpn.pm:393
 #, c-format
 msgid "PIN number"
 msgstr "PIN"
@@ -6316,3 +6306,19 @@ msgstr "NAT-modus"
 #, c-format
 msgid "Use specific UDP port"
 msgstr "Bruk spesifikk UDP-port"
+
+#~ msgid "Same IP is already in %s file."
+#~ msgstr "Samme IP eksisterer allerede i fila %s."
+
+#~ msgid ""
+#~ "drakfirewall configurator\n"
+#~ "\n"
+#~ "This configures a personal firewall for this Mageia machine.\n"
+#~ "For a powerful and dedicated firewall solution, please look to the\n"
+#~ "specialized Mageia Security Firewall distribution."
+#~ msgstr ""
+#~ "Innstilling av brannmuren\n"
+#~ "\n"
+#~ "Dette setter opp en personlig brannmur for denne maskina.\n"
+#~ "For en kraftig dedikert brannmurløsning bør du ta en kikk på\n"
+#~ "Mageia Security Firewall."