merge with code (to make "Any" translatable, #40926)

1 files changed, 488 insertions, 496 deletions

diff --git a/po/nb.po b/po/nb.po
index 7f6c52b..31de55e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -18,7 +18,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
-"POT-Creation-Date: 2008-04-02 16:11+0200\n"
+"POT-Creation-Date: 2008-05-19 14:44+0200\n"
 "PO-Revision-Date: 2007-12-15 15:07+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: dansk <dansk@dansk-gruppen.dk>\n"
@@ -39,19 +39,19 @@ msgid "Interface"
 msgstr "Grensesnitt"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:196
-#: ../lib/network/connection/ethernet.pm:131 ../lib/network/netconnect.pm:617
+#: ../lib/network/connection/ethernet.pm:133 ../lib/network/netconnect.pm:614
 #: ../lib/network/vpn/openvpn.pm:221
 #, c-format
 msgid "IP address"
 msgstr "IP-adresse"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:258 ../bin/drakvpn-old:839
-#: ../lib/network/netconnect.pm:461
+#: ../lib/network/netconnect.pm:458
 #, c-format
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../bin/drakconnect-old:64 ../lib/network/netconnect.pm:447
+#: ../bin/drakconnect-old:64 ../lib/network/netconnect.pm:444
 #, c-format
 msgid "Driver"
 msgstr "Driver"
@@ -81,7 +81,7 @@ msgstr "Nettverksoppsett"
 msgid "Configure Local Area Network..."
 msgstr "Sett opp lokalt nettverk ..."
 
-#: ../bin/drakconnect-old:106 ../bin/draknfs:186 ../bin/net_applet:136
+#: ../bin/drakconnect-old:106 ../bin/draknfs:186 ../bin/net_applet:170
 #, c-format
 msgid "Help"
 msgstr "Hjelp"
@@ -92,26 +92,27 @@ msgid "Apply"
 msgstr "Bruk"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
-#: ../bin/draknetprofile:106 ../bin/net_monitor:347
+#: ../bin/draknetprofile:133 ../bin/net_monitor:347
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
-#: ../bin/drakconnect-old:265 ../bin/draknetprofile:108 ../bin/net_monitor:348
+#: ../bin/drakconnect-old:265 ../bin/draknetprofile:135 ../bin/net_monitor:348
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../bin/drakconnect-old:113 ../bin/drakgw:344 ../bin/draksambashare:228
+#: ../bin/drakconnect-old:113 ../bin/drakgw:345 ../bin/draksambashare:228
 #: ../bin/drakvpn-old:97 ../bin/drakvpn-old:127
 #: ../lib/network/connection_manager.pm:82
-#: ../lib/network/connection_manager.pm:186
-#: ../lib/network/connection_manager.pm:203
-#: ../lib/network/connection_manager.pm:286 ../lib/network/drakvpn.pm:49
-#: ../lib/network/netcenter.pm:33 ../lib/network/netconnect.pm:181
-#: ../lib/network/netconnect.pm:214 ../lib/network/netconnect.pm:717
-#: ../lib/network/thirdparty.pm:354 ../lib/network/thirdparty.pm:369
+#: ../lib/network/connection_manager.pm:195
+#: ../lib/network/connection_manager.pm:212
+#: ../lib/network/connection_manager.pm:295 ../lib/network/drakvpn.pm:49
+#: ../lib/network/netcenter.pm:33 ../lib/network/netconnect.pm:185
+#: ../lib/network/netconnect.pm:207 ../lib/network/netconnect.pm:304
+#: ../lib/network/netconnect.pm:714 ../lib/network/thirdparty.pm:354
+#: ../lib/network/thirdparty.pm:369
 #, c-format
 msgid "Please wait"
 msgstr "Vennligst vent"
@@ -151,7 +152,7 @@ msgid "Adapter %s: %s"
 msgstr "Adapter %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:177
-#: ../lib/network/connection/ethernet.pm:138
+#: ../lib/network/connection/ethernet.pm:140
 #, c-format
 msgid "Netmask"
 msgstr "Nettmaske"
@@ -166,7 +167,7 @@ msgstr "Oppstartsprotokoll"
 msgid "Started on boot"
 msgstr "Startet ved oppstart"
 
-#: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:149
+#: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:151
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP-klient"
@@ -180,7 +181,7 @@ msgstr ""
 "Dette grensesnittet har ikke blitt satt opp ennå.\n"
 "Kjør «Legg til et grensesnitt»-assistenten fra Mandriva Linux Kontrollsenter"
 
-#: ../bin/drakconnect-old:247 ../bin/net_applet:68
+#: ../bin/drakconnect-old:247 ../bin/net_applet:102
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Sett opp et nytt nettverksgrensesnitt (LAN, ISDN, ADSL, ...)"
@@ -281,8 +282,8 @@ msgstr "Sett opp på nytt"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Vennligst velg nettverkskortet som er direkte tilkoblet internett."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:363
-#: ../lib/network/netconnect.pm:398
+#: ../bin/drakgw:123 ../lib/network/netconnect.pm:360
+#: ../lib/network/netconnect.pm:395
 #, c-format
 msgid "Net Device"
 msgstr "Nettenhet"
@@ -327,7 +328,7 @@ msgstr "Det internasjonale domenenavnet"
 
 #: ../bin/drakgw:184 ../bin/drakhosts:100 ../bin/drakhosts:245
 #: ../bin/drakhosts:252 ../bin/drakhosts:259 ../bin/drakinvictus:72
-#: ../bin/draknetprofile:113 ../bin/draknfs:88 ../bin/draknfs:109
+#: ../bin/draknetprofile:140 ../bin/draknfs:88 ../bin/draknfs:109
 #: ../bin/draknfs:279 ../bin/draknfs:412 ../bin/draknfs:414 ../bin/draknfs:417
 #: ../bin/draknfs:509 ../bin/draknfs:516 ../bin/draknfs:579 ../bin/draknfs:586
 #: ../bin/draknfs:593 ../bin/draksambashare:392 ../bin/draksambashare:399
@@ -341,18 +342,18 @@ msgstr "Det internasjonale domenenavnet"
 #: ../bin/draksambashare:1357 ../bin/draksambashare:1379
 #: ../bin/draksambashare:1388 ../bin/draksambashare:1407
 #: ../bin/draksambashare:1416 ../bin/draksambashare:1428
-#: ../lib/network/connection/xdsl.pm:332
-#: ../lib/network/connection_manager.pm:61
-#: ../lib/network/connection_manager.pm:67
+#: ../lib/network/connection/xdsl.pm:339
+#: ../lib/network/connection_manager.pm:60
+#: ../lib/network/connection_manager.pm:66
 #: ../lib/network/connection_manager.pm:77
 #: ../lib/network/connection_manager.pm:85
-#: ../lib/network/connection_manager.pm:157
-#: ../lib/network/connection_manager.pm:161 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:166
+#: ../lib/network/connection_manager.pm:170 ../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:131
-#: ../lib/network/netconnect.pm:183 ../lib/network/netconnect.pm:240
-#: ../lib/network/netconnect.pm:281 ../lib/network/netconnect.pm:826
+#: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:134
+#: ../lib/network/netconnect.pm:187 ../lib/network/netconnect.pm:233
+#: ../lib/network/netconnect.pm:274 ../lib/network/netconnect.pm:823
 #: ../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
@@ -448,12 +449,12 @@ msgstr "Proxy-port"
 msgid "Cache size (MB)"
 msgstr "Hurtigminnestørrelse (MB)"
 
-#: ../bin/drakgw:292
+#: ../bin/drakgw:293
 #, c-format
 msgid "Broadcast printer information"
 msgstr "Kringkast skriverinformasjon"
 
-#: ../bin/drakgw:303
+#: ../bin/drakgw:304
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
@@ -462,17 +463,17 @@ msgstr ""
 "Ingen ethernet-nettverksadapter har blitt oppdaget på ditt system. Kjør "
 "verktøyet for maskinvareoppsett."
 
-#: ../bin/drakgw:309
+#: ../bin/drakgw:310
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "Deling av Internettilkobling er nå aktivert."
 
-#: ../bin/drakgw:315
+#: ../bin/drakgw:316
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "Deling av Internettilkobling er nå deaktivert"
 
-#: ../bin/drakgw:321
+#: ../bin/drakgw:322
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -485,17 +486,17 @@ msgstr ""
 "ved å bruke automatisk nettverksoppsett (DHCP) og\n"
 "en transparent hurtiglagrende mellomtjener (SQUID)"
 
-#: ../bin/drakgw:344
+#: ../bin/drakgw:345
 #, c-format
 msgid "Disabling servers..."
 msgstr "Deaktiverer tjenere ..."
 
-#: ../bin/drakgw:358
+#: ../bin/drakgw:359
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "Brannmuroppsett oppdaget!"
 
-#: ../bin/drakgw:359
+#: ../bin/drakgw:360
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
@@ -504,12 +505,12 @@ msgstr ""
 "Advarsel! Et eksisterende brannmuroppsett har blitt oppdaget. Du trenger "
 "muligens å gjøre noen manuelle innstillinger etter installasjonen."
 
-#: ../bin/drakgw:364
+#: ../bin/drakgw:365
 #, c-format
 msgid "Configuring..."
 msgstr "Setter opp ..."
 
-#: ../bin/drakgw:365
+#: ../bin/drakgw:366
 #, c-format
 msgid "Configuring firewall..."
 msgstr "Setter opp brannmur ..."
@@ -566,7 +567,7 @@ msgstr "Tast inn en gyldig IP-adresse."
 msgid "Same IP is already in %s file."
 msgstr "Samme IP eksisterer allerede i «%s»-fila."
 
-#: ../bin/drakhosts:196 ../lib/network/connection/ethernet.pm:209
+#: ../bin/drakhosts:196 ../lib/network/connection/ethernet.pm:211
 #, c-format
 msgid "Host name"
 msgstr "Vertsnavn"
@@ -628,9 +629,9 @@ msgstr "Fjern"
 msgid "Failed to remove host."
 msgstr "Klarte ikke å fjerne vert."
 
-#: ../bin/drakhosts:262 ../bin/drakinvictus:141 ../bin/draknetprofile:147
-#: ../bin/net_applet:137 ../lib/network/drakroam.pm:117
-#: ../lib/network/netcenter.pm:127
+#: ../bin/drakhosts:262 ../bin/drakinvictus:141 ../bin/draknetprofile:174
+#: ../bin/net_applet:171 ../lib/network/drakroam.pm:118
+#: ../lib/network/netcenter.pm:132
 #, c-format
 msgid "Quit"
 msgstr "Avslutt"
@@ -642,16 +643,15 @@ msgstr "Tillatte 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:262
-#: ../lib/network/drakfirewall.pm:266
+#: ../bin/net_applet:110 ../bin/net_applet:261
+#: ../lib/network/drakfirewall.pm:262 ../lib/network/drakfirewall.pm:266
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interaktiv brannmur"
 
 #: ../bin/drakids:68 ../bin/drakids:187 ../bin/drakids:196 ../bin/drakids:221
 #: ../bin/drakids:230 ../bin/drakids:240 ../bin/drakids:332
-#: ../bin/net_applet:239 ../bin/net_applet:515
+#: ../bin/net_applet:261
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Klarte ikke å kontakte tjeneste"
@@ -661,12 +661,12 @@ msgstr "Klarte ikke å kontakte tjeneste"
 msgid "Log"
 msgstr "Logg"
 
-#: ../bin/drakids:83 ../bin/drakids:102 ../bin/net_applet:673
+#: ../bin/drakids:83 ../bin/drakids:102
 #, c-format
 msgid "Allow"
 msgstr "Tillat"
 
-#: ../bin/drakids:84 ../bin/drakids:93 ../bin/net_applet:674
+#: ../bin/drakids:84 ../bin/drakids:93
 #, c-format
 msgid "Block"
 msgstr "Blokkér"
@@ -693,12 +693,12 @@ msgstr "Blokkerte tjenester"
 msgid "Clear logs"
 msgstr "Tøm logger"
 
-#: ../bin/drakids:112 ../bin/drakids:117 ../bin/net_applet:612
+#: ../bin/drakids:112 ../bin/drakids:117
 #, c-format
 msgid "Blacklist"
 msgstr "Svarteliste"
 
-#: ../bin/drakids:113 ../bin/drakids:130 ../bin/net_applet:617
+#: ../bin/drakids:113 ../bin/drakids:130
 #, c-format
 msgid "Whitelist"
 msgstr "Hviteliste"
@@ -807,7 +807,7 @@ msgstr "Virtuell delt adresse"
 msgid "Virtual ID"
 msgstr "Virtuell ID"
 
-#: ../bin/drakinvictus:110 ../lib/network/netconnect.pm:599
+#: ../bin/drakinvictus:110 ../lib/network/netconnect.pm:596
 #: ../lib/network/vpn/vpnc.pm:56
 #, c-format
 msgid "Password"
@@ -833,7 +833,7 @@ msgstr "Synkroniser nettversgrensesnitt"
 msgid "Connection mark bit"
 msgstr "Connection mark-del"
 
-#: ../bin/draknetprofile:36
+#: ../bin/draknetprofile:37
 #, c-format
 msgid "Network profiles"
 msgstr "Nettverksprofiler"
@@ -843,12 +843,12 @@ msgstr "Nettverksprofiler"
 msgid "Profile"
 msgstr "Profil"
 
-#: ../bin/draknetprofile:99
+#: ../bin/draknetprofile:126
 #, c-format
 msgid "New profile..."
 msgstr "Ny profil ..."
 
-#: ../bin/draknetprofile:102
+#: ../bin/draknetprofile:129
 #, c-format
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
@@ -857,29 +857,29 @@ msgstr ""
 "Navn på profilen som skal opprettes (den nye profilen blir opprettet som en "
 "kopi av den gjeldende):"
 
-#: ../bin/draknetprofile:113
+#: ../bin/draknetprofile:140
 #, c-format
 msgid "The \"%s\" profile already exists!"
 msgstr "«%s»-profilen eksisterer allerede!"
 
-#: ../bin/draknetprofile:129 ../bin/draknetprofile:131 ../bin/drakproxy:36
+#: ../bin/draknetprofile:156 ../bin/draknetprofile:158
 #: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
-#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:484
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:481
 #, c-format
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../bin/draknetprofile:129
+#: ../bin/draknetprofile:156
 #, c-format
 msgid "You can not delete the default profile"
 msgstr "Du kan ikke slette standardprofilen"
 
-#: ../bin/draknetprofile:131
+#: ../bin/draknetprofile:158
 #, c-format
 msgid "You can not delete the current profile"
 msgstr "Du kan ikke slette den gjeldende profilen"
 
-#: ../bin/draknetprofile:141
+#: ../bin/draknetprofile:168
 #, c-format
 msgid ""
 "This tool allows to activate an existing network profile, and to manage "
@@ -888,22 +888,22 @@ msgstr ""
 "Dette verktøyet hjelper deg med å aktivere en eksisterende nettverksprofil "
 "og å håndtere (klone, slette) profiler."
 
-#: ../bin/draknetprofile:141
+#: ../bin/draknetprofile:168
 #, c-format
 msgid "To modify a profile, you have to activate it first."
 msgstr "For å endre på en profil, må du aktivere den først."
 
-#: ../bin/draknetprofile:144
+#: ../bin/draknetprofile:171
 #, c-format
 msgid "Activate"
 msgstr "Aktiver"
 
-#: ../bin/draknetprofile:145
+#: ../bin/draknetprofile:172
 #, c-format
 msgid "Clone"
 msgstr "Klon"
 
-#: ../bin/draknetprofile:146
+#: ../bin/draknetprofile:173
 #, c-format
 msgid "Delete"
 msgstr "Slett"
@@ -1293,11 +1293,6 @@ msgstr "Klarte ikke å endre delt NFS-ressurs."
 msgid "Failed to remove an NFS share."
 msgstr "Klarte ikke å fjerne delt NFS-ressurs."
 
-#: ../bin/drakproxy:36
-#, c-format
-msgid "You need to log out and back in again for changes to take effect"
-msgstr "Du trenger å logge ut og inn igjen for at fendringene skal tre i kraft"
-
 #: ../bin/draksambashare:64
 #, c-format
 msgid "User name"
@@ -3354,32 +3349,32 @@ msgstr "bruk"
 msgid "unique"
 msgstr "unik"
 
-#: ../bin/net_applet:60
+#: ../bin/net_applet:94
 #, c-format
 msgid "Network is up on interface %s."
 msgstr "Nettverk er oppe på grensesnitt %s."
 
-#: ../bin/net_applet:61
+#: ../bin/net_applet:95
 #, c-format
 msgid "IP address: %s"
 msgstr "IP-adresse: %s"
 
-#: ../bin/net_applet:62
+#: ../bin/net_applet:96
 #, c-format
 msgid "Gateway: %s"
 msgstr "Gateway: %s"
 
-#: ../bin/net_applet:63
+#: ../bin/net_applet:97
 #, c-format
 msgid "Connected to %s (link level: %d %%)"
 msgstr "Koblet til %s (linknivå: %d %%)"
 
-#: ../bin/net_applet:65
+#: ../bin/net_applet:99
 #, c-format
 msgid "Network is down on interface %s."
 msgstr "Nettverk er nede på grensesnitt %s."
 
-#: ../bin/net_applet:67
+#: ../bin/net_applet:101
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
@@ -3388,190 +3383,93 @@ msgstr ""
 "Du har ikke satt opp en internettilkobling enda.\n"
 "Kjør «%s»-assistenten fra Mandriva Linux Kontrollsenter."
 
-#: ../bin/net_applet:73 ../bin/net_monitor:475
+#: ../bin/net_applet:107 ../bin/net_monitor:475
 #, c-format
 msgid "Connect %s"
 msgstr "Koble til %s"
 
-#: ../bin/net_applet:74 ../bin/net_monitor:475
+#: ../bin/net_applet:108 ../bin/net_monitor:475
 #, c-format
 msgid "Disconnect %s"
 msgstr "Koble fra %s"
 
-#: ../bin/net_applet:75
+#: ../bin/net_applet:109
 #, c-format
 msgid "Monitor Network"
 msgstr "Overvåk nettverk"
 
-#: ../bin/net_applet:77
+#: ../bin/net_applet:111
 #, c-format
 msgid "Manage wireless networks"
 msgstr "Håndter trådløse nettverk"
 
-#: ../bin/net_applet:79
+#: ../bin/net_applet:113
 #, c-format
 msgid "Manage VPN connections"
 msgstr "Håndter VPN-tilkoblinger"
 
-#: ../bin/net_applet:83
+#: ../bin/net_applet:117
 #, c-format
 msgid "Configure Network"
 msgstr "Sett opp nettverk"
 
-#: ../bin/net_applet:85
+#: ../bin/net_applet:119
 #, c-format
 msgid "Watched interface"
 msgstr "Grensesnitt som følges med på"
 
-#: ../bin/net_applet:86 ../bin/net_applet:87 ../bin/net_applet:89
+#: ../bin/net_applet:120 ../bin/net_applet:121 ../bin/net_applet:123
 #, c-format
 msgid "Auto-detect"
 msgstr "Automatisk oppdagelse"
 
-#: ../bin/net_applet:94
+#: ../bin/net_applet:128
 #, c-format
 msgid "Active interfaces"
 msgstr "Aktive grensesnitt"
 
-#: ../bin/net_applet:118
+#: ../bin/net_applet:152
 #, c-format
 msgid "Profiles"
 msgstr "Profiler"
 
-#: ../bin/net_applet:128 ../lib/network/connection.pm:190
+#: ../bin/net_applet:162 ../lib/network/connection.pm:218
 #: ../lib/network/drakvpn.pm:62 ../lib/network/vpn/openvpn.pm:365
 #: ../lib/network/vpn/openvpn.pm:379 ../lib/network/vpn/openvpn.pm:390
 #, c-format
 msgid "VPN connection"
 msgstr "VPN-tilkobling"
 
-#: ../bin/net_applet:319
+#: ../bin/net_applet:341
 #, c-format
 msgid "Network connection"
 msgstr "Nettverkstilkobling"
 
-#: ../bin/net_applet:439
+#: ../bin/net_applet:425
 #, c-format
 msgid "More networks"
 msgstr "Flere nettverk"
 
-#: ../bin/net_applet:466
+#: ../bin/net_applet:452
 #, c-format
 msgid "Interactive Firewall automatic mode"
 msgstr "Automatisk interaktiv brannmur-modus"
 
-#: ../bin/net_applet:471
+#: ../bin/net_applet:457
 #, c-format
 msgid "Always launch on startup"
 msgstr "Kjør alltid under oppstart"
 
-#: ../bin/net_applet:476
+#: ../bin/net_applet:462
 #, c-format
 msgid "Wireless networks"
 msgstr "Trådløse nettverk"
 
-#: ../bin/net_applet:483 ../bin/net_monitor:96
+#: ../bin/net_applet:469 ../bin/net_monitor:96
 #, c-format
 msgid "Settings"
 msgstr "Instillinger"
 
-#. -PO: "Process" is a verb
-#: ../bin/net_applet:554
-#, fuzzy, c-format
-msgid "Process attack"
-msgstr "Tjenesteangrep"
-
-#: ../bin/net_applet:567
-#, c-format
-msgid "Interactive Firewall: intrusion detected"
-msgstr "Interaktiv brannmur: innbrudd oppdaget"
-
-#: ../bin/net_applet:584
-#, c-format
-msgid "What do you want to do with this attacker?"
-msgstr "Hva ønsker du å gjøre med denne angriperen?"
-
-#: ../bin/net_applet:587
-#, c-format
-msgid "Attack details"
-msgstr "Angrepsdetaljer"
-
-#: ../bin/net_applet:591
-#, c-format
-msgid "Attack time: %s"
-msgstr "Angrepstidspunkt: %s"
-
-#: ../bin/net_applet:592
-#, c-format
-msgid "Network interface: %s"
-msgstr "Nettverksgrensesnitt: %s"
-
-#: ../bin/net_applet:593
-#, c-format
-msgid "Attack type: %s"
-msgstr "Angrepstype: %s"
-
-#: ../bin/net_applet:594
-#, c-format
-msgid "Protocol: %s"
-msgstr "Protokoll: %s"
-
-#: ../bin/net_applet:595
-#, c-format
-msgid "Attacker IP address: %s"
-msgstr "Angripers IP-adresse: %s"
-
-#: ../bin/net_applet:596
-#, c-format
-msgid "Attacker hostname: %s"
-msgstr "Angripers vertsnavn: %s"
-
-#: ../bin/net_applet:599
-#, c-format
-msgid "Service attacked: %s"
-msgstr "Tjeneste angrepet: %s"
-
-#: ../bin/net_applet:600
-#, c-format
-msgid "Port attacked: %s"
-msgstr "Port angrepet: %s"
-
-#: ../bin/net_applet:602
-#, c-format
-msgid "Type of ICMP attack: %s"
-msgstr "Type ICMP-angrep: %s"
-
-#: ../bin/net_applet:607
-#, c-format
-msgid "Always blacklist (do not ask again)"
-msgstr "Alltid svartelist (ikke spørr igjen)"
-
-#: ../bin/net_applet:622
-#, c-format
-msgid "Ignore"
-msgstr "Ignorér"
-
-#: ../bin/net_applet:640 ../bin/net_applet:658
-#, c-format
-msgid "Interactive Firewall: new service"
-msgstr "Interaktiv brannmur: ny tjeneste"
-
-#. -PO: "Process" is a verb
-#: ../bin/net_applet:646
-#, fuzzy, c-format
-msgid "Process connection"
-msgstr "Trådløs tilkobling"
-
-#: ../bin/net_applet:668
-#, c-format
-msgid "Do you want to open this service?"
-msgstr "Ønsker du å sette opp denne tjenesten?"
-
-#: ../bin/net_applet:671
-#, c-format
-msgid "Remember this answer"
-msgstr "Husk dette svaret"
-
 #: ../bin/net_monitor:60 ../bin/net_monitor:65
 #, c-format
 msgid "Network Monitoring"
@@ -3747,34 +3645,42 @@ msgstr "Tilgangsoppsett"
 msgid "Address settings"
 msgstr "Adresseoppsett"
 
-#: ../lib/network/connection.pm:192 ../lib/network/connection/cable.pm:41
-#: ../lib/network/connection/wireless.pm:42 ../lib/network/vpn/openvpn.pm:127
+#: ../lib/network/connection.pm:172 ../lib/network/connection.pm:187
+#: ../lib/network/connection/isdn.pm:153 ../lib/network/netconnect.pm:216
+#: ../lib/network/netconnect.pm:473 ../lib/network/netconnect.pm:569
+#: ../lib/network/netconnect.pm:572
+#, c-format
+msgid "Unlisted - edit manually"
+msgstr "Ulistet - endre manuelt"
+
+#: ../lib/network/connection.pm:220 ../lib/network/connection/cable.pm:41
+#: ../lib/network/connection/wireless.pm:43 ../lib/network/vpn/openvpn.pm:127
 #: ../lib/network/vpn/openvpn.pm:171 ../lib/network/vpn/openvpn.pm:339
 #, c-format
 msgid "None"
 msgstr "Ingen"
 
-#: ../lib/network/connection.pm:204
+#: ../lib/network/connection.pm:232
 #, c-format
 msgid "Allow users to manage the connection"
 msgstr "Tillat brukere å håndtere tilkoblingen"
 
-#: ../lib/network/connection.pm:205
+#: ../lib/network/connection.pm:233
 #, c-format
 msgid "Start the connection at boot"
 msgstr "Start tilkoblingen ved oppstart"
 
-#: ../lib/network/connection.pm:206
+#: ../lib/network/connection.pm:234
 #, c-format
 msgid "Metric"
 msgstr "Metrisk"
 
-#: ../lib/network/connection.pm:271
+#: ../lib/network/connection.pm:304
 #, c-format
 msgid "Link detected on interface %s"
 msgstr "Tilkoblingslivstegn oppdaget på grensesnitt %s"
 
-#: ../lib/network/connection.pm:272 ../lib/network/connection/ethernet.pm:286
+#: ../lib/network/connection.pm:305 ../lib/network/connection/ethernet.pm:288
 #, c-format
 msgid "Link beat lost on interface %s"
 msgstr "Tilkoblingslivstegn mistet på grensesnitt %s"
@@ -3794,24 +3700,24 @@ msgstr "Kabelmodem"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "bruk BPALogin (trengs for Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:600
+#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:597
 #, c-format
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:339 ../lib/network/vpn/openvpn.pm:393
+#: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:30
+#: ../lib/network/netconnect.pm:336 ../lib/network/vpn/openvpn.pm:393
 #, 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:340 ../lib/network/vpn/openvpn.pm:394
+#: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:31
+#: ../lib/network/netconnect.pm:337 ../lib/network/vpn/openvpn.pm:394
 #, c-format
 msgid "Account Password"
 msgstr "Kontopassord"
 
-#: ../lib/network/connection/cellular.pm:48
+#: ../lib/network/connection/cellular.pm:66
 #, c-format
 msgid "Access Point Name"
 msgstr "Navn på aksesspunkt"
@@ -3836,23 +3742,23 @@ msgstr ""
 msgid "GPRS/Edge/3G"
 msgstr "GPRS/Edge/3G"
 
-#: ../lib/network/connection/cellular_card.pm:70
+#: ../lib/network/connection/cellular_card.pm:91
 #: ../lib/network/vpn/openvpn.pm:391
 #, c-format
 msgid "PIN number"
 msgstr "PIN-kode"
 
-#: ../lib/network/connection/cellular_card.pm:142
+#: ../lib/network/connection/cellular_card.pm:167
 #, c-format
 msgid "Unable to open device %s"
 msgstr "Klarte ikke å åpne enhet %s"
 
-#: ../lib/network/connection/cellular_card.pm:169
+#: ../lib/network/connection/cellular_card.pm:199
 #, c-format
 msgid "Please check that your SIM card is inserted."
 msgstr "Vennligst sjekk at ditt SIM-kort er satt inn."
 
-#: ../lib/network/connection/cellular_card.pm:180
+#: ../lib/network/connection/cellular_card.pm:210
 #, c-format
 msgid ""
 "You entered a wrong PIN code.\n"
@@ -3903,22 +3809,22 @@ msgstr ""
 "Klarte ikke å finne nettverksgrensesnitt for den valgte enheten (bruker %s-"
 "driver)"
 
-#: ../lib/network/connection/ethernet.pm:67 ../lib/network/vpn/openvpn.pm:207
+#: ../lib/network/connection/ethernet.pm:69 ../lib/network/vpn/openvpn.pm:207
 #, c-format
 msgid "Manual configuration"
 msgstr "Manuelt oppsett"
 
-#: ../lib/network/connection/ethernet.pm:68
+#: ../lib/network/connection/ethernet.pm:70
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "Automatisk IP (BOOTP/DHCP)"
 
-#: ../lib/network/connection/ethernet.pm:122
+#: ../lib/network/connection/ethernet.pm:124
 #, c-format
 msgid "IP settings"
 msgstr "IP-oppsett"
 
-#: ../lib/network/connection/ethernet.pm:135
+#: ../lib/network/connection/ethernet.pm:137
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -3929,115 +3835,115 @@ msgstr ""
 "Hvert element bør skrives som en IP-adresse i punkt-desimal\n"
 "notasjon (f.eks, 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:139 ../lib/network/netconnect.pm:649
+#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:646
 #: ../lib/network/vpn/openvpn.pm:212 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../lib/network/connection/ethernet.pm:142
+#: ../lib/network/connection/ethernet.pm:144
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Få DNS-tjenere fra DHCP"
 
-#: ../lib/network/connection/ethernet.pm:144
+#: ../lib/network/connection/ethernet.pm:146
 #, c-format
 msgid "DNS server 1"
 msgstr "DNS-tjener 1"
 
-#: ../lib/network/connection/ethernet.pm:145
+#: ../lib/network/connection/ethernet.pm:147
 #, c-format
 msgid "DNS server 2"
 msgstr "DNS-tjener 2"
 
-#: ../lib/network/connection/ethernet.pm:146
+#: ../lib/network/connection/ethernet.pm:148
 #, c-format
 msgid "Search domain"
 msgstr "Søk gjennom domene"
 
-#: ../lib/network/connection/ethernet.pm:147
+#: ../lib/network/connection/ethernet.pm:149
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 "Som standard vil søkedomenet bli satt fra  fullkvalifiserte vertsnavnet "
 "(fqdn)"
 
-#: ../lib/network/connection/ethernet.pm:150
+#: ../lib/network/connection/ethernet.pm:152
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP-tidsavbrudd (i sekunder)"
 
-#: ../lib/network/connection/ethernet.pm:151
+#: ../lib/network/connection/ethernet.pm:153
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Få YP-tjenere fra DHCP"
 
-#: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/connection/ethernet.pm:154
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Få NTPD-tjenere fra DHCP"
 
-#: ../lib/network/connection/ethernet.pm:153
+#: ../lib/network/connection/ethernet.pm:155
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP-vertsnavn"
 
-#: ../lib/network/connection/ethernet.pm:155
+#: ../lib/network/connection/ethernet.pm:157
 #, c-format
 msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Ikke fall tilbake til Zeroconf (169.254.0.0-nettverk)"
 
-#: ../lib/network/connection/ethernet.pm:166
+#: ../lib/network/connection/ethernet.pm:168
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-adresse bør være i format 1.2.3.4"
 
-#: ../lib/network/connection/ethernet.pm:171
+#: ../lib/network/connection/ethernet.pm:173
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Netmaske bør være i format 255.255.224.0"
 
-#: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/connection/ethernet.pm:178
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
 msgstr "Advarsel : IP-adresse %s er vanligvis reservert!"
 
-#: ../lib/network/connection/ethernet.pm:182
+#: ../lib/network/connection/ethernet.pm:184
 #, c-format
 msgid "%s already in use\n"
 msgstr "%s er allerede i bruk\n"
 
-#: ../lib/network/connection/ethernet.pm:207
+#: ../lib/network/connection/ethernet.pm:209
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "Tilegn vertsnavn fra DHCP-adresse"
 
-#: ../lib/network/connection/ethernet.pm:227
+#: ../lib/network/connection/ethernet.pm:229
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Nettverks Hotplugging"
 
-#: ../lib/network/connection/ethernet.pm:231
+#: ../lib/network/connection/ethernet.pm:233
 #, c-format
 msgid "Enable IPv6 to IPv4 tunnel"
 msgstr "Aktiver IPv6 til IPv4-tunnel"
 
-#: ../lib/network/connection/ethernet.pm:285
+#: ../lib/network/connection/ethernet.pm:287
 #, c-format
 msgid "Link beat detected on interface %s"
 msgstr "Tilkoblingslivstegn oppdaget på grensesnitt %s"
 
-#: ../lib/network/connection/ethernet.pm:288
+#: ../lib/network/connection/ethernet.pm:290
 #, c-format
 msgid "Requesting a network address on interface %s (%s protocol)..."
 msgstr "Forespørr en nettverksadresse på grensesnitt %s (%s-protokoll) ..."
 
-#: ../lib/network/connection/ethernet.pm:289
+#: ../lib/network/connection/ethernet.pm:291
 #, c-format
 msgid "Got a network address on interface %s (%s protocol)"
 msgstr "Mottok en nettverksadresse på grensesnitt %s (%s-protokoll)"
 
-#: ../lib/network/connection/ethernet.pm:290
+#: ../lib/network/connection/ethernet.pm:292
 #, c-format
 msgid "Failed to get a network address on interface %s (%s protocol)"
 msgstr ""
@@ -4048,30 +3954,22 @@ msgstr ""
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../lib/network/connection/isdn.pm:153 ../lib/network/netconnect.pm:202
-#: ../lib/network/netconnect.pm:205 ../lib/network/netconnect.pm:223
-#: ../lib/network/netconnect.pm:476 ../lib/network/netconnect.pm:572
-#: ../lib/network/netconnect.pm:575
-#, c-format
-msgid "Unlisted - edit manually"
-msgstr "Ulistet - endre manuelt"
-
-#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:408
+#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:405
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:408
+#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:405
 #, c-format
 msgid "I do not know"
 msgstr "Jeg vet ikke"
 
-#: ../lib/network/connection/isdn.pm:197 ../lib/network/netconnect.pm:408
+#: ../lib/network/connection/isdn.pm:197 ../lib/network/netconnect.pm:405
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:408
+#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:405
 #, c-format
 msgid "USB"
 msgstr "USB"
@@ -4090,35 +3988,54 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Analog telefonmodem (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:74
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:77
 #, c-format
 msgid "Script-based"
 msgstr "Scriptbasert"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:75
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:78
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:76
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:79
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminalbasert"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:77
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:80
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:81
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: ../lib/network/connection/providers/cellular.pm:13
+#: ../lib/network/connection/providers/cellular.pm:16
 #: ../lib/network/connection/providers/cellular.pm:20
-#: ../lib/network/connection/providers/cellular.pm:25
-#: ../lib/network/connection/providers/cellular.pm:30
+#: ../lib/network/connection/providers/cellular.pm:28
+#: ../lib/network/connection/providers/cellular.pm:34
+#: ../lib/network/connection/providers/cellular.pm:39
+#: ../lib/network/connection/providers/cellular.pm:45
+#: ../lib/network/connection/providers/cellular.pm:49
+#: ../lib/network/connection/providers/cellular.pm:53
+#: ../lib/network/connection/providers/cellular.pm:59
+#: ../lib/network/connection/providers/cellular.pm:63
+#: ../lib/network/connection/providers/xdsl.pm:483
+#, c-format
+msgid "Finland"
+msgstr "Finland"
+
+#: ../lib/network/connection/providers/cellular.pm:66
+#: ../lib/network/connection/providers/cellular.pm:69
+#: ../lib/network/connection/providers/cellular.pm:74
+#: ../lib/network/connection/providers/cellular.pm:79
+#: ../lib/network/connection/providers/cellular.pm:86
+#: ../lib/network/connection/providers/cellular.pm:91
+#: ../lib/network/connection/providers/cellular.pm:96
+#: ../lib/network/connection/providers/cellular.pm:99
 #: ../lib/network/connection/providers/xdsl.pm:492
 #: ../lib/network/connection/providers/xdsl.pm:504
 #: ../lib/network/connection/providers/xdsl.pm:516
@@ -4135,6 +4052,19 @@ msgstr "PAP/CHAP"
 msgid "France"
 msgstr "Frankrike"
 
+#: ../lib/network/connection/providers/cellular.pm:102
+#: ../lib/network/connection/providers/cellular.pm:107
+#: ../lib/network/connection/providers/cellular.pm:112
+#: ../lib/network/connection/providers/cellular.pm:117
+#: ../lib/network/connection/providers/xdsl.pm:814
+#: ../lib/network/connection/providers/xdsl.pm:825
+#: ../lib/network/connection/providers/xdsl.pm:835
+#: ../lib/network/connection/providers/xdsl.pm:846
+#: ../lib/network/netconnect.pm:35
+#, c-format
+msgid "Italy"
+msgstr "Italia"
+
 #: ../lib/network/connection/providers/xdsl.pm:47
 #: ../lib/network/connection/providers/xdsl.pm:57
 #, c-format
@@ -4154,6 +4084,16 @@ msgstr "Argentina"
 msgid "Austria"
 msgstr "Østerrike"
 
+#: ../lib/network/connection/providers/xdsl.pm:87
+#: ../lib/network/connection/providers/xdsl.pm:446
+#: ../lib/network/connection/providers/xdsl.pm:650
+#: ../lib/network/connection/providers/xdsl.pm:668
+#: ../lib/network/connection/providers/xdsl.pm:787
+#: ../lib/network/connection/providers/xdsl.pm:1258
+#, fuzzy, c-format
+msgid "Any"
+msgstr "vilkårlig"
+
 #: ../lib/network/connection/providers/xdsl.pm:114
 #: ../lib/network/connection/providers/xdsl.pm:124
 #: ../lib/network/connection/providers/xdsl.pm:134
@@ -4227,11 +4167,6 @@ msgstr "Danmark"
 msgid "Egypt"
 msgstr "Egypt"
 
-#: ../lib/network/connection/providers/xdsl.pm:483
-#, c-format
-msgid "Finland"
-msgstr "Finland"
-
 #: ../lib/network/connection/providers/xdsl.pm:621
 #: ../lib/network/connection/providers/xdsl.pm:630
 #: ../lib/network/connection/providers/xdsl.pm:640
@@ -4280,15 +4215,6 @@ msgstr "India"
 msgid "Iceland"
 msgstr "Island"
 
-#: ../lib/network/connection/providers/xdsl.pm:814
-#: ../lib/network/connection/providers/xdsl.pm:825
-#: ../lib/network/connection/providers/xdsl.pm:835
-#: ../lib/network/connection/providers/xdsl.pm:846
-#: ../lib/network/netconnect.pm:35
-#, c-format
-msgid "Italy"
-msgstr "Italia"
-
 #: ../lib/network/connection/providers/xdsl.pm:858
 #, c-format
 msgid "Sri Lanka"
@@ -4425,42 +4351,42 @@ msgstr "Forente Arabiske Emirater"
 msgid "United Kingdom"
 msgstr "United Kingdom"
 
-#: ../lib/network/connection/wireless.pm:8
+#: ../lib/network/connection/wireless.pm:11
 #, c-format
 msgid "Wireless"
 msgstr "Trådløs"
 
-#: ../lib/network/connection/wireless.pm:24
+#: ../lib/network/connection/wireless.pm:27
 #, c-format
 msgid "Use a Windows driver (with ndiswrapper)"
 msgstr "Bruker en Windows-driver (med ndiswrapper)"
 
-#: ../lib/network/connection/wireless.pm:43
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
 msgid "Open WEP"
 msgstr "Åpent WEP"
 
-#: ../lib/network/connection/wireless.pm:44
+#: ../lib/network/connection/wireless.pm:45
 #, c-format
 msgid "Restricted WEP"
 msgstr "Lukket WEP"
 
-#: ../lib/network/connection/wireless.pm:45
+#: ../lib/network/connection/wireless.pm:46
 #, fuzzy, c-format
 msgid "WPA/WPA2 Pre-Shared Key"
 msgstr "WPA forhåndsdelt nøkkel"
 
-#: ../lib/network/connection/wireless.pm:46
+#: ../lib/network/connection/wireless.pm:47
 #, c-format
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:234
+#: ../lib/network/connection/wireless.pm:235
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:301
+#: ../lib/network/connection/wireless.pm:302
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4469,73 +4395,73 @@ msgstr ""
 "Ditt trådløse nettverskort er deaktivert, vennligst aktiver den trådløse "
 "bryteren (RF kill switch) først."
 
-#: ../lib/network/connection/wireless.pm:366
+#: ../lib/network/connection/wireless.pm:381
 #, c-format
 msgid "Wireless settings"
 msgstr "Trådløst oppsett"
 
-#: ../lib/network/connection/wireless.pm:371
-#: ../lib/network/connection_manager.pm:243
+#: ../lib/network/connection/wireless.pm:386
+#: ../lib/network/connection_manager.pm:252
 #, c-format
 msgid "Operating Mode"
 msgstr "Operasjonsmodus"
 
-#: ../lib/network/connection/wireless.pm:372
+#: ../lib/network/connection/wireless.pm:387
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:372
+#: ../lib/network/connection/wireless.pm:387
 #, c-format
 msgid "Managed"
 msgstr "Håndtert"
 
-#: ../lib/network/connection/wireless.pm:372
+#: ../lib/network/connection/wireless.pm:387
 #, c-format
 msgid "Master"
 msgstr "Mester"
 
-#: ../lib/network/connection/wireless.pm:372
+#: ../lib/network/connection/wireless.pm:387
 #, c-format
 msgid "Repeater"
 msgstr "Repeterer"
 
-#: ../lib/network/connection/wireless.pm:372
+#: ../lib/network/connection/wireless.pm:387
 #, c-format
 msgid "Secondary"
 msgstr "Sekundær"
 
-#: ../lib/network/connection/wireless.pm:372
+#: ../lib/network/connection/wireless.pm:387
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../lib/network/connection/wireless.pm:375
+#: ../lib/network/connection/wireless.pm:390
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nettverksnavn (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:377
+#: ../lib/network/connection/wireless.pm:392
 #, c-format
 msgid "Encryption mode"
 msgstr "Krypteringsmodus"
 
-#: ../lib/network/connection/wireless.pm:379
+#: ../lib/network/connection/wireless.pm:394
 #, c-format
 msgid "Encryption key"
 msgstr "Krypteringsnøkkel"
 
-#: ../lib/network/connection/wireless.pm:381
+#: ../lib/network/connection/wireless.pm:396
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:388
+#: ../lib/network/connection/wireless.pm:403
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Innloggingskonto (brukernavn)"
 
-#: ../lib/network/connection/wireless.pm:390
+#: ../lib/network/connection/wireless.pm:405
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4543,12 +4469,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:393
+#: ../lib/network/connection/wireless.pm:408
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Passord"
 
-#: ../lib/network/connection/wireless.pm:395
+#: ../lib/network/connection/wireless.pm:410
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4567,12 +4493,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:409
+#: ../lib/network/connection/wireless.pm:424
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "Navn på sertifikatet"
 
-#: ../lib/network/connection/wireless.pm:411
+#: ../lib/network/connection/wireless.pm:426
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4581,32 +4507,32 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:415
+#: ../lib/network/connection/wireless.pm:430
 #, c-format
 msgid "Network ID"
 msgstr "NettverksID"
 
-#: ../lib/network/connection/wireless.pm:416
+#: ../lib/network/connection/wireless.pm:431
 #, c-format
 msgid "Operating frequency"
 msgstr "Operasjonsfrekvens"
 
-#: ../lib/network/connection/wireless.pm:417
+#: ../lib/network/connection/wireless.pm:432
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Følsomhetsgrense"
 
-#: ../lib/network/connection/wireless.pm:418
+#: ../lib/network/connection/wireless.pm:433
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (i b/s)"
 
-#: ../lib/network/connection/wireless.pm:419
+#: ../lib/network/connection/wireless.pm:434
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:420
+#: ../lib/network/connection/wireless.pm:435
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4630,17 +4556,17 @@ msgstr ""
 "parameteren til auto, fixed\n"
 "eller off."
 
-#: ../lib/network/connection/wireless.pm:427
+#: ../lib/network/connection/wireless.pm:442
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentering"
 
-#: ../lib/network/connection/wireless.pm:428
+#: ../lib/network/connection/wireless.pm:443
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "iwconfig-kommando ekstra argumenter"
 
-#: ../lib/network/connection/wireless.pm:429
+#: ../lib/network/connection/wireless.pm:444
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4656,12 +4582,12 @@ msgstr ""
 "Se iwconfig(8) man-siden for ytterligere 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:436
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "iwspy-kommando ekstra argumenter"
 
-#: ../lib/network/connection/wireless.pm:437
+#: ../lib/network/connection/wireless.pm:452
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4682,12 +4608,12 @@ msgstr ""
 "\n"
 "Se iwpspy(8) man-side for ytterligere informasjon."
 
-#: ../lib/network/connection/wireless.pm:445
+#: ../lib/network/connection/wireless.pm:460
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv-kommando ekstra argumenter"
 
-#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:462
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4717,107 +4643,107 @@ msgstr ""
 "\n"
 "Se iwpriv(8) man-side for ytterligere informasjon."
 
-#: ../lib/network/connection/wireless.pm:458
+#: ../lib/network/connection/wireless.pm:473
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protokoll"
 
-#: ../lib/network/connection/wireless.pm:459
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
+#: ../lib/network/connection/wireless.pm:479
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Automatisk oppdagelse"
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:474
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:474
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:461
+#: ../lib/network/connection/wireless.pm:476
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
 "a fallback to WPA version 1"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:463
+#: ../lib/network/connection/wireless.pm:478
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Modus"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:466
+#: ../lib/network/connection/wireless.pm:481
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:483
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4825,12 +4751,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:490
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:492
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4839,12 +4765,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:481
+#: ../lib/network/connection/wireless.pm:496
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "Sertifikat"
 
-#: ../lib/network/connection/wireless.pm:483
+#: ../lib/network/connection/wireless.pm:498
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4854,12 +4780,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:488
+#: ../lib/network/connection/wireless.pm:503
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:490
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4869,12 +4795,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:495
+#: ../lib/network/connection/wireless.pm:510
 #, c-format
 msgid "EAP extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:497
+#: ../lib/network/connection/wireless.pm:512
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4892,26 +4818,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:532
 #, c-format
 msgid "An encryption key is required."
 msgstr "En krypteringsnøkkel kreves"
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:539
 #, 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
+#: ../lib/network/connection/wireless.pm:545
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:537
+#: ../lib/network/connection/wireless.pm:552
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4921,7 +4847,7 @@ msgstr ""
 "frekvens),\n"
 "eller tilstrekkelig antall nuller (0). "
 
-#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/connection/wireless.pm:558
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4930,17 +4856,17 @@ msgstr ""
 "Hastighet skal ha suffix k, M eller G (for eksempel «11M»), eller "
 "tilstrekkelig antall nuller"
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Tillat gjennomstreifing av aksesspunkt"
 
-#: ../lib/network/connection/wireless.pm:665
+#: ../lib/network/connection/wireless.pm:688
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Assosiert til trådløst nettverk «%s» på grensesnitt %s"
 
-#: ../lib/network/connection/wireless.pm:666
+#: ../lib/network/connection/wireless.pm:689
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Tapte det assosierte trådløse nettverket på grensesnitt %s"
@@ -4950,7 +4876,7 @@ msgstr "Tapte det assosierte trådløse nettverket på grensesnitt %s"
 msgid "DSL"
 msgstr "DSL"
 
-#: ../lib/network/connection/xdsl.pm:76 ../lib/network/netconnect.pm:768
+#: ../lib/network/connection/xdsl.pm:76 ../lib/network/netconnect.pm:765
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Alcatel speedtouch USB-modem"
@@ -5007,76 +4933,76 @@ msgstr "PPP over Ethernet (PPPoE)"
 msgid "PPP over ATM (PPPoA)"
 msgstr "PPP over ATM (PPPoA)"
 
-#: ../lib/network/connection/xdsl.pm:231
+#: ../lib/network/connection/xdsl.pm:238
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "Virtual Path ID (VPI):"
 
-#: ../lib/network/connection/xdsl.pm:232
+#: ../lib/network/connection/xdsl.pm:239
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "Virtual Circuit ID (VCI):"
 
-#: ../lib/network/connection/xdsl.pm:332
-#: ../lib/network/connection_manager.pm:61 ../lib/network/drakvpn.pm:45
-#: ../lib/network/netconnect.pm:131 ../lib/network/thirdparty.pm:123
+#: ../lib/network/connection/xdsl.pm:339
+#: ../lib/network/connection_manager.pm:60 ../lib/network/drakvpn.pm:45
+#: ../lib/network/netconnect.pm:134 ../lib/network/thirdparty.pm:123
 #, c-format
 msgid "Could not install the packages (%s)!"
 msgstr "Kunne ikke installere pakkene (%s)!"
 
 #: ../lib/network/connection_manager.pm:73
-#: ../lib/network/connection_manager.pm:130
+#: ../lib/network/connection_manager.pm:136
 #, c-format
 msgid "Network settings"
 msgstr "Oppsett for nettverk"
 
 #: ../lib/network/connection_manager.pm:74
-#: ../lib/network/connection_manager.pm:131
+#: ../lib/network/connection_manager.pm:137
 #, c-format
 msgid "Please enter settings for network"
 msgstr "Tast inn oppsett for nettverk"
 
-#: ../lib/network/connection_manager.pm:82 ../lib/network/netconnect.pm:181
+#: ../lib/network/connection_manager.pm:82 ../lib/network/netconnect.pm:185
 #, c-format
 msgid "Configuring device..."
 msgstr "Setter opp enhet ..."
 
-#: ../lib/network/connection_manager.pm:186
+#: ../lib/network/connection_manager.pm:195
 #, c-format
 msgid "Connecting..."
 msgstr "Kobler til ..."
 
-#: ../lib/network/connection_manager.pm:203
+#: ../lib/network/connection_manager.pm:212
 #, c-format
 msgid "Disconnecting..."
 msgstr "Kobler fra ..."
 
-#: ../lib/network/connection_manager.pm:240
+#: ../lib/network/connection_manager.pm:249
 #, c-format
 msgid "SSID"
 msgstr "SSID"
 
-#: ../lib/network/connection_manager.pm:241
+#: ../lib/network/connection_manager.pm:250
 #, c-format
 msgid "Signal strength"
 msgstr "Signalstyrke"
 
-#: ../lib/network/connection_manager.pm:242
+#: ../lib/network/connection_manager.pm:251
 #, c-format
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: ../lib/network/connection_manager.pm:286 ../lib/network/netconnect.pm:214
+#: ../lib/network/connection_manager.pm:295 ../lib/network/netconnect.pm:207
 #, c-format
 msgid "Scanning for networks..."
 msgstr "Leter etter nettverk ..."
 
-#: ../lib/network/connection_manager.pm:323 ../lib/network/drakroam.pm:115
+#: ../lib/network/connection_manager.pm:332 ../lib/network/drakroam.pm:116
 #, c-format
 msgid "Disconnect"
 msgstr "Koble fra"
 
-#: ../lib/network/connection_manager.pm:323 ../lib/network/drakroam.pm:114
+#: ../lib/network/connection_manager.pm:332 ../lib/network/drakroam.pm:115
 #, c-format
 msgid "Connect"
 msgstr "Koble til"
@@ -5248,27 +5174,27 @@ msgstr "Bruk interaktiv brannmur"
 msgid "No device found"
 msgstr "Ingen enhet funnet"
 
-#: ../lib/network/drakroam.pm:60
+#: ../lib/network/drakroam.pm:61
 #, c-format
 msgid "Hostname changed to \"%s\""
 msgstr "Vertsnavn endret til «%s»"
 
-#: ../lib/network/drakroam.pm:109
+#: ../lib/network/drakroam.pm:110
 #, c-format
 msgid "Device: "
 msgstr "Enhet: "
 
-#: ../lib/network/drakroam.pm:113 ../lib/network/netcenter.pm:86
+#: ../lib/network/drakroam.pm:114 ../lib/network/netcenter.pm:86
 #, c-format
 msgid "Configure"
 msgstr "Sett opp"
 
-#: ../lib/network/drakroam.pm:116 ../lib/network/netcenter.pm:91
+#: ../lib/network/drakroam.pm:117 ../lib/network/netcenter.pm:91
 #, c-format
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: ../lib/network/drakroam.pm:127 ../lib/network/netconnect.pm:774
+#: ../lib/network/drakroam.pm:128 ../lib/network/netconnect.pm:771
 #, c-format
 msgid "Wireless connection"
 msgstr "Trådløs tilkobling"
@@ -5324,7 +5250,7 @@ msgstr "Tast inn nøklene som trengs"
 msgid "Please enter the settings of your VPN connection"
 msgstr "Skriv inn oppsettet til din VPN-tilkobling"
 
-#: ../lib/network/drakvpn.pm:94 ../lib/network/netconnect.pm:304
+#: ../lib/network/drakvpn.pm:94 ../lib/network/netconnect.pm:297
 #, c-format
 msgid "Do you want to start the connection now?"
 msgstr "Ønsker du å starte tilkoblingen nå?"
@@ -5416,8 +5342,8 @@ msgid "port %d"
 msgstr "port %d"
 
 #: ../lib/network/modem.pm:42 ../lib/network/modem.pm:43
-#: ../lib/network/modem.pm:44 ../lib/network/netconnect.pm:616
-#: ../lib/network/netconnect.pm:633 ../lib/network/netconnect.pm:649
+#: ../lib/network/modem.pm:44 ../lib/network/netconnect.pm:613
+#: ../lib/network/netconnect.pm:630 ../lib/network/netconnect.pm:646
 #, c-format
 msgid "Manual"
 msgstr "Manuell"
@@ -5425,10 +5351,10 @@ msgstr "Manuell"
 #: ../lib/network/modem.pm:42 ../lib/network/modem.pm:43
 #: ../lib/network/modem.pm:44 ../lib/network/modem.pm:63
 #: ../lib/network/modem.pm:76 ../lib/network/modem.pm:81
-#: ../lib/network/modem.pm:110 ../lib/network/netconnect.pm:611
-#: ../lib/network/netconnect.pm:616 ../lib/network/netconnect.pm:628
-#: ../lib/network/netconnect.pm:633 ../lib/network/netconnect.pm:649
-#: ../lib/network/netconnect.pm:651
+#: ../lib/network/modem.pm:110 ../lib/network/netconnect.pm:608
+#: ../lib/network/netconnect.pm:613 ../lib/network/netconnect.pm:625
+#: ../lib/network/netconnect.pm:630 ../lib/network/netconnect.pm:646
+#: ../lib/network/netconnect.pm:648
 #, c-format
 msgid "Automatic"
 msgstr "Automatisk"
@@ -5492,7 +5418,7 @@ msgstr "Velg en enhet:"
 msgid "Network Center"
 msgstr "Nettverkssenter"
 
-#: ../lib/network/netcenter.pm:76 ../lib/network/netconnect.pm:217
+#: ../lib/network/netcenter.pm:76 ../lib/network/netconnect.pm:210
 #, c-format
 msgid "Please select your network:"
 msgstr "Velg ditt nettverk:"
@@ -5509,8 +5435,8 @@ msgstr "Overvåk"
 msgid "United States"
 msgstr "USA"
 
-#: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:506
-#: ../lib/network/netconnect.pm:520
+#: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:503
+#: ../lib/network/netconnect.pm:517
 #, c-format
 msgid "Manual choice"
 msgstr "Manuelt valg"
@@ -5520,17 +5446,17 @@ msgstr "Manuelt valg"
 msgid "Internal ISDN card"
 msgstr "Internt ISDN-kort"
 
-#: ../lib/network/netconnect.pm:65
+#: ../lib/network/netconnect.pm:68
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "Protokoll for resten av verden"
 
-#: ../lib/network/netconnect.pm:67
+#: ../lib/network/netconnect.pm:70
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Europaprotokollen (EDSS1)"
 
-#: ../lib/network/netconnect.pm:68
+#: ../lib/network/netconnect.pm:71
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -5539,38 +5465,38 @@ msgstr ""
 "Resten av verden\n"
 "Ingen D-kanal (leid linje)"
 
-#: ../lib/network/netconnect.pm:118
+#: ../lib/network/netconnect.pm:121
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "Nettverk- og internettoppsett"
 
-#: ../lib/network/netconnect.pm:123
+#: ../lib/network/netconnect.pm:126
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Velg tilkoblingen du ønsker å sette opp"
 
-#: ../lib/network/netconnect.pm:145 ../lib/network/netconnect.pm:361
-#: ../lib/network/netconnect.pm:801
+#: ../lib/network/netconnect.pm:148 ../lib/network/netconnect.pm:358
+#: ../lib/network/netconnect.pm:798
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "Velg nettverksgrensesnittet som skal settes opp:"
 
-#: ../lib/network/netconnect.pm:164
+#: ../lib/network/netconnect.pm:167
 #, c-format
 msgid "No device can be found for this connection type."
 msgstr "Ingen enhet ser ut til å kunne bli funnet for denne tilkoblingstypen."
 
-#: ../lib/network/netconnect.pm:173
+#: ../lib/network/netconnect.pm:176
 #, c-format
 msgid "Hardware Configuration"
 msgstr "Maskinvareoppsett"
 
-#: ../lib/network/netconnect.pm:199
+#: ../lib/network/netconnect.pm:200
 #, c-format
 msgid "Please select your provider:"
 msgstr "Velg din leverandør:"
 
-#: ../lib/network/netconnect.pm:254
+#: ../lib/network/netconnect.pm:247
 #, c-format
 msgid ""
 "Please select your connection protocol.\n"
@@ -5579,109 +5505,114 @@ msgstr ""
 "Velg din tilkoblingsprotokoll.\n"
 "Hvis du ikke vet hva den er, velg den forhåndsvalgte protokollen."
 
-#: ../lib/network/netconnect.pm:298 ../lib/network/netconnect.pm:668
+#: ../lib/network/netconnect.pm:291 ../lib/network/netconnect.pm:665
 #, c-format
 msgid "Connection control"
 msgstr "Tilkoblingskontroll"
 
-#: ../lib/network/netconnect.pm:328
+#: ../lib/network/netconnect.pm:304 ../lib/network/netconnect.pm:714
+#, c-format
+msgid "Testing your connection..."
+msgstr "Tester tilkoblingen din ..."
+
+#: ../lib/network/netconnect.pm:325
 #, c-format
 msgid "Connection Configuration"
 msgstr "Tilkoblingsoppsett"
 
-#: ../lib/network/netconnect.pm:328
+#: ../lib/network/netconnect.pm:325
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "Fyll eller merk feltet nedenfor"
 
-#: ../lib/network/netconnect.pm:331
+#: ../lib/network/netconnect.pm:328
 #, c-format
 msgid "Your personal phone number"
 msgstr "Ditt telefonnummer"
 
-#: ../lib/network/netconnect.pm:332
+#: ../lib/network/netconnect.pm:329
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "Navn på tilbyder (f.eks. tilbyder.no)"
 
-#: ../lib/network/netconnect.pm:333
+#: ../lib/network/netconnect.pm:330
 #, c-format
 msgid "Provider phone number"
 msgstr "Telefonnummer tilbyder"
 
-#: ../lib/network/netconnect.pm:334
+#: ../lib/network/netconnect.pm:331
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "Tilbyder DNS 1 (valgfri)"
 
-#: ../lib/network/netconnect.pm:335
+#: ../lib/network/netconnect.pm:332
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "Tilbyder DNS 2 (valgfri)"
 
-#: ../lib/network/netconnect.pm:336
+#: ../lib/network/netconnect.pm:333
 #, c-format
 msgid "Dialing mode"
 msgstr "Oppringningsmodus"
 
-#: ../lib/network/netconnect.pm:337
+#: ../lib/network/netconnect.pm:334
 #, c-format
 msgid "Connection speed"
 msgstr "Oppkoblingshastighet"
 
-#: ../lib/network/netconnect.pm:338
+#: ../lib/network/netconnect.pm:335
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Oppkoblingens tidsavbrudd (i sekunder)"
 
-#: ../lib/network/netconnect.pm:341
+#: ../lib/network/netconnect.pm:338
 #, c-format
 msgid "Card IRQ"
 msgstr "Kort IRQ"
 
-#: ../lib/network/netconnect.pm:342
+#: ../lib/network/netconnect.pm:339
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Kort mem (DMA)"
 
-#: ../lib/network/netconnect.pm:343
+#: ../lib/network/netconnect.pm:340
 #, c-format
 msgid "Card IO"
 msgstr "Kort IO"
 
-#: ../lib/network/netconnect.pm:344
+#: ../lib/network/netconnect.pm:341
 #, c-format
 msgid "Card IO_0"
 msgstr "Kort IO_0"
 
-#: ../lib/network/netconnect.pm:345
+#: ../lib/network/netconnect.pm:342
 #, c-format
 msgid "Card IO_1"
 msgstr "Kort IO_1"
 
-#: ../lib/network/netconnect.pm:364 ../lib/network/netconnect.pm:369
+#: ../lib/network/netconnect.pm:361 ../lib/network/netconnect.pm:366
 #, c-format
 msgid "External ISDN modem"
 msgstr "Eksternt ISDN-modem"
 
-#: ../lib/network/netconnect.pm:397
+#: ../lib/network/netconnect.pm:394
 #, c-format
 msgid "Select a device!"
 msgstr "Velg en enhet!"
 
-#: ../lib/network/netconnect.pm:406 ../lib/network/netconnect.pm:416
-#: ../lib/network/netconnect.pm:426 ../lib/network/netconnect.pm:459
-#: ../lib/network/netconnect.pm:473
+#: ../lib/network/netconnect.pm:403 ../lib/network/netconnect.pm:413
+#: ../lib/network/netconnect.pm:423 ../lib/network/netconnect.pm:456
+#: ../lib/network/netconnect.pm:470
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDN-oppsett"
 
-#: ../lib/network/netconnect.pm:407
+#: ../lib/network/netconnect.pm:404
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "Hva slags kort har du?"
 
-#: ../lib/network/netconnect.pm:417
+#: ../lib/network/netconnect.pm:414
 #, c-format
 msgid ""
 "\n"
@@ -5695,22 +5626,22 @@ msgstr ""
 "\n"
 "Hvis du har et PCMCIA-kort må du vite irq og io for kortet.\n"
 
-#: ../lib/network/netconnect.pm:421
+#: ../lib/network/netconnect.pm:418
 #, c-format
 msgid "Continue"
 msgstr "Fortsett"
 
-#: ../lib/network/netconnect.pm:421
+#: ../lib/network/netconnect.pm:418
 #, c-format
 msgid "Abort"
 msgstr "Avbryt"
 
-#: ../lib/network/netconnect.pm:427
+#: ../lib/network/netconnect.pm:424
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "Hvilket av de følgende er ditt ISDN-kort?"
 
-#: ../lib/network/netconnect.pm:445
+#: ../lib/network/netconnect.pm:442
 #, c-format
 msgid ""
 "A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -5721,12 +5652,12 @@ msgstr ""
 "tilby flere muligheter enn den frie driveren (som å sende fakser). Hvilken "
 "driver vil du bruke?"
 
-#: ../lib/network/netconnect.pm:459
+#: ../lib/network/netconnect.pm:456
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "Hvilken protokoll ønsker du å bruke?"
 
-#: ../lib/network/netconnect.pm:473
+#: ../lib/network/netconnect.pm:470
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -5735,12 +5666,12 @@ msgstr ""
 "Velg din tilbyder.\n"
 "Hvis denne ikke er i listen, velg Ulistet"
 
-#: ../lib/network/netconnect.pm:475 ../lib/network/netconnect.pm:571
+#: ../lib/network/netconnect.pm:472 ../lib/network/netconnect.pm:568
 #, c-format
 msgid "Provider:"
 msgstr "Tilbyder:"
 
-#: ../lib/network/netconnect.pm:484
+#: ../lib/network/netconnect.pm:481
 #, c-format
 msgid ""
 "Your modem is not supported by the system.\n"
@@ -5749,137 +5680,132 @@ msgstr ""
 "Ditt modem er ikke støttet av systemet.\n"
 "Ta en titt på http://www.linmodems.org."
 
-#: ../lib/network/netconnect.pm:503
+#: ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "Velg modem som skal settes opp:"
 
-#: ../lib/network/netconnect.pm:505
+#: ../lib/network/netconnect.pm:502
 #, c-format
 msgid "Modem"
 msgstr "Modem"
 
-#: ../lib/network/netconnect.pm:540
+#: ../lib/network/netconnect.pm:537
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Velg hvilken serieport modemet ditt koblet til."
 
-#: ../lib/network/netconnect.pm:569
+#: ../lib/network/netconnect.pm:566
 #, c-format
 msgid "Select your provider:"
 msgstr "Velg din tilbyder:"
 
-#: ../lib/network/netconnect.pm:593
+#: ../lib/network/netconnect.pm:590
 #, c-format
 msgid "Dialup: account options"
 msgstr "Oppringt tilkobling: kontoinstillinger"
 
-#: ../lib/network/netconnect.pm:596
+#: ../lib/network/netconnect.pm:593
 #, c-format
 msgid "Connection name"
 msgstr "Tilkoblingsnavn"
 
-#: ../lib/network/netconnect.pm:597
+#: ../lib/network/netconnect.pm:594
 #, c-format
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: ../lib/network/netconnect.pm:598
+#: ../lib/network/netconnect.pm:595
 #, c-format
 msgid "Login ID"
 msgstr "InnlogingsID"
 
-#: ../lib/network/netconnect.pm:613 ../lib/network/netconnect.pm:646
+#: ../lib/network/netconnect.pm:610 ../lib/network/netconnect.pm:643
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "Oppringt tilkobling: IP-parametre"
 
-#: ../lib/network/netconnect.pm:616
+#: ../lib/network/netconnect.pm:613
 #, c-format
 msgid "IP parameters"
 msgstr "IP-parametre"
 
-#: ../lib/network/netconnect.pm:618
+#: ../lib/network/netconnect.pm:615
 #, c-format
 msgid "Subnet mask"
 msgstr "Subnettmaske"
 
-#: ../lib/network/netconnect.pm:630
+#: ../lib/network/netconnect.pm:627
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "Oppringt tilkobling: DNS-parametre"
 
-#: ../lib/network/netconnect.pm:633
+#: ../lib/network/netconnect.pm:630
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: ../lib/network/netconnect.pm:634
+#: ../lib/network/netconnect.pm:631
 #, c-format
 msgid "Domain name"
 msgstr "Domenenavn"
 
-#: ../lib/network/netconnect.pm:635
+#: ../lib/network/netconnect.pm:632
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "Første DNS-tjener (valgfri)"
 
-#: ../lib/network/netconnect.pm:636
+#: ../lib/network/netconnect.pm:633
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "Andre DNS-tjener (valgfri)"
 
-#: ../lib/network/netconnect.pm:637
+#: ../lib/network/netconnect.pm:634
 #, c-format
 msgid "Set hostname from IP"
 msgstr "Sett vertsnavn etter IP"
 
-#: ../lib/network/netconnect.pm:650
+#: ../lib/network/netconnect.pm:647
 #, c-format
 msgid "Gateway IP address"
 msgstr "Gateway IP-adresse"
 
-#: ../lib/network/netconnect.pm:683
+#: ../lib/network/netconnect.pm:680
 #, c-format
 msgid "Automatically at boot"
 msgstr "Automatisk ved oppstart"
 
-#: ../lib/network/netconnect.pm:685
+#: ../lib/network/netconnect.pm:682
 #, c-format
 msgid "By using Net Applet in the system tray"
 msgstr "Ved å bruke Net-miniprogrammet i systemkurven"
 
-#: ../lib/network/netconnect.pm:687
+#: ../lib/network/netconnect.pm:684
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
 msgstr "Manuelt (grensesnittet vil fremdeles bli aktivert ved oppstart)"
 
-#: ../lib/network/netconnect.pm:696
+#: ../lib/network/netconnect.pm:693
 #, c-format
 msgid "How do you want to dial this connection?"
 msgstr "Hvordan vil du ringe opp denne tilkoblingen?"
 
-#: ../lib/network/netconnect.pm:709
+#: ../lib/network/netconnect.pm:706
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "Vil du prøve å koble opp mot Internett nå?"
 
-#: ../lib/network/netconnect.pm:717
-#, c-format
-msgid "Testing your connection..."
-msgstr "Tester tilkoblingen din ..."
-
-#: ../lib/network/netconnect.pm:736
+#: ../lib/network/netconnect.pm:733
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "Systemet er nå koblet opp mot Internett."
 
-#: ../lib/network/netconnect.pm:737
+#: ../lib/network/netconnect.pm:734
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "Av sikkerhetsgrunner vil den nå bli koblet fra."
 
-#: ../lib/network/netconnect.pm:738
+#: ../lib/network/netconnect.pm:735
 #, c-format
 msgid ""
 "The system does not seem to be connected to the Internet.\n"
@@ -5888,7 +5814,7 @@ msgstr ""
 "Det ser ikke ut til at systemet er koblet til Internett.\n"
 "Prøv å sette opp tilkoblingen din på nytt."
 
-#: ../lib/network/netconnect.pm:753
+#: ../lib/network/netconnect.pm:750
 #, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
@@ -5897,7 +5823,7 @@ msgstr ""
 "Gratulerer, internett- og nettverksoppsettet er fullført.\n"
 "\n"
 
-#: ../lib/network/netconnect.pm:756
+#: ../lib/network/netconnect.pm:753
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -5906,7 +5832,7 @@ msgstr ""
 "Etter at det er ferdig, anbefaler vi at du restarter X\n"
 "slik at du unngår problemer med at vertsnavnet forandres."
 
-#: ../lib/network/netconnect.pm:757
+#: ../lib/network/netconnect.pm:754
 #, c-format
 msgid ""
 "Problems occurred during configuration.\n"
@@ -5917,78 +5843,78 @@ msgstr ""
 "Test tilkoblingen din via net_monitor eller mcc. Hvis tilkoblingen din ikke "
 "virker, ønsker du kanskje å kjøre oppsettet på nytt"
 
-#: ../lib/network/netconnect.pm:769
+#: ../lib/network/netconnect.pm:766
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB-modem"
 
-#: ../lib/network/netconnect.pm:770 ../lib/network/netconnect.pm:771
+#: ../lib/network/netconnect.pm:767 ../lib/network/netconnect.pm:768
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan PCI-modem"
 
-#: ../lib/network/netconnect.pm:772
+#: ../lib/network/netconnect.pm:769
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus-modem"
 
-#: ../lib/network/netconnect.pm:773
+#: ../lib/network/netconnect.pm:770
 #, c-format
 msgid "LAN connection"
 msgstr "Lokal nettverkstilkobling"
 
-#: ../lib/network/netconnect.pm:775
+#: ../lib/network/netconnect.pm:772
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL-tilkobling"
 
-#: ../lib/network/netconnect.pm:776
+#: ../lib/network/netconnect.pm:773
 #, c-format
 msgid "Cable connection"
 msgstr "Kabeltilkobling"
 
-#: ../lib/network/netconnect.pm:777
+#: ../lib/network/netconnect.pm:774
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN-tilkobling"
 
-#: ../lib/network/netconnect.pm:778
+#: ../lib/network/netconnect.pm:775
 #, c-format
 msgid "Modem connection"
 msgstr "Modemtilkobling"
 
-#: ../lib/network/netconnect.pm:779
+#: ../lib/network/netconnect.pm:776
 #, c-format
 msgid "DVB connection"
 msgstr "DVB-tilkobling"
 
-#: ../lib/network/netconnect.pm:781
+#: ../lib/network/netconnect.pm:778
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(oppdaget på port %s)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: ../lib/network/netconnect.pm:783
+#: ../lib/network/netconnect.pm:780
 #, c-format
 msgid "(detected %s)"
 msgstr "(oppdaget %s)"
 
-#: ../lib/network/netconnect.pm:783
+#: ../lib/network/netconnect.pm:780
 #, c-format
 msgid "(detected)"
 msgstr "(oppdaget)"
 
-#: ../lib/network/netconnect.pm:784
+#: ../lib/network/netconnect.pm:781
 #, c-format
 msgid "Network Configuration"
 msgstr "Nettverksoppsett"
 
-#: ../lib/network/netconnect.pm:785
+#: ../lib/network/netconnect.pm:782
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconf vertsnavnoppslag"
 
-#: ../lib/network/netconnect.pm:786
+#: ../lib/network/netconnect.pm:783
 #, c-format
 msgid ""
 "If desired, enter a Zeroconf hostname.\n"
@@ -6001,17 +5927,17 @@ msgstr ""
 "sine delte ressurser som ikke er behandlet av nettverket.\n"
 "Det trengs ikke på de fleste nettverk."
 
-#: ../lib/network/netconnect.pm:790
+#: ../lib/network/netconnect.pm:787
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconf vertsnavn"
 
-#: ../lib/network/netconnect.pm:791
+#: ../lib/network/netconnect.pm:788
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconf-vertsnavn kan ikke innholde «.»"
 
-#: ../lib/network/netconnect.pm:792
+#: ../lib/network/netconnect.pm:789
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -6024,12 +5950,12 @@ msgstr ""
 "Trykk OK for å beholde ditt eksisterende oppsett, eller avbryt for å sette "
 "opp dit internett- og nettverksoppsett.\n"
 
-#: ../lib/network/netconnect.pm:795
+#: ../lib/network/netconnect.pm:792
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "Nettverket trengs å startes på nytt. Vil du starte det på nytt?"
 
-#: ../lib/network/netconnect.pm:796
+#: ../lib/network/netconnect.pm:793
 #, c-format
 msgid ""
 "A problem occurred while restarting the network: \n"
@@ -6040,7 +5966,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/network/netconnect.pm:797
+#: ../lib/network/netconnect.pm:794
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -6053,12 +5979,12 @@ msgstr ""
 "\n"
 "Trykk «%s» for å fortsette."
 
-#: ../lib/network/netconnect.pm:798
+#: ../lib/network/netconnect.pm:795
 #, c-format
 msgid "Configuration is complete, do you want to apply settings?"
 msgstr "Oppsettet er ferdig, vil du gjøre det gjeldende?"
 
-#: ../lib/network/netconnect.pm:799
+#: ../lib/network/netconnect.pm:796
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -6069,17 +5995,17 @@ msgstr ""
 "Venligst velg den du ønsker å bruke.\n"
 "\n"
 
-#: ../lib/network/netconnect.pm:800
+#: ../lib/network/netconnect.pm:797
 #, c-format
 msgid "Internet connection"
 msgstr "Internettilkobling"
 
-#: ../lib/network/netconnect.pm:802
+#: ../lib/network/netconnect.pm:799
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "Setter opp nettverksenhet %s (driver %s)"
 
-#: ../lib/network/netconnect.pm:803
+#: ../lib/network/netconnect.pm:800
 #, c-format
 msgid ""
 "The following protocols can be used to configure a LAN connection. Please "
@@ -6088,7 +6014,7 @@ msgstr ""
 "De følgende protokollene kan bli brukt til å sette opp en lokal "
 "nettverkstilkobling. Velg den du vil bruke."
 
-#: ../lib/network/netconnect.pm:804
+#: ../lib/network/netconnect.pm:801
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -6101,27 +6027,27 @@ msgstr ""
 "så som «minboks.mittlab.mittfirma.no».\n"
 "Du kan også taste inn IP-adressen til gatewayen hvis du har en"
 
-#: ../lib/network/netconnect.pm:809
+#: ../lib/network/netconnect.pm:806
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr "Sist, men ikke minst tast inn din DNS-tjeners IP-adresser."
 
-#: ../lib/network/netconnect.pm:810
+#: ../lib/network/netconnect.pm:807
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS-tjeneradresse bør være i format 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:811
+#: ../lib/network/netconnect.pm:808
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "Gatewayadresse bør være i format 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:812
+#: ../lib/network/netconnect.pm:809
 #, c-format
 msgid "Gateway device"
 msgstr "Gateway-enhet"
 
-#: ../lib/network/netconnect.pm:826
+#: ../lib/network/netconnect.pm:823
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -6130,12 +6056,12 @@ msgstr ""
 "En uventet feil oppstod:\n"
 "%s"
 
-#: ../lib/network/network.pm:429
+#: ../lib/network/network.pm:442
 #, c-format
 msgid "Proxies configuration"
 msgstr "Oppsett av proxy"
 
-#: ../lib/network/network.pm:430
+#: ../lib/network/network.pm:443
 #, c-format
 msgid ""
 "Here you can set up your proxies configuration (eg: http://"
@@ -6143,42 +6069,42 @@ msgid ""
 msgstr ""
 "Her kan du sette opp ditt proxy-oppsett (feks: http://min_mellomtjener:8080)"
 
-#: ../lib/network/network.pm:431
+#: ../lib/network/network.pm:444
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP-proxy"
 
-#: ../lib/network/network.pm:432
+#: ../lib/network/network.pm:445
 #, c-format
 msgid "Use HTTP proxy for HTTPS connections"
 msgstr "Bruk HTTP-proxy for HTTPS-tilkoblinger"
 
-#: ../lib/network/network.pm:433
+#: ../lib/network/network.pm:446
 #, c-format
 msgid "HTTPS proxy"
 msgstr "HTTPS-proxy"
 
-#: ../lib/network/network.pm:434
+#: ../lib/network/network.pm:447
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP-proxy"
 
-#: ../lib/network/network.pm:435
+#: ../lib/network/network.pm:448
 #, c-format
 msgid "No proxy for (comma separated list):"
 msgstr "Ingen proxy for (kommaseparert liste):"
 
-#: ../lib/network/network.pm:440
+#: ../lib/network/network.pm:453
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "Mellomtjeneren skal være på formen «http://» ..."
 
-#: ../lib/network/network.pm:441
+#: ../lib/network/network.pm:454
 #, c-format
 msgid "Proxy should be http://... or https://..."
 msgstr "Mellomtjeneren skal være på formen «http://» eller «https://» ..."
 
-#: ../lib/network/network.pm:442
+#: ../lib/network/network.pm:455
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URLen bør begynne med 'ftp:' eller 'http:'"
@@ -6448,15 +6374,81 @@ msgid "Username"
 msgstr "Brukernavn"
 
 #: ../lib/network/vpn/vpnc.pm:61
-#, c-format
-msgid "Use Cisco-UDP encapsulation"
-msgstr "Bruk Cisco-UDP innkapsling"
+#, fuzzy, c-format
+msgid "NAT Mode"
+msgstr "Modus"
 
 #: ../lib/network/vpn/vpnc.pm:67
 #, c-format
 msgid "Use specific UDP port"
 msgstr "Bruk spesifikk UDP-port"
 
+#~ msgid "You need to log out and back in again for changes to take effect"
+#~ msgstr ""
+#~ "Du trenger å logge ut og inn igjen for at fendringene skal tre i kraft"
+
+#, fuzzy
+#~ msgid "Process attack"
+#~ msgstr "Tjenesteangrep"
+
+#~ msgid "Interactive Firewall: intrusion detected"
+#~ msgstr "Interaktiv brannmur: innbrudd oppdaget"
+
+#~ msgid "What do you want to do with this attacker?"
+#~ msgstr "Hva ønsker du å gjøre med denne angriperen?"
+
+#~ msgid "Attack details"
+#~ msgstr "Angrepsdetaljer"
+
+#~ msgid "Attack time: %s"
+#~ msgstr "Angrepstidspunkt: %s"
+
+#~ msgid "Network interface: %s"
+#~ msgstr "Nettverksgrensesnitt: %s"
+
+#~ msgid "Attack type: %s"
+#~ msgstr "Angrepstype: %s"
+
+#~ msgid "Protocol: %s"
+#~ msgstr "Protokoll: %s"
+
+#~ msgid "Attacker IP address: %s"
+#~ msgstr "Angripers IP-adresse: %s"
+
+#~ msgid "Attacker hostname: %s"
+#~ msgstr "Angripers vertsnavn: %s"
+
+#~ msgid "Service attacked: %s"
+#~ msgstr "Tjeneste angrepet: %s"
+
+#~ msgid "Port attacked: %s"
+#~ msgstr "Port angrepet: %s"
+
+#~ msgid "Type of ICMP attack: %s"
+#~ msgstr "Type ICMP-angrep: %s"
+
+#~ msgid "Always blacklist (do not ask again)"
+#~ msgstr "Alltid svartelist (ikke spørr igjen)"
+
+#~ msgid "Ignore"
+#~ msgstr "Ignorér"
+
+#~ msgid "Interactive Firewall: new service"
+#~ msgstr "Interaktiv brannmur: ny tjeneste"
+
+#, fuzzy
+#~ msgid "Process connection"
+#~ msgstr "Trådløs tilkobling"
+
+#~ msgid "Do you want to open this service?"
+#~ msgstr "Ønsker du å sette opp denne tjenesten?"
+
+#~ msgid "Remember this answer"
+#~ msgstr "Husk dette svaret"
+
+#~ msgid "Use Cisco-UDP encapsulation"
+#~ msgstr "Bruk Cisco-UDP innkapsling"
+
 #~ msgid "Gateway:"
 #~ msgstr "Gateway:"