update from elvis, refresh-po

1 files changed, 405 insertions, 335 deletions

diff --git a/po/no.po b/po/no.po
index b37f27069..fd8a6c975 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: install 7.1\n"
-"POT-Creation-Date: 2003-07-30 18:04-0400\n"
+"POT-Creation-Date: 2003-08-11 19:06-0400\n"
 "PO-Revision-Date: 2003-02-10 17:23+0100\n"
 "Last-Translator: Trond Varslot <varslot@math.ntnu.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -14,46 +14,49 @@ msgstr ""
 msgid "Starting VNC..."
 msgstr ""
 
-#: ../anaconda:114
+#: ../anaconda:129
+#, fuzzy, c-format
+msgid "%s %s installation on host %s"
+msgstr "%s installering på %s"
+
+#: ../anaconda:131
+#, fuzzy, c-format
+msgid "%s %s installation"
+msgstr "Utfør en ny %s-installasjon"
+
+#: ../anaconda:149
 msgid "Unable to set vnc password - using no password!"
 msgstr ""
 
-#: ../anaconda:115
+#: ../anaconda:150
 #, fuzzy
 msgid "Make sure your password is at least 6 characters in length."
 msgstr "Root-passordet må være minst 6 tegn langt."
 
-#: ../anaconda:135
+#: ../anaconda:173
 msgid ""
 "\n"
 "\n"
-"WARNING!!! VNC server running with NO PASSWORD!"
-msgstr ""
-
-#: ../anaconda:136
-msgid "You can use the vncpasswd=<password> boot option"
-msgstr ""
-
-#: ../anaconda:137
-msgid ""
+"WARNING!!! VNC server running with NO PASSWORD!\n"
+"You can use the vncpassword=<password> boot option\n"
 "if you would like to secure the server.\n"
 "\n"
 msgstr ""
 
-#: ../anaconda:165
+#: ../anaconda:177
 msgid "The VNC server now running."
 msgstr ""
 
-#: ../anaconda:167
+#: ../anaconda:179
 #, c-format
 msgid "Please connect to %s to begin the install..."
 msgstr ""
 
-#: ../anaconda:169
+#: ../anaconda:181
 msgid "Please connect to begin the install..."
 msgstr ""
 
-#: ../anaconda:495 ../anaconda:633 ../gui.py:238 ../rescue.py:40
+#: ../anaconda:510 ../anaconda:648 ../gui.py:238 ../rescue.py:40
 #: ../rescue.py:223 ../rescue.py:301 ../rescue.py:329 ../rescue.py:339
 #: ../rescue.py:408 ../rescue.py:414 ../text.py:322 ../text.py:468
 #: ../textw/complete_text.py:56 ../textw/confirm_text.py:24
@@ -66,43 +69,43 @@ msgstr ""
 #: ../loader2/cdinstall.c:250 ../loader2/cdinstall.c:253
 #: ../loader2/cdinstall.c:345 ../loader2/cdinstall.c:350
 #: ../loader2/cdinstall.c:353 ../loader2/cdinstall.c:423
-#: ../loader2/driverdisk.c:244 ../loader2/driverdisk.c:260
-#: ../loader2/driverdisk.c:274 ../loader2/driverdisk.c:442
-#: ../loader2/driverdisk.c:475 ../loader2/driverselect.c:73
+#: ../loader2/driverdisk.c:247 ../loader2/driverdisk.c:263
+#: ../loader2/driverdisk.c:277 ../loader2/driverdisk.c:445
+#: ../loader2/driverdisk.c:478 ../loader2/driverselect.c:73
 #: ../loader2/driverselect.c:213 ../loader2/hdinstall.c:223
 #: ../loader2/hdinstall.c:272 ../loader2/hdinstall.c:439
 #: ../loader2/hdinstall.c:490 ../loader2/hdinstall.c:523
 #: ../loader2/hdinstall.c:573 ../loader2/kbd.c:125 ../loader2/kickstart.c:108
 #: ../loader2/kickstart.c:118 ../loader2/kickstart.c:161
 #: ../loader2/kickstart.c:261 ../loader2/lang.c:102 ../loader2/lang.c:374
-#: ../loader2/loader.c:304 ../loader2/loader.c:317 ../loader2/loader.c:328
-#: ../loader2/loader.c:645 ../loader2/loader.c:786 ../loader2/mediacheck.c:255
+#: ../loader2/loader.c:302 ../loader2/loader.c:315 ../loader2/loader.c:326
+#: ../loader2/loader.c:643 ../loader2/loader.c:802 ../loader2/mediacheck.c:255
 #: ../loader2/mediacheck.c:312 ../loader2/mediacheck.c:354
 #: ../loader2/method.c:147 ../loader2/method.c:355 ../loader2/method.c:440
-#: ../loader2/modules.c:914 ../loader2/net.c:173 ../loader2/net.c:424
+#: ../loader2/modules.c:916 ../loader2/net.c:173 ../loader2/net.c:424
 #: ../loader2/net.c:717 ../loader2/net.c:740 ../loader2/net.c:846
 #: ../loader2/nfsinstall.c:54 ../loader2/nfsinstall.c:190
 #: ../loader2/nfsinstall.c:194 ../loader2/nfsinstall.c:233
 #: ../loader2/telnetd.c:86 ../loader2/urlinstall.c:60
 #: ../loader2/urlinstall.c:112 ../loader2/urlinstall.c:125
 #: ../loader2/urlinstall.c:386 ../loader2/urlinstall.c:395
-#: ../loader2/urlinstall.c:406 ../loader2/urls.c:170 ../loader2/urls.c:180
-#: ../loader2/urls.c:188 ../loader2/urls.c:250 ../loader2/urls.c:313
-#: ../loader2/urls.c:318 ../loader2/urls.c:324 ../loader2/urls.c:438
+#: ../loader2/urlinstall.c:406 ../loader2/urls.c:171 ../loader2/urls.c:181
+#: ../loader2/urls.c:189 ../loader2/urls.c:254 ../loader2/urls.c:317
+#: ../loader2/urls.c:322 ../loader2/urls.c:328 ../loader2/urls.c:442
 msgid "OK"
 msgstr "OK"
 
-#: ../anaconda:541
+#: ../anaconda:556
 #, fuzzy
 msgid "Unknown Error"
 msgstr "Ukjent kort"
 
-#: ../anaconda:544
+#: ../anaconda:559
 #, fuzzy, c-format
 msgid "Error pulling second part of kickstart config: %s!"
 msgstr "Feil under lesing av innholdet i kickstart-fil %s: %s"
 
-#: ../anaconda:618
+#: ../anaconda:633
 msgid ""
 "You do not have enough RAM to use the graphical installer.  Starting text "
 "mode."
@@ -110,19 +113,19 @@ msgstr ""
 "Du har ikke nok RAM til å bruke grafisk installasjon på denne maskinen. "
 "Starter tekstmodus."
 
-#: ../anaconda:670
+#: ../anaconda:685
 msgid "Install class forcing text mode installation"
 msgstr ""
 
-#: ../anaconda:697
+#: ../anaconda:712
 msgid "No video hardware found, assuming headless"
 msgstr ""
 
-#: ../anaconda:708 ../anaconda:944
+#: ../anaconda:723 ../anaconda:959
 msgid "Unable to instantiate a X hardware state object."
 msgstr "Kan ikke lage et maskinvare tilstandsobjekt for X."
 
-#: ../anaconda:735
+#: ../anaconda:750
 #, c-format
 msgid ""
 "Graphical installation not available for %s installs.  Starting text mode."
@@ -130,7 +133,7 @@ msgstr ""
 "Grafisk installasjon er ikke tilgjengelig for %s-installasjoner. Starter "
 "tekstmodus."
 
-#: ../anaconda:748
+#: ../anaconda:763
 msgid ""
 "No mouse was detected.  A mouse is required for graphical installation.  "
 "Starting text mode."
@@ -138,7 +141,7 @@ msgstr ""
 "Ingen mus funnet. Grafisk installasjon krever at du har mus. Starter "
 "tekstmodus."
 
-#: ../anaconda:753
+#: ../anaconda:768
 #, c-format
 msgid "Using mouse type: %s"
 msgstr "Bruker mustype: %s"
@@ -382,8 +385,8 @@ msgstr ""
 "\n"
 "Press 'OK' for å fortsette."
 
-#: ../autopart.py:1457 ../bootloader.py:139 ../image.py:391
-#: ../partedUtils.py:266 ../partedUtils.py:296 ../partedUtils.py:817
+#: ../autopart.py:1459 ../bootloader.py:139 ../image.py:391
+#: ../partedUtils.py:273 ../partedUtils.py:303 ../partedUtils.py:834
 #: ../upgrade.py:305 ../upgrade.py:416 ../upgrade.py:469 ../upgrade.py:489
 #: ../upgrade.py:530 ../iw/blpasswidget.py:148
 #: ../iw/bootloader_advanced_gui.py:42 ../iw/bootloader_main_gui.py:91
@@ -391,11 +394,11 @@ msgstr ""
 #: ../iw/upgrade_swap_gui.py:208 ../iw/upgrade_swap_gui.py:215
 #: ../textw/bootloader_text.py:142 ../textw/bootloader_text.py:457
 #: ../textw/fdasd_text.py:84 ../textw/partition_text.py:223
-#: ../textw/upgrade_text.py:177 ../loader2/loader.c:353
+#: ../textw/upgrade_text.py:177 ../loader2/loader.c:351
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../autopart.py:1463
+#: ../autopart.py:1465
 msgid ""
 "Automatic Partitioning sets partitions based on the selected installation "
 "type. You also can customize the partitions once they have been created.\n"
@@ -412,7 +415,7 @@ msgstr ""
 "partisjoner i et interaktivt miljø. Du kan her bestemme blant annet "
 "filsystemtyper, monteringspunkter og partisjonsstørrelser."
 
-#: ../autopart.py:1474
+#: ../autopart.py:1476
 msgid ""
 "Before automatic partitioning can be set up by the installation program, you "
 "must choose how to use the space on your hard drives."
@@ -420,20 +423,20 @@ msgstr ""
 "Før automatisk partisjonering utføres av installasjonsprogrammet, må du "
 "velge hvordan plassen på harddiskene skal brukes."
 
-#: ../autopart.py:1479
+#: ../autopart.py:1481
 msgid "Remove all partitions on this system"
 msgstr "Fjern alle partisjoner på dette systemet"
 
-#: ../autopart.py:1480
+#: ../autopart.py:1482
 #, fuzzy
 msgid "Remove all Linux partitions on this system"
 msgstr "Fjern alle Linux-partisjoner på dette systemet"
 
-#: ../autopart.py:1481
+#: ../autopart.py:1483
 msgid "Keep all partitions and use existing free space"
 msgstr "Behold alle partisjoner og bruk eksisterende ledig plass"
 
-#: ../autopart.py:1483
+#: ../autopart.py:1485
 #, fuzzy, python-format
 msgid ""
 "You have chosen to remove all partitions (ALL DATA) on the following drives:%"
@@ -444,7 +447,7 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil gjøre dette?"
 
-#: ../autopart.py:1487
+#: ../autopart.py:1489
 #, fuzzy, python-format
 msgid ""
 "You have chosen to remove all Linux partitions (and ALL DATA on them) on the "
@@ -498,7 +501,7 @@ msgstr ""
 msgid "Installing %s-%s-%s... "
 msgstr "Installerer %s-%s-%s.\n"
 
-#: ../comps.py:761 ../comps.py:789 ../hdrlist.py:734
+#: ../comps.py:761 ../comps.py:789 ../hdrlist.py:739
 msgid "Everything"
 msgstr "Alt"
 
@@ -506,11 +509,11 @@ msgstr "Alt"
 msgid "no suggestion"
 msgstr "ingen forslag"
 
-#: ../comps.py:1092 ../hdrlist.py:938
+#: ../comps.py:1092 ../hdrlist.py:943
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
-#: ../comps.py:1108 ../hdrlist.py:43 ../hdrlist.py:885
+#: ../comps.py:1108 ../hdrlist.py:43 ../hdrlist.py:890
 msgid ""
 "This group includes all the packages available.  Note that there are "
 "substantially more packages than just the ones in all the other package "
@@ -519,7 +522,7 @@ msgstr ""
 "Denne gruppen inneholder alle tilgjengelige pakker. Merk at dette er mange "
 "flere pakker enn det som vises i alle pakkegruppene på denne siden."
 
-#: ../comps.py:1112 ../hdrlist.py:889
+#: ../comps.py:1112 ../hdrlist.py:894
 msgid ""
 "Choose this group to get the minimal possible set of packages.  Useful for "
 "creating small router/firewall boxes, for example."
@@ -602,27 +605,27 @@ msgid "_Make boot disk"
 msgstr "_Lag oppstartsdiskett"
 
 #: ../floppy.py:117 ../floppy.py:142 ../floppy.py:157 ../floppy.py:188
-#: ../fsset.py:562 ../fsset.py:1195 ../fsset.py:1214 ../fsset.py:1261
-#: ../fsset.py:1272 ../fsset.py:1308 ../fsset.py:1358 ../fsset.py:1401
+#: ../fsset.py:562 ../fsset.py:1198 ../fsset.py:1217 ../fsset.py:1264
+#: ../fsset.py:1275 ../fsset.py:1311 ../fsset.py:1361 ../fsset.py:1404
 #: ../harddrive.py:219 ../image.py:78 ../image.py:115 ../image.py:252
 #: ../packages.py:150 ../packages.py:163 ../packages.py:175 ../packages.py:342
-#: ../packages.py:511 ../packages.py:594 ../partedUtils.py:614
+#: ../packages.py:511 ../packages.py:594 ../partedUtils.py:631
 #: ../upgrade.py:336 ../upgrade.py:361 ../upgrade.py:388
 #: ../iw/osbootwidget.py:222 ../iw/osbootwidget.py:231
 #: ../iw/raid_dialog_gui.py:616 ../iw/raid_dialog_gui.py:655
 #: ../textw/fdasd_text.py:73 ../textw/upgrade_text.py:165
 #: ../textw/upgrade_text.py:172 ../loader2/cdinstall.c:137
-#: ../loader2/cdinstall.c:423 ../loader2/driverdisk.c:274
-#: ../loader2/driverdisk.c:346 ../loader2/hdinstall.c:223
+#: ../loader2/cdinstall.c:423 ../loader2/driverdisk.c:277
+#: ../loader2/driverdisk.c:349 ../loader2/hdinstall.c:223
 #: ../loader2/hdinstall.c:272 ../loader2/hdinstall.c:490
 #: ../loader2/hdinstall.c:573 ../loader2/kickstart.c:261 ../loader2/lang.c:102
-#: ../loader2/loader.c:328 ../loader2/loader.c:645 ../loader2/mediacheck.c:255
+#: ../loader2/loader.c:326 ../loader2/loader.c:643 ../loader2/mediacheck.c:255
 #: ../loader2/mediacheck.c:312 ../loader2/method.c:147 ../loader2/method.c:355
 #: ../loader2/method.c:440 ../loader2/nfsinstall.c:190
 #: ../loader2/nfsinstall.c:194 ../loader2/telnetd.c:86
 #: ../loader2/urlinstall.c:60 ../loader2/urlinstall.c:112
-#: ../loader2/urlinstall.c:125 ../loader2/urls.c:170 ../loader2/urls.c:180
-#: ../loader2/urls.c:188 ../loader2/urls.c:313 ../loader2/urls.c:318
+#: ../loader2/urlinstall.c:125 ../loader2/urls.c:171 ../loader2/urls.c:181
+#: ../loader2/urls.c:189 ../loader2/urls.c:317 ../loader2/urls.c:322
 msgid "Error"
 msgstr "Feil"
 
@@ -682,27 +685,27 @@ msgstr ""
 "\n"
 "Ønsker du å fortsette uten å migrere %s?"
 
-#: ../fsset.py:1110
+#: ../fsset.py:1113
 msgid "RAID Device"
 msgstr "RAID-enhet"
 
-#: ../fsset.py:1114 ../fsset.py:1120
+#: ../fsset.py:1117 ../fsset.py:1123
 msgid "Apple Bootstrap"
 msgstr ""
 
-#: ../fsset.py:1125
+#: ../fsset.py:1128
 msgid "PPC PReP Boot"
 msgstr ""
 
-#: ../fsset.py:1128 ../iw/silo_gui.py:184 ../textw/silo_text.py:76
+#: ../fsset.py:1131 ../iw/silo_gui.py:184 ../textw/silo_text.py:76
 msgid "First sector of boot partition"
 msgstr "Første sektor på oppstartspartisjonen"
 
-#: ../fsset.py:1129 ../iw/silo_gui.py:181 ../textw/silo_text.py:75
+#: ../fsset.py:1132 ../iw/silo_gui.py:181 ../textw/silo_text.py:75
 msgid "Master Boot Record (MBR)"
 msgstr "Master Boot Record (MBR)"
 
-#: ../fsset.py:1196
+#: ../fsset.py:1199
 #, python-format
 msgid ""
 "An error occurred trying to initialize swap on device %s.  This problem is "
@@ -715,7 +718,7 @@ msgstr ""
 "\n"
 "Trykk <Linjeskift> for å starte systemet på nytt."
 
-#: ../fsset.py:1215
+#: ../fsset.py:1218
 #, python-format
 msgid ""
 "Error enabling swap device %s: %s\n"
@@ -730,7 +733,7 @@ msgstr ""
 "\n"
 "Trykk OK for å starte systemet på nytt."
 
-#: ../fsset.py:1262
+#: ../fsset.py:1265
 #, python-format
 msgid ""
 "Bad blocks have been detected on device /dev/%s. We do not recommend you use "
@@ -743,7 +746,7 @@ msgstr ""
 "\n"
 "Trykk <Linjeskift> for å starte systemet på nytt."
 
-#: ../fsset.py:1273
+#: ../fsset.py:1276
 #, python-format
 msgid ""
 "An error occurred searching for bad blocks on %s.  This problem is serious, "
@@ -756,7 +759,7 @@ msgstr ""
 "\n"
 "Trykk <Linjeskift> for å starte systemet på nytt."
 
-#: ../fsset.py:1309
+#: ../fsset.py:1312
 #, python-format
 msgid ""
 "An error occurred trying to format %s.  This problem is serious, and the "
@@ -769,7 +772,7 @@ msgstr ""
 "\n"
 "Trykk <Linjeskift> for å starte systemet på nytt."
 
-#: ../fsset.py:1359
+#: ../fsset.py:1362
 #, python-format
 msgid ""
 "An error occurred trying to migrate %s.  This problem is serious, and the "
@@ -782,11 +785,11 @@ msgstr ""
 "\n"
 "Trykk <Linjeskift> for å starte systemet på nytt."
 
-#: ../fsset.py:1379 ../fsset.py:1388
+#: ../fsset.py:1382 ../fsset.py:1391
 msgid "Invalid mount point"
 msgstr "Ugyldig monteringspunkt"
 
-#: ../fsset.py:1380
+#: ../fsset.py:1383
 #, python-format
 msgid ""
 "An error occurred when trying to create %s.  Some element of this path is "
@@ -800,7 +803,7 @@ msgstr ""
 "\n"
 "Trykk <Linjeskift> for å starte systemet på nytt."
 
-#: ../fsset.py:1389
+#: ../fsset.py:1392
 #, python-format
 msgid ""
 "An error occurred when trying to create %s: %s.  This is a fatal error and "
@@ -813,7 +816,7 @@ msgstr ""
 "\n"
 "Trykk <Linjeskift> for å starte systemet på nytt."
 
-#: ../fsset.py:1402
+#: ../fsset.py:1405
 #, python-format
 msgid ""
 "Error mounting device %s as %s: %s\n"
@@ -828,11 +831,11 @@ msgstr ""
 "\n"
 "Trykk OK for å starte systemet på nytt."
 
-#: ../fsset.py:2210
+#: ../fsset.py:2213
 msgid "Formatting"
 msgstr "Formaterer"
 
-#: ../fsset.py:2211
+#: ../fsset.py:2214
 #, python-format
 msgid "Formatting %s file system..."
 msgstr "Formaterer %s-filsystem..."
@@ -887,9 +890,9 @@ msgstr "Fiks"
 
 #: ../gui.py:236 ../rescue.py:175 ../text.py:320 ../textw/bootdisk_text.py:22
 #: ../textw/bootloader_text.py:83 ../textw/constants_text.py:48
-#: ../textw/upgrade_text.py:253 ../loader2/driverdisk.c:391
-#: ../loader2/driverdisk.c:402 ../loader2/hdinstall.c:385
-#: ../loader2/loader.c:353
+#: ../textw/upgrade_text.py:253 ../loader2/driverdisk.c:394
+#: ../loader2/driverdisk.c:405 ../loader2/hdinstall.c:385
+#: ../loader2/loader.c:351
 msgid "Yes"
 msgstr "Ja"
 
@@ -897,8 +900,8 @@ msgstr "Ja"
 #: ../textw/bootdisk_text.py:22 ../textw/bootdisk_text.py:35
 #: ../textw/bootloader_text.py:83 ../textw/constants_text.py:52
 #: ../textw/upgrade_text.py:253 ../textw/upgrade_text.py:260
-#: ../loader2/driverdisk.c:391 ../loader2/driverdisk.c:402
-#: ../loader2/loader.c:353
+#: ../loader2/driverdisk.c:394 ../loader2/driverdisk.c:405
+#: ../loader2/loader.c:351
 msgid "No"
 msgstr "Nei"
 
@@ -916,8 +919,8 @@ msgstr "Overse"
 #: ../iw/bootloader_advanced_gui.py:50 ../iw/bootloader_main_gui.py:103
 #: ../textw/bootloader_text.py:219 ../textw/constants_text.py:40
 #: ../textw/silo_text.py:147 ../textw/silo_text.py:165
-#: ../textw/userauth_text.py:88 ../loader2/driverdisk.c:245
-#: ../loader2/loader.c:317
+#: ../textw/userauth_text.py:88 ../loader2/driverdisk.c:248
+#: ../loader2/loader.c:315
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -965,7 +968,7 @@ msgstr ""
 "\n"
 "className = %s"
 
-#: ../gui.py:976 ../packages.py:516 ../packages.py:1258
+#: ../gui.py:976 ../packages.py:516 ../packages.py:1259
 #: ../iw/congrats_gui.py:29
 msgid "_Exit"
 msgstr "A_vslutt"
@@ -974,19 +977,19 @@ msgstr "A_vslutt"
 msgid "_Retry"
 msgstr "P_røv igjen"
 
-#: ../gui.py:979 ../packages.py:1261
+#: ../gui.py:979 ../packages.py:1262
 msgid "Rebooting System"
 msgstr "Starter maskinen på nytt"
 
-#: ../gui.py:980 ../packages.py:1262
+#: ../gui.py:980 ../packages.py:1263
 msgid "Your system will now be rebooted..."
 msgstr "Maskinen vil nå startes på nytt..."
 
-#: ../gui.py:983 ../packages.py:1264
+#: ../gui.py:983 ../packages.py:1265
 msgid "_Reboot"
 msgstr "Sta_rt på nytt"
 
-#: ../gui.py:1074 ../packages.py:1264
+#: ../gui.py:1074 ../packages.py:1265
 msgid "_Back"
 msgstr "Til_bake"
 
@@ -1086,15 +1089,15 @@ msgstr "Dette er ikke den korrekte %s-CD-ROMen."
 msgid "The CDROM could not be mounted."
 msgstr "Denne CD-ROMen kunne ikke monteres."
 
-#: ../installclass.py:47
+#: ../installclass.py:59
 msgid "Install on System"
 msgstr "Installer på systemet"
 
-#: ../kickstart.py:1222
+#: ../kickstart.py:1217
 msgid "Missing Package"
 msgstr "Manglende pakke"
 
-#: ../kickstart.py:1223
+#: ../kickstart.py:1218
 #, python-format
 msgid ""
 "You have specified that the package '%s' should be installed.  This package "
@@ -1103,19 +1106,19 @@ msgstr ""
 "Du har oppgitt en at pakken '%s' skal installeres. Denne pakken finnes ikke. "
 "Ønsker du å fortsette installasjonen?"
 
-#: ../kickstart.py:1229 ../kickstart.py:1256
+#: ../kickstart.py:1224 ../kickstart.py:1251
 msgid "_Abort"
 msgstr "_Avbryt"
 
-#: ../kickstart.py:1230 ../kickstart.py:1257 ../iw/partition_gui.py:997
+#: ../kickstart.py:1225 ../kickstart.py:1252 ../iw/partition_gui.py:997
 msgid "_Continue"
 msgstr "_Fortsett"
 
-#: ../kickstart.py:1248
+#: ../kickstart.py:1243
 msgid "Missing Group"
 msgstr "Manglende gruppe"
 
-#: ../kickstart.py:1249
+#: ../kickstart.py:1244
 #, python-format
 msgid ""
 "You have specified that the group '%s' should be installed.  This group does "
@@ -1265,12 +1268,12 @@ msgstr ""
 "Installerer %s pakker\n"
 "\n"
 
-#: ../packages.py:773 ../packages.py:1074
+#: ../packages.py:773 ../packages.py:1075
 #, fuzzy, python-format
 msgid "Upgrading %s-%s-%s.%s.\n"
 msgstr "Oppgraderer %s-%s-%s.\n"
 
-#: ../packages.py:775 ../packages.py:1076
+#: ../packages.py:775 ../packages.py:1077
 #, fuzzy, python-format
 msgid "Installing %s-%s-%s.%s.\n"
 msgstr "Installerer %s-%s-%s.\n"
@@ -1300,7 +1303,7 @@ msgstr "Starter installering"
 msgid "Starting install process, this may take several minutes..."
 msgstr "Starter installeringsprosessen. Dette kan ta noen minutter..."
 
-#: ../packages.py:838
+#: ../packages.py:839
 msgid ""
 "You don't appear to have enough disk space to install the packages you've "
 "selected. You need more space on the following file systems:\n"
@@ -1310,17 +1313,17 @@ msgstr ""
 "valgt. Du må ha mer plass på følgende filsystemer:\n"
 "\n"
 
-#: ../packages.py:842 ../packages.py:863 ../iw/lvm_dialog_gui.py:1064
+#: ../packages.py:843 ../packages.py:864 ../iw/lvm_dialog_gui.py:1064
 #: ../iw/partition_gui.py:349 ../iw/upgrade_swap_gui.py:148
 #: ../textw/partition_text.py:1126 ../textw/upgrade_text.py:111
 msgid "Mount Point"
 msgstr "Monteringspunkt"
 
-#: ../packages.py:843
+#: ../packages.py:844
 msgid "Space Needed"
 msgstr "Nødvendig plass"
 
-#: ../packages.py:859
+#: ../packages.py:860
 msgid ""
 "You don't appear to have enough file nodes to install the packages you've "
 "selected. You need more file nodes on the following file systems:\n"
@@ -1330,15 +1333,15 @@ msgstr ""
 "valgt. Du må ha flere filnoder på følgende filsystemer:\n"
 "\n"
 
-#: ../packages.py:864
+#: ../packages.py:865
 msgid "Nodes Needed"
 msgstr "Manglende noder"
 
-#: ../packages.py:875
+#: ../packages.py:876
 msgid "Disk Space"
 msgstr "Diskplass"
 
-#: ../packages.py:912
+#: ../packages.py:913
 msgid ""
 "\n"
 "\n"
@@ -1348,19 +1351,19 @@ msgstr ""
 "\n"
 "Følgende pakker er tilgjengelige i denne versjonen men IKKE oppgradert:\n"
 
-#: ../packages.py:933
+#: ../packages.py:934
 msgid "Post Install"
 msgstr "Etter-installasjon"
 
-#: ../packages.py:934
+#: ../packages.py:935
 msgid "Performing post install configuration..."
 msgstr "Utfører etter-installasjons konfigurasjon..."
 
-#: ../packages.py:1244
+#: ../packages.py:1245
 msgid "Warning! This is a beta!"
 msgstr "Advarsel! Dette er en beta!"
 
-#: ../packages.py:1245
+#: ../packages.py:1246
 #, fuzzy, python-format
 msgid ""
 "Thank you for downloading this %s Beta release.\n"
@@ -1387,7 +1390,7 @@ msgstr ""
 "\n"
 "og send inn en rapport under «Red Hat Public Beta».\n"
 
-#: ../packages.py:1258
+#: ../packages.py:1259
 msgid "_Install BETA"
 msgstr "_Installer BETA"
 
@@ -1395,10 +1398,10 @@ msgstr "_Installer BETA"
 msgid "Foreign"
 msgstr "Utenlandsk"
 
-#: ../partedUtils.py:267
+#: ../partedUtils.py:274
 #, fuzzy, python-format
 msgid ""
-"The /dev/%s device is LDL formatted instead of CDL formatted.  LDL formatted "
+"The device %s is LDL formatted instead of CDL formatted.  LDL formatted "
 "DASDs are not supported for usage during an install of %s.  If you wish to "
 "use this disk for installation, it must be re-initialized causing the loss "
 "of ALL DATA on this drive.\n"
@@ -1411,7 +1414,7 @@ msgstr ""
 "\n"
 "Ønsker du å initiere denne stasjonen?"
 
-#: ../partedUtils.py:297
+#: ../partedUtils.py:304
 #, python-format
 msgid ""
 "The partition table on device /dev/%s is of an unexpected type %s for your "
@@ -1426,21 +1429,21 @@ msgstr ""
 "\n"
 "Ønsker du å initiere denne stasjonen?"
 
-#: ../partedUtils.py:615
+#: ../partedUtils.py:632
 #, python-format
 msgid "Error mounting file system on %s: %s"
 msgstr "Feil under montering av filsystem på %s: %s"
 
-#: ../partedUtils.py:699
+#: ../partedUtils.py:716
 msgid "Initializing"
 msgstr "Initierer"
 
-#: ../partedUtils.py:700
+#: ../partedUtils.py:717
 #, python-format
 msgid "Please wait while formatting drive %s...\n"
 msgstr "Vennligst vent mens stasjon %s formateres...\n"
 
-#: ../partedUtils.py:818
+#: ../partedUtils.py:835
 #, python-format
 msgid ""
 "The partition table on device %s was unreadable. To create new partitions it "
@@ -1460,11 +1463,11 @@ msgstr ""
 "\n"
 "Ønsker du å initiere denne stasjonen og slette ALLE DATA?"
 
-#: ../partedUtils.py:936 ../textw/fdasd_text.py:100
+#: ../partedUtils.py:953 ../textw/fdasd_text.py:100
 msgid "No Drives Found"
 msgstr "Ingen stasjoner funnet"
 
-#: ../partedUtils.py:937
+#: ../partedUtils.py:954
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "file systems. Please check your hardware for the cause of this problem."
@@ -1831,11 +1834,11 @@ msgid ""
 "You must create a /boot/efi partition of type FAT and a size of 50 megabytes."
 msgstr "Du må lage en /boot/efi-partisjon av type FAT og med størrelse 50 MB."
 
-#: ../partitions.py:832
+#: ../partitions.py:835
 msgid "You must create a PPC PReP Boot partition."
 msgstr ""
 
-#: ../partitions.py:839
+#: ../partitions.py:842
 #, python-format
 msgid ""
 "Your %s partition is less than %s megabytes which is lower than recommended "
@@ -1844,15 +1847,15 @@ msgstr ""
 "Din %s-partisjon er mindre enn %s megabyte og dette er lavere enn anbefalt "
 "for en vanlig installasjon av %s."
 
-#: ../partitions.py:869 ../partRequests.py:636
+#: ../partitions.py:872 ../partRequests.py:636
 msgid "Bootable partitions can only be on RAID1 devices."
 msgstr "Oppstartbare partisjoner kan kun plasseres på RAID1-enheter."
 
-#: ../partitions.py:876
+#: ../partitions.py:879
 msgid "Bootable partitions cannot be on a logical volume."
 msgstr "Oppstartbare partisjoner kan ikke ligge på et logisk volum."
 
-#: ../partitions.py:880
+#: ../partitions.py:883
 msgid ""
 "You have not specified a swap partition.  Although not strictly required in "
 "all cases, it will significantly improve performance for most installations."
@@ -1861,7 +1864,7 @@ msgstr ""
 "krav om dette i alle tilfeller, så vil det øke ytelsen for de fleste "
 "installasjoner."
 
-#: ../partitions.py:887
+#: ../partitions.py:890
 #, python-format
 msgid ""
 "You have specified more than 32 swap devices.  The kernel for %s only "
@@ -1870,7 +1873,7 @@ msgstr ""
 "Du har spesifisert mer en 32 swap-enheter. Kjernen for %s støtter kun 32 "
 "swap-enheter."
 
-#: ../partitions.py:898
+#: ../partitions.py:901
 #, python-format
 msgid ""
 "You have allocated less swap space (%dM) than available RAM (%dM) on your "
@@ -1879,15 +1882,15 @@ msgstr ""
 "Du har allokert mindre swap-område (%dM) enn tilgjengelig RAM (%dM) i ditt "
 "system. Dette kan ha negativ innvirkning på ytelsen."
 
-#: ../partitions.py:1179
+#: ../partitions.py:1182
 msgid "the partition in use by the installer."
 msgstr "partisjonen er i bruk av installasjonsprogrammet."
 
-#: ../partitions.py:1182
+#: ../partitions.py:1185
 msgid "a partition which is a member of a RAID array."
 msgstr "en partisjon som er medlem av et RAID-array."
 
-#: ../partitions.py:1185
+#: ../partitions.py:1188
 msgid "a partition which is a member of a LVM Volume Group."
 msgstr "en partisjon som er medlem av en LVM-volumgruppe."
 
@@ -2024,7 +2027,7 @@ msgstr ""
 "\n"
 
 #: ../rescue.py:266 ../iw/partition_gui.py:562 ../loader2/cdinstall.c:109
-#: ../loader2/cdinstall.c:117 ../loader2/driverdisk.c:347
+#: ../loader2/cdinstall.c:117 ../loader2/driverdisk.c:350
 msgid "Continue"
 msgstr "Fortsett"
 
@@ -2824,79 +2827,22 @@ msgstr "I_kke installer pakker som har avhengigheter"
 msgid "I_gnore package dependencies"
 msgstr "I_gnorer pakkeavhengigheter"
 
-#: ../iw/desktop_choice_gui.py:25 ../iw/desktop_choice_gui.py:53
-#: ../textw/desktop_choice_text.py:24
-msgid "Workstation Defaults"
-msgstr "Forvalg for arbeidsstasjon"
-
-#: ../iw/desktop_choice_gui.py:52 ../installclasses/workstation.py:7
-msgid "Workstation"
-msgstr "Arbeidsstasjon"
+#: ../iw/desktop_choice_gui.py:25
+#, fuzzy
+msgid "Package Defaults"
+msgstr "Valg av pakkegruppe"
 
-#: ../iw/desktop_choice_gui.py:58
-#, python-format
+#: ../iw/desktop_choice_gui.py:51
 msgid ""
-"The default workstation environment includes our recommendations for new "
-"users, including:\n"
-"\n"
-"\tDesktop shell (GNOME)\n"
-"\tOffice suite (OpenOffice)\n"
-"\tWeb browser (Mozilla) \n"
-"\tEmail (Evolution)\n"
-"\tInstant messaging\n"
-"\tSound and video applications\n"
-"\tGames\n"
-"\tSoftware Development Tools\n"
-"\tAdministration Tools\n"
-"\n"
-"After installation, additional software can be added or removed using the "
-"'redhat-config-packages' tool.\n"
+"The default installation environment includes our recommended package "
+"selection, including:\n"
 "\n"
-"If you are familiar with %s, you may have specific packages you would like "
-"to install or avoid installing. Check the box below to customize your "
-"installation."
 msgstr ""
-"Forvalgt arbeidsstasjonoppsett inkluderer våre anbefalinger for nye brukere, "
-"deriblant:\n"
-"\n"
-"\tSkrivebordsmiljø (GNOME)\n"
-"\tKontorstøtteprogramvare (OpenOffice)\n"
-"\tNettleser (Mozilla)\n"
-"\tE-post (Evolution)\n"
-"\tInstant Messging\n"
-"\tLyd- og bildeprogrammer\n"
-"\tSpill\n"
-"\tProgramvareutvikling\n"
-"\tAdministrasjonsverktøy\n"
-"\n"
-"Etter installasjonen kan du legge til eller fjerne pakker ved å bruke "
-"verktøyet «redhat-config-package».\n"
-"\n"
-"Hvis du er kjent med %s er det mulig at du har spesifikke pakker du ønsker å "
-"installere eller unngå at blir installert. Kryss av i boksen under for å "
-"tilpasse din installasjon."
-
-#: ../iw/desktop_choice_gui.py:75 ../installclasses/personal_desktop.py:10
-msgid "Personal Desktop"
-msgstr "Personlig skrivebord"
-
-#: ../iw/desktop_choice_gui.py:76
-msgid "Personal Desktop Defaults"
-msgstr "Forvalg for personlig skrivebord"
 
-#: ../iw/desktop_choice_gui.py:81
-#, python-format
+#: ../iw/desktop_choice_gui.py:53
+#, fuzzy, python-format
 msgid ""
-"The default personal desktop environment includes our recommendations for "
-"new users, including:\n"
 "\n"
-"\tDesktop shell (GNOME)\n"
-"\tOffice suite (OpenOffice)\n"
-"\tWeb browser (Mozilla) \n"
-"\tEmail (Evolution)\n"
-"\tInstant messaging\n"
-"\tSound and video applications\n"
-"\tGames\n"
 "\n"
 "After installation, additional software can be added or removed using the "
 "'redhat-config-packages' tool.\n"
@@ -2923,7 +2869,7 @@ msgstr ""
 "installere eller unngå at blir installert. Kryss av i boksen under for å "
 "tilpasse din installasjon."
 
-#: ../iw/desktop_choice_gui.py:98
+#: ../iw/desktop_choice_gui.py:65
 msgid ""
 "If you would like to change the default package set to be installed you can "
 "choose to customize this below."
@@ -2931,11 +2877,11 @@ msgstr ""
 "Hvis du ønsker å endre forvalgt pakkesett som skal installeres kan du velge "
 "å tilpasse dette under."
 
-#: ../iw/desktop_choice_gui.py:106
+#: ../iw/desktop_choice_gui.py:73
 msgid "_Accept the current package list"
 msgstr "Godt_a pakkelisten som den er"
 
-#: ../iw/desktop_choice_gui.py:107
+#: ../iw/desktop_choice_gui.py:74
 msgid "_Customize the set of packages to be installed"
 msgstr "_Tilpass hvilke pakker som skal installeres"
 
@@ -3021,10 +2967,11 @@ msgid "Select a drive to partition with fdisk:"
 msgstr "Velg disk som skal partisjoneres med fdisk:"
 
 #: ../iw/firewall_gui.py:23 ../textw/firewall_text.py:26
-msgid "Firewall Configuration"
-msgstr "Brannvegg-konfigurasjon"
+#, fuzzy
+msgid "Firewall"
+msgstr "Ingen brannvegg"
 
-#: ../iw/firewall_gui.py:132
+#: ../iw/firewall_gui.py:115
 #, python-format
 msgid ""
 "Invalid port given: %s.  The proper format is 'port:protocol', where port is "
@@ -3037,46 +2984,50 @@ msgstr ""
 "\n"
 "For eksempel, «1234:udp»"
 
-#: ../iw/firewall_gui.py:136
+#: ../iw/firewall_gui.py:119
 msgid "Warning: Bad Token"
 msgstr "Advarsel: ugyldig tegn"
 
-#: ../iw/firewall_gui.py:188
-msgid "Select a security level for the system:  "
-msgstr "Velg sikkerhetsnivå for systemet: "
-
-#: ../iw/firewall_gui.py:197
-msgid "Hi_gh"
-msgstr "H_øyt"
-
-#: ../iw/firewall_gui.py:198
-msgid "_Medium"
-msgstr "_Middels"
+#: ../iw/firewall_gui.py:145 ../textw/firewall_text.py:28
+msgid ""
+"A firewall can help prevent unauthorized access to your computer from the "
+"outside world.  Would you like to enable a firewall?"
+msgstr ""
 
-#: ../iw/firewall_gui.py:199
+#: ../iw/firewall_gui.py:155
 msgid "N_o firewall"
 msgstr "I_ngen brannvegg"
 
-#: ../iw/firewall_gui.py:215
-msgid "Use _default firewall rules"
-msgstr "Bruk _forvalgt regelsett for brannvegg"
+#: ../iw/firewall_gui.py:157
+#, fuzzy
+msgid "_Enable firewall"
+msgstr "I_ngen brannvegg"
 
-#: ../iw/firewall_gui.py:216
-msgid "_Customize"
-msgstr "_Tilpass"
+#: ../iw/firewall_gui.py:159
+#, fuzzy
+msgid "_Custom firewall"
+msgstr "I_ngen brannvegg"
 
-#: ../iw/firewall_gui.py:229
-msgid "_Trusted devices:"
-msgstr "Enhe_ter vi stoler på:"
+#: ../iw/firewall_gui.py:178
+msgid "What services should be allowed to pass through the firewall?"
+msgstr ""
 
-#: ../iw/firewall_gui.py:255
+#: ../iw/firewall_gui.py:186
 msgid "_Allow incoming:"
 msgstr "Till_at innkommende:"
 
-#: ../iw/firewall_gui.py:280
+#: ../iw/firewall_gui.py:211
 msgid "Other _ports:"
 msgstr "Andre _porter:"
 
+#: ../iw/firewall_gui.py:219
+msgid "If you would like to allow all traffic from a device, select it below."
+msgstr ""
+
+#: ../iw/firewall_gui.py:228
+msgid "_Trusted devices:"
+msgstr "Enhe_ter vi stoler på:"
+
 #: ../iw/installpath_gui_hacked.py:34 ../iw/installpath_gui.py:34
 #: ../textw/installpath_text.py:42
 msgid "Installation Type"
@@ -5085,13 +5036,13 @@ msgstr ""
 #: ../textw/confirm_text.py:36 ../textw/confirm_text.py:38
 #: ../textw/constants_text.py:44 ../textw/silo_text.py:110
 #: ../textw/userauth_text.py:202 ../loader2/cdinstall.c:353
-#: ../loader2/driverdisk.c:245 ../loader2/driverdisk.c:260
+#: ../loader2/driverdisk.c:248 ../loader2/driverdisk.c:263
 #: ../loader2/driverselect.c:73 ../loader2/driverselect.c:187
 #: ../loader2/driverselect.c:213 ../loader2/hdinstall.c:385
-#: ../loader2/hdinstall.c:439 ../loader2/kbd.c:125 ../loader2/loader.c:304
-#: ../loader2/loader.c:786 ../loader2/loader.c:809 ../loader2/net.c:173
+#: ../loader2/hdinstall.c:439 ../loader2/kbd.c:125 ../loader2/loader.c:302
+#: ../loader2/loader.c:802 ../loader2/loader.c:825 ../loader2/net.c:173
 #: ../loader2/net.c:424 ../loader2/net.c:846 ../loader2/nfsinstall.c:54
-#: ../loader2/urls.c:250 ../loader2/urls.c:438
+#: ../loader2/urls.c:254 ../loader2/urls.c:442
 msgid "Back"
 msgstr "Tilbake"
 
@@ -5108,13 +5059,16 @@ msgstr ""
 "En komplett logg av oppgraderingen vil befinne seg i %s etter omstart av "
 "systemet. Du vil kanskje beholde denne filen som referansepunkt til senere."
 
+#: ../textw/desktop_choice_text.py:24
+msgid "Workstation Defaults"
+msgstr "Forvalg for arbeidsstasjon"
+
 #: ../textw/desktop_choice_text.py:27
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"The Personal Desktop and Workstation options install a default set of "
-"applications that will allow you to browse the Internet, send and receive "
-"email, and create and edit documents on your %s system. The Workstation "
-"option includes development and administration tools as well.\n"
+"The default installation environment includes our recommended package "
+"selection.  After installation, additional software can be added or removed "
+"using the 'redhat-config-packages' tool.\n"
 "\n"
 "However %s ships with many more applications, and you may customize the "
 "selection of software installed if you want."
@@ -5128,7 +5082,7 @@ msgstr ""
 "Men %s inneholder også mange flere programmer, og du kan tilpasse hvilke "
 "programmer som skal installeres, hvis du ønsker det."
 
-#: ../textw/desktop_choice_text.py:39
+#: ../textw/desktop_choice_text.py:37
 msgid "Customize software selection"
 msgstr "Tilpass valg av programvare"
 
@@ -5192,85 +5146,62 @@ msgstr "Velg en disk som fdisk skal kjøres på"
 msgid "Customize"
 msgstr "Tilpass"
 
-#: ../textw/firewall_text.py:28
-msgid ""
-"A firewall protects against unauthorized network intrusions. High security "
-"blocks all incoming accesses. Medium blocks access to system services (such "
-"as telnet or printing), but allows other connections. No firewall allows all "
-"connections and is not recommended. "
-msgstr ""
-"En brannvegg beskytter mot innbrudd på nettverket. Høy sikkerhet blokkerer "
-"all innkommende trafikk. Medium blokkerer tilgang til systemtjenester (slik "
-"som telnet og utskrift), men tillater andre tilkoblinger. Ingen brannvegg "
-"tillater alle tilkoblinger og er ikke anbefalt."
-
-#: ../textw/firewall_text.py:44
-msgid "Security Level:"
-msgstr "Sikkerhetsnivå:"
+#: ../textw/firewall_text.py:45
+#, fuzzy
+msgid "Enable firewall"
+msgstr "Ingen brannvegg"
 
 #: ../textw/firewall_text.py:48
-msgid "High"
-msgstr "Høyt"
-
-#: ../textw/firewall_text.py:51
-msgid "Medium"
-msgstr "Middels"
-
-#: ../textw/firewall_text.py:54
 msgid "No firewall"
 msgstr "Ingen brannvegg"
 
-#: ../textw/firewall_text.py:73
+#: ../textw/firewall_text.py:67
 msgid "Trusted Devices:"
 msgstr "Enheter vi stoler på:"
 
-#: ../textw/firewall_text.py:85
+#: ../textw/firewall_text.py:77
 msgid "Allow incoming:"
 msgstr "Tillat innkommende:"
 
-#: ../textw/firewall_text.py:90
-msgid "DHCP"
-msgstr "DHCP"
-
-#: ../textw/firewall_text.py:92
+#: ../textw/firewall_text.py:82
 msgid "SSH"
 msgstr "SSH"
 
-#: ../textw/firewall_text.py:94 ../loader2/telnetd.c:82
+#: ../textw/firewall_text.py:84 ../loader2/telnetd.c:82
 #: ../loader2/telnetd.c:124
 msgid "Telnet"
 msgstr "Telnet"
 
-#: ../textw/firewall_text.py:96
+#: ../textw/firewall_text.py:86
 msgid "WWW (HTTP)"
 msgstr "WWW (HTTP)"
 
-#: ../textw/firewall_text.py:98
+#: ../textw/firewall_text.py:88
 msgid "Mail (SMTP)"
 msgstr "E-post (SMTP)"
 
-#: ../textw/firewall_text.py:100
+#: ../textw/firewall_text.py:90
 msgid "FTP"
 msgstr "FTP"
 
-#: ../textw/firewall_text.py:104
+#: ../textw/firewall_text.py:94
 msgid "Other ports"
 msgstr "Andre porter"
 
-#: ../textw/firewall_text.py:130 ../textw/firewall_text.py:193
+#: ../textw/firewall_text.py:120 ../textw/firewall_text.py:183
 #: ../textw/language_text.py:145
 msgid "Invalid Choice"
 msgstr "Ugyldig valg"
 
-#: ../textw/firewall_text.py:131
+#: ../textw/firewall_text.py:121
 msgid "You cannot customize a disabled firewall."
 msgstr "Du kan ikke tilpasse en deaktivert brannvegg."
 
-#: ../textw/firewall_text.py:136
+#: ../textw/firewall_text.py:126
 msgid "Firewall Configuration - Customize"
 msgstr "Konfigurasjon av brannvegg - Tilpass"
 
-#: ../textw/firewall_text.py:138
+#: ../textw/firewall_text.py:128
 msgid ""
 "You can customize your firewall in two ways. First, you can select to allow "
 "all traffic from certain network interfaces. Second, you can allow certain "
@@ -5282,7 +5213,7 @@ msgstr ""
 "protokoller eksplisitt gjennom brannveggen. Du kan spesifisere flere porter "
 "på formen 'tjeneste:protokoll' i en komma-separert liste, f.eks. 'imap:tcp'."
 
-#: ../textw/firewall_text.py:194
+#: ../textw/firewall_text.py:184
 #, python-format
 msgid "Warning: %s is not a valid port."
 msgstr "Advarsel: %s er ikke en gyldig port."
@@ -5903,7 +5834,7 @@ msgstr ""
 "du vet hva det er og at du ikke gjorde en skrivefeil. Husk at root-passordet "
 "er kritisk for systemsikkerheten!"
 
-#: ../textw/userauth_text.py:44 ../loader2/urls.c:428
+#: ../textw/userauth_text.py:44 ../loader2/urls.c:432
 msgid "Password:"
 msgstr "Passord:"
 
@@ -6358,6 +6289,10 @@ msgstr ""
 "installasjonsprosessen, inkludert utvalg av programvarepakker og brukervalg "
 "for autentisering."
 
+#: ../installclasses/personal_desktop.py:10
+msgid "Personal Desktop"
+msgstr "Personlig skrivebord"
+
 #: ../installclasses/personal_desktop.py:12
 msgid ""
 "Perfect for personal computers or laptops, select this installation type to "
@@ -6368,6 +6303,51 @@ msgstr ""
 "installasjonstypen for å installere et grafisk skrivebordsmiljø og et system "
 "som er ideelt for hjemmebruk."
 
+#: ../installclasses/personal_desktop.py:17
+msgid ""
+"\tDesktop shell (GNOME)\n"
+"\tOffice suite (OpenOffice)\n"
+"\tWeb browser (Mozilla) \n"
+"\tEmail (Evolution)\n"
+"\tInstant messaging\n"
+"\tSound and video applications\n"
+"\tGames\n"
+msgstr ""
+
+#: ../installclasses/rhel_as.py:9 ../installclasses/rhel_as.py:11
+msgid "Red Hat Enterprise Linux AS"
+msgstr ""
+
+#: ../installclasses/rhel_as.py:16 ../installclasses/rhel_es.py:16
+msgid ""
+"\tDesktop shell (GNOME)\n"
+"\tAdministration Tools\n"
+"\tServer Configuration Tools\n"
+"\tWeb Server\n"
+"\tWindows File Server (SMB)\n"
+msgstr ""
+
+#: ../installclasses/rhel_es.py:9 ../installclasses/rhel_es.py:11
+msgid "Red Hat Enterprise Linux ES"
+msgstr ""
+
+#: ../installclasses/rhel_ws.py:9 ../installclasses/rhel_ws.py:11
+msgid "Red Hat Enterprise Linux WS"
+msgstr ""
+
+#: ../installclasses/rhel_ws.py:16 ../installclasses/workstation.py:13
+msgid ""
+"\tDesktop shell (GNOME)\n"
+"\tOffice suite (OpenOffice)\n"
+"\tWeb browser (Mozilla) \n"
+"\tEmail (Evolution)\n"
+"\tInstant messaging\n"
+"\tSound and video applications\n"
+"\tGames\n"
+"\tSoftware Development Tools\n"
+"\tAdministration Tools\n"
+msgstr ""
+
 #: ../installclasses/server.py:10
 msgid "Server"
 msgstr "Tjener"
@@ -6382,6 +6362,10 @@ msgstr ""
 "av skrivere og web-tjenester. Tilleggstjenester kan også aktiveres og du kan "
 "velge om du vil installere et grafisk miljø eller ikke."
 
+#: ../installclasses/workstation.py:7
+msgid "Workstation"
+msgstr "Arbeidsstasjon"
+
 #: ../installclasses/workstation.py:9
 msgid ""
 "This option installs a graphical desktop environment with tools for software "
@@ -6472,19 +6456,19 @@ msgstr "CD ikke funnet"
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Kan ikke finne kickstart-fil på CD-ROM."
 
-#: ../loader2/driverdisk.c:119 ../loader2/firewire.c:50
+#: ../loader2/driverdisk.c:120 ../loader2/firewire.c:50
 msgid "Loading"
 msgstr "Laster"
 
-#: ../loader2/driverdisk.c:119
+#: ../loader2/driverdisk.c:120
 msgid "Reading driver disk..."
 msgstr "Leser driverdisk..."
 
-#: ../loader2/driverdisk.c:239
+#: ../loader2/driverdisk.c:242
 msgid "Driver Disk Source"
 msgstr "Kilde for driverdisk"
 
-#: ../loader2/driverdisk.c:240
+#: ../loader2/driverdisk.c:243
 msgid ""
 "You have multiple devices which could serve as sources for a driver disk.  "
 "Which would you like to use?"
@@ -6492,28 +6476,28 @@ msgstr ""
 "Du har flere enheter som kan være kilde for en driverdisk. Hvilken vil du "
 "bruke?"
 
-#: ../loader2/driverdisk.c:258
+#: ../loader2/driverdisk.c:261
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "Sett inn driverdisken i /dev/%s og trykk «OK» for å fortsette."
 
-#: ../loader2/driverdisk.c:260
+#: ../loader2/driverdisk.c:263
 msgid "Insert Driver Disk"
 msgstr "Sett inn driverdisk"
 
-#: ../loader2/driverdisk.c:275
+#: ../loader2/driverdisk.c:278
 msgid "Failed to mount driver disk."
 msgstr "Kunne ikke montere driverdisketten."
 
-#: ../loader2/driverdisk.c:346
+#: ../loader2/driverdisk.c:349
 msgid "Manually choose"
 msgstr "Velg manuelt"
 
-#: ../loader2/driverdisk.c:347
+#: ../loader2/driverdisk.c:350
 msgid "Load another disk"
 msgstr "Last en annen disk"
 
-#: ../loader2/driverdisk.c:348
+#: ../loader2/driverdisk.c:351
 msgid ""
 "No devices of the appropriate type were found on this driver disk.  Would "
 "you like to manually select the driver, continue anyway, or load another "
@@ -6522,37 +6506,37 @@ msgstr ""
 "Ingen enheter av passende type ble funnet på denne driverdisketten. Vil du "
 "velge driveren manuelt, fortsette likevel, eller laste en ny driverdiskett?"
 
-#: ../loader2/driverdisk.c:391
+#: ../loader2/driverdisk.c:394
 msgid "Driver disk"
 msgstr "Driverdisk"
 
-#: ../loader2/driverdisk.c:392
+#: ../loader2/driverdisk.c:395
 msgid "Do you have a driver disk?"
 msgstr "Har du en driverdisk?"
 
-#: ../loader2/driverdisk.c:402
+#: ../loader2/driverdisk.c:405
 msgid "More Driver Disks?"
 msgstr "Flere driverdisker?"
 
-#: ../loader2/driverdisk.c:403
+#: ../loader2/driverdisk.c:406
 msgid "Do you wish to load any more driver disks?"
 msgstr "Ønsker du å laste flere driverdisker?"
 
-#: ../loader2/driverdisk.c:442 ../loader2/driverdisk.c:475
+#: ../loader2/driverdisk.c:445 ../loader2/driverdisk.c:478
 #: ../loader2/hdinstall.c:523 ../loader2/kickstart.c:108
 #: ../loader2/kickstart.c:118 ../loader2/kickstart.c:161
-#: ../loader2/modules.c:914 ../loader2/net.c:717 ../loader2/net.c:740
+#: ../loader2/modules.c:916 ../loader2/net.c:717 ../loader2/net.c:740
 #: ../loader2/nfsinstall.c:233 ../loader2/urlinstall.c:386
 #: ../loader2/urlinstall.c:395 ../loader2/urlinstall.c:406
 msgid "Kickstart Error"
 msgstr "Kickstart-feil"
 
-#: ../loader2/driverdisk.c:443
+#: ../loader2/driverdisk.c:446
 #, fuzzy, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Ugyldig argument til kommando for URL-kickstartmetode %s: %s"
 
-#: ../loader2/driverdisk.c:476
+#: ../loader2/driverdisk.c:479
 #, fuzzy, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -6726,11 +6710,11 @@ msgstr "Harddisk"
 msgid "NFS image"
 msgstr "NFS-bilde"
 
-#: ../loader2/loader.c:299
+#: ../loader2/loader.c:297
 msgid "Update Disk Source"
 msgstr "Oppdater diskkilde"
 
-#: ../loader2/loader.c:300
+#: ../loader2/loader.c:298
 msgid ""
 "You have multiple devices which could serve as sources for an update disk.  "
 "Which would you like to use?"
@@ -6738,29 +6722,29 @@ msgstr ""
 "Du har flere enheter som kan tjene som kilde for en oppdateringsdisk. "
 "Hvilken vil du bruke?"
 
-#: ../loader2/loader.c:315
+#: ../loader2/loader.c:313
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Sett inn oppdateringsdisketten i /dev/%s og trykk «OK» for å fortsette."
 
-#: ../loader2/loader.c:317
+#: ../loader2/loader.c:315
 msgid "Updates Disk"
 msgstr "Oppdateringsdiskett"
 
-#: ../loader2/loader.c:329
+#: ../loader2/loader.c:327
 msgid "Failed to mount updates disk"
 msgstr "Kunne ikke montere oppdateringsdisketten"
 
-#: ../loader2/loader.c:332
+#: ../loader2/loader.c:330
 msgid "Updates"
 msgstr "Oppdateringer"
 
-#: ../loader2/loader.c:332
+#: ../loader2/loader.c:330
 msgid "Reading anaconda updates..."
 msgstr "Leser anaconda-oppdateringer..."
 
-#: ../loader2/loader.c:354
+#: ../loader2/loader.c:352
 msgid ""
 "No hard drives have been found.  You probably need to manually choose device "
 "drivers for the installation to succeed.  Would you like to select drivers "
@@ -6769,40 +6753,40 @@ msgstr ""
 "Ingen harddisker ble funnet. Du må sannsynligvis velge en enhetsdriver "
 "manuelt for å kunne fortsette installasjonen. Vil du velge drivere nå?"
 
-#: ../loader2/loader.c:642
+#: ../loader2/loader.c:640
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Du har ikke nok RAM til å installere %s på denne maskinen."
 
-#: ../loader2/loader.c:778
+#: ../loader2/loader.c:794
 msgid "Rescue Method"
 msgstr "Redningsmetode"
 
-#: ../loader2/loader.c:779
+#: ../loader2/loader.c:795
 msgid "Installation Method"
 msgstr "Installasjonsmetode"
 
-#: ../loader2/loader.c:781
+#: ../loader2/loader.c:797
 msgid "What type of media contains the rescue image?"
 msgstr "Hvilken type media inneholder redningsbildet?"
 
-#: ../loader2/loader.c:783
+#: ../loader2/loader.c:799
 msgid "What type of media contains the packages to be installed?"
 msgstr "Hvilken type media inneholder pakkene som skal installeres?"
 
-#: ../loader2/loader.c:808
+#: ../loader2/loader.c:824
 msgid "No driver found"
 msgstr "Ingen driver funnet"
 
-#: ../loader2/loader.c:808
+#: ../loader2/loader.c:824
 msgid "Select driver"
 msgstr "Velg driver"
 
-#: ../loader2/loader.c:809
+#: ../loader2/loader.c:825
 msgid "Use a driver disk"
 msgstr "Bruk en driverdisk"
 
-#: ../loader2/loader.c:810
+#: ../loader2/loader.c:826
 msgid ""
 "Unable to find any devices of the type needed for this installation type.  "
 "Would you like to manually select your driver or use a driver disk?"
@@ -6810,34 +6794,34 @@ msgstr ""
 "Kan ikke finne noen enhter av typen som kreves for denne installasjonstypen. "
 "Vil du velge din driver manuelt eller bruke en driverdiskett?"
 
-#: ../loader2/loader.c:964
+#: ../loader2/loader.c:987
 msgid "The following devices have been found on your system."
 msgstr "Følgende enheter ble funnet på ditt system."
 
-#: ../loader2/loader.c:966
+#: ../loader2/loader.c:989
 msgid ""
 "No device drivers have been loaded for your system.  Would you like to load "
 "any now?"
 msgstr ""
 "Ingen enhetsdrivere er lastet for ditt system. Ønsker du å gjøre dette nå?"
 
-#: ../loader2/loader.c:970
+#: ../loader2/loader.c:993
 msgid "Devices"
 msgstr "Enheter"
 
-#: ../loader2/loader.c:971
+#: ../loader2/loader.c:994
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../loader2/loader.c:972
+#: ../loader2/loader.c:995
 msgid "Add Device"
 msgstr "Legg til enhet"
 
-#: ../loader2/loader.c:1073
+#: ../loader2/loader.c:1096
 msgid "loader has already been run.  Starting shell."
 msgstr ""
 
-#: ../loader2/loader.c:1404
+#: ../loader2/loader.c:1427
 #, c-format
 msgid "Running anaconda, the %s system installer - please wait...\n"
 msgstr "Kjører anaconda, installeringsprogrammet for %s...\n"
@@ -6940,7 +6924,7 @@ msgstr ""
 msgid "Checksum Test"
 msgstr "Test av sjekksum"
 
-#: ../loader2/modules.c:915
+#: ../loader2/modules.c:917
 #, fuzzy, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Ugyldig argument til HD-kommando for kickstart %s: %s"
@@ -6992,7 +6976,7 @@ msgstr "Du skrev inn en ugyldig IP-adresse."
 msgid "Dynamic IP"
 msgstr "Dynamisk IP"
 
-#: ../loader2/net.c:227 ../loader2/net.c:230 ../loader2/net.c:479
+#: ../loader2/net.c:227 ../loader2/net.c:479
 #, c-format
 msgid "Sending request for IP information for %s..."
 msgstr "Sender forespørsel om IP-informasjon for %s..."
@@ -7038,7 +7022,7 @@ msgstr "Manglende informasjon"
 msgid "You must enter both a valid IP address and a netmask."
 msgstr "Du må skrive inn både en gyldig IP-adresse og en nettmaske."
 
-#: ../loader2/net.c:636 ../loader2/net.c:638
+#: ../loader2/net.c:636
 msgid "Determining host name and domain..."
 msgstr "Undersøker vertsnavn og domene..."
 
@@ -7068,7 +7052,7 @@ msgstr ""
 msgid "NFS server name:"
 msgstr "Navn på NFS-tjener:"
 
-#: ../loader2/nfsinstall.c:47 ../loader2/urls.c:280
+#: ../loader2/nfsinstall.c:47 ../loader2/urls.c:284
 msgid "Red Hat directory:"
 msgstr "Red Hat katalog:"
 
@@ -7121,58 +7105,58 @@ msgstr "Må oppgi et --url argument til kickstartmetoden for URL."
 msgid "Unknown Url method %s"
 msgstr "Ukjent URL-metode %s"
 
-#: ../loader2/urls.c:171
+#: ../loader2/urls.c:172
 #, c-format
 msgid "Failed to log into %s: %s"
 msgstr "Klarte ikke logge inn på %s: %s"
 
-#: ../loader2/urls.c:181 ../loader2/urls.c:189
+#: ../loader2/urls.c:182 ../loader2/urls.c:190
 #, c-format
 msgid "Failed to retrieve %s: %s"
 msgstr "Klarte ikke å hente %s: %s"
 
-#: ../loader2/urls.c:194
+#: ../loader2/urls.c:196
 msgid "Retrieving"
 msgstr "Henter"
 
-#: ../loader2/urls.c:276
+#: ../loader2/urls.c:280
 msgid "FTP site name:"
 msgstr "Navn på FTP-område:"
 
-#: ../loader2/urls.c:277
+#: ../loader2/urls.c:281
 msgid "Web site name:"
 msgstr "Navn på WWW-område:"
 
-#: ../loader2/urls.c:294
+#: ../loader2/urls.c:298
 msgid "Use non-anonymous ftp"
 msgstr "Bruk ikke-anonym ftp"
 
-#: ../loader2/urls.c:303
+#: ../loader2/urls.c:307
 msgid "FTP Setup"
 msgstr "FTP-oppsett"
 
-#: ../loader2/urls.c:304
+#: ../loader2/urls.c:308
 msgid "HTTP Setup"
 msgstr "HTTP-oppsett"
 
-#: ../loader2/urls.c:314
+#: ../loader2/urls.c:318
 msgid "You must enter a server name."
 msgstr "Du må skrive inn et tjenernavn."
 
-#: ../loader2/urls.c:319
+#: ../loader2/urls.c:323
 msgid "You must enter a directory."
 msgstr "Du må skrive inn en katalog."
 
-#: ../loader2/urls.c:324
+#: ../loader2/urls.c:328
 msgid "Unknown Host"
 msgstr "Ukjent vert"
 
-#: ../loader2/urls.c:325
+#: ../loader2/urls.c:329
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s er ikke et gyldig vertsnavn."
 
-#: ../loader2/urls.c:398
+#: ../loader2/urls.c:402
 msgid ""
 "If you are using non anonymous ftp, enter the account name and password you "
 "wish to use below."
@@ -7181,7 +7165,7 @@ msgstr ""
 "å bruke nedenfor. Hvis du bruker en FTP-proxy, skriv inn navnet til FTP-"
 "proxytjeneren som skal brukes."
 
-#: ../loader2/urls.c:403
+#: ../loader2/urls.c:407
 msgid ""
 "If you are using a HTTP proxy server enter the name of the HTTP proxy server "
 "to use."
@@ -7189,7 +7173,7 @@ msgstr ""
 "Hvis du bruker en HTTP-proxytjener, skriv inn navnet til HTTP-proxytjeneren "
 "som skal brukes."
 
-#: ../loader2/urls.c:425
+#: ../loader2/urls.c:429
 msgid "Account name:"
 msgstr "Kontonavn:"
 
@@ -7919,6 +7903,92 @@ msgstr "Svensk"
 msgid "Turkish"
 msgstr "Tyrkisk"
 
+#~ msgid ""
+#~ "The default workstation environment includes our recommendations for new "
+#~ "users, including:\n"
+#~ "\n"
+#~ "\tDesktop shell (GNOME)\n"
+#~ "\tOffice suite (OpenOffice)\n"
+#~ "\tWeb browser (Mozilla) \n"
+#~ "\tEmail (Evolution)\n"
+#~ "\tInstant messaging\n"
+#~ "\tSound and video applications\n"
+#~ "\tGames\n"
+#~ "\tSoftware Development Tools\n"
+#~ "\tAdministration Tools\n"
+#~ "\n"
+#~ "After installation, additional software can be added or removed using the "
+#~ "'redhat-config-packages' tool.\n"
+#~ "\n"
+#~ "If you are familiar with %s, you may have specific packages you would "
+#~ "like to install or avoid installing. Check the box below to customize "
+#~ "your installation."
+#~ msgstr ""
+#~ "Forvalgt arbeidsstasjonoppsett inkluderer våre anbefalinger for nye "
+#~ "brukere, deriblant:\n"
+#~ "\n"
+#~ "\tSkrivebordsmiljø (GNOME)\n"
+#~ "\tKontorstøtteprogramvare (OpenOffice)\n"
+#~ "\tNettleser (Mozilla)\n"
+#~ "\tE-post (Evolution)\n"
+#~ "\tInstant Messging\n"
+#~ "\tLyd- og bildeprogrammer\n"
+#~ "\tSpill\n"
+#~ "\tProgramvareutvikling\n"
+#~ "\tAdministrasjonsverktøy\n"
+#~ "\n"
+#~ "Etter installasjonen kan du legge til eller fjerne pakker ved å bruke "
+#~ "verktøyet «redhat-config-package».\n"
+#~ "\n"
+#~ "Hvis du er kjent med %s er det mulig at du har spesifikke pakker du "
+#~ "ønsker å installere eller unngå at blir installert. Kryss av i boksen "
+#~ "under for å tilpasse din installasjon."
+
+#~ msgid "Personal Desktop Defaults"
+#~ msgstr "Forvalg for personlig skrivebord"
+
+#~ msgid "Firewall Configuration"
+#~ msgstr "Brannvegg-konfigurasjon"
+
+#~ msgid "Select a security level for the system:  "
+#~ msgstr "Velg sikkerhetsnivå for systemet: "
+
+#~ msgid "Hi_gh"
+#~ msgstr "H_øyt"
+
+#~ msgid "_Medium"
+#~ msgstr "_Middels"
+
+#~ msgid "Use _default firewall rules"
+#~ msgstr "Bruk _forvalgt regelsett for brannvegg"
+
+#~ msgid "_Customize"
+#~ msgstr "_Tilpass"
+
+#~ msgid ""
+#~ "A firewall protects against unauthorized network intrusions. High "
+#~ "security blocks all incoming accesses. Medium blocks access to system "
+#~ "services (such as telnet or printing), but allows other connections. No "
+#~ "firewall allows all connections and is not recommended. "
+#~ msgstr ""
+#~ "En brannvegg beskytter mot innbrudd på nettverket. Høy sikkerhet "
+#~ "blokkerer all innkommende trafikk. Medium blokkerer tilgang til "
+#~ "systemtjenester (slik som telnet og utskrift), men tillater andre "
+#~ "tilkoblinger. Ingen brannvegg tillater alle tilkoblinger og er ikke "
+#~ "anbefalt."
+
+#~ msgid "Security Level:"
+#~ msgstr "Sikkerhetsnivå:"
+
+#~ msgid "High"
+#~ msgstr "Høyt"
+
+#~ msgid "Medium"
+#~ msgstr "Middels"
+
+#~ msgid "DHCP"
+#~ msgstr "DHCP"
+
 #~ msgid "DASD partitions can only be deleted with fdasd"
 #~ msgstr "DASD-partisjoner kan kun slettes med fdasd"