make update-poi18n-update-from-sources-07-20-2001

1 files changed, 324 insertions, 288 deletions

diff --git a/po/no.po b/po/no.po
index ecb8a3719..c72455c84 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: 2001-07-10 23:31-0400\n"
+"POT-Creation-Date: 2001-07-12 18:12-0400\n"
 "PO-Revision-Date: 2001-04-03 12:00-0500\n"
 "Last-Translator: Trond Eivind Glomsrød <teg@redhat.com>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -9,34 +9,33 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../autopart.py:715
+#: ../autopart.py:717
 #, c-format
 msgid ""
 "Boot partition %s may not meet booting constraints for your architecture.  "
 "Creation of a boot disk is highly encouraged."
 msgstr ""
 
-#: ../autopart.py:807 ../iw/partition_gui.py:1076
+#: ../autopart.py:826 ../iw/partition_gui.py:1076
 #: ../textw/partition_text.py:142
 #, fuzzy
 msgid "Error Partitioning"
 msgstr "Diskpartisjonering"
 
-#: ../autopart.py:808 ../iw/partition_gui.py:1077
-#: ../textw/partition_text.py:143
+#: ../autopart.py:827 ../textw/partition_text.py:143
 #, fuzzy, c-format
 msgid "Could not allocated requested partitions: %s."
 msgstr "Det finnes ikke-allokerte partisjoner..."
 
-#: ../autopart.py:839 ../harddrive.py:233 ../iw/partition_gui.py:1081
-#: ../iw/partition_gui.py:1380 ../iw/upgrade_swap_gui.py:167
-#: ../iw/upgrade_swap_gui.py:175 ../iw/upgrade_swap_gui.py:182
-#: ../partitioning.py:996 ../textw/partition_text.py:146
-#: ../textw/upgrade_text.py:174
+#: ../autopart.py:858 ../harddrive.py:233 ../iw/partition_gui.py:1081
+#: ../iw/partition_gui.py:1380 ../iw/upgrade_swap_gui.py:169
+#: ../iw/upgrade_swap_gui.py:177 ../iw/upgrade_swap_gui.py:184
+#: ../partitioning.py:997 ../textw/partition_text.py:146
+#: ../textw/upgrade_text.py:179
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../autopart.py:845
+#: ../autopart.py:864
 msgid ""
 "Automatic Partitioning sets up your partitioning based on your installation "
 "type. You also can customize the resulting partitions to meet your needs.\n"
@@ -49,28 +48,28 @@ msgid ""
 "Although it is not as easy to use, there are cases where fdisk is preferred."
 msgstr ""
 
-#: ../autopart.py:861
+#: ../autopart.py:880
 msgid ""
 "Before automatic partitioning can be set up by the installation program, you "
 "must choose how to use the space on hard drives."
 msgstr ""
 
-#: ../autopart.py:866
+#: ../autopart.py:885
 #, fuzzy
 msgid "Remove all partitions on this system"
 msgstr "Fjern Linux-partisjoner"
 
-#: ../autopart.py:867
+#: ../autopart.py:886
 #, fuzzy
 msgid "Remove all Linux Partitions on this system"
 msgstr "Fjern Linux-partisjoner"
 
-#: ../autopart.py:868
+#: ../autopart.py:887
 #, fuzzy
 msgid "Keep all partitions and use existing free space"
 msgstr "Bruk eksisterende ledig plass"
 
-#: ../autopart.py:870
+#: ../autopart.py:889
 #, fuzzy, c-format
 msgid ""
 "WARNING!!\tWARNING!!\n"
@@ -83,7 +82,7 @@ msgstr ""
 "enkelt stasjon.\n"
 " Er du sikker på at du vil gjøre dette?"
 
-#: ../autopart.py:875
+#: ../autopart.py:894
 #, c-format
 msgid ""
 "WARNING!!\tWARNING!!\n"
@@ -93,21 +92,21 @@ msgid ""
 "Are you sure you want to do this?"
 msgstr ""
 
-#: ../bootloader.py:562
+#: ../bootloader.py:565
 #, fuzzy
 msgid "Bootloader"
 msgstr "Bootloader-feil"
 
-#: ../bootloader.py:562
+#: ../bootloader.py:565
 #, fuzzy
 msgid "Installing bootloader..."
 msgstr "Installerer %s.\n"
 
-#: ../comps.py:557
+#: ../comps.py:559
 msgid "Everything"
 msgstr "Alt"
 
-#: ../comps.py:662 ../upgrade.py:351
+#: ../comps.py:669 ../upgrade.py:351
 msgid "no suggestion"
 msgstr "ingen forslag"
 
@@ -135,33 +134,33 @@ msgstr "Oppretter"
 msgid "Creating boot disk..."
 msgstr "Oppretter oppstartsdiskett..."
 
-#: ../fsset.py:563 ../iw/silo_gui.py:173 ../textw/silo_text.py:75
+#: ../fsset.py:570 ../iw/silo_gui.py:173 ../textw/silo_text.py:75
 msgid "Master Boot Record (MBR)"
 msgstr "Master Boot Record (MBR)"
 
-#: ../fsset.py:564 ../iw/silo_gui.py:176 ../textw/silo_text.py:76
+#: ../fsset.py:571 ../iw/silo_gui.py:176 ../textw/silo_text.py:76
 msgid "First sector of boot partition"
 msgstr "Første sektor på oppstartspartisjonen"
 
-#: ../fsset.py:616 ../fsset.py:634 ../fsset.py:668 ../fsset.py:686
-#: ../fsset.py:708 ../fsset.py:727 ../harddrive.py:171 ../image.py:65
+#: ../fsset.py:623 ../fsset.py:641 ../fsset.py:675 ../fsset.py:693
+#: ../fsset.py:715 ../fsset.py:734 ../harddrive.py:171 ../image.py:65
 #: ../image.py:142 ../libfdisk/newtfsedit.c:1746 ../loader/devices.c:259
 #: ../loader/devices.c:266 ../loader/devices.c:435 ../loader/devices.c:480
 #: ../loader/devices.c:500 ../loader/lang.c:27 ../loader/lang.c:102
 #: ../loader/loader.c:478 ../loader/loader.c:535 ../loader/loader.c:912
 #: ../loader/loader.c:967 ../loader/loader.c:1140 ../loader/loader.c:1145
-#: ../loader/loader.c:1185 ../loader/loader.c:1244 ../loader/loader.c:2103
-#: ../loader/loader.c:2133 ../loader/loader.c:2211 ../loader/loader.c:2423
+#: ../loader/loader.c:1185 ../loader/loader.c:1244 ../loader/loader.c:2105
+#: ../loader/loader.c:2135 ../loader/loader.c:2213 ../loader/loader.c:2425
 #: ../loader/pcmcia.c:114 ../loader/pcmcia.c:131 ../loader/urls.c:79
 #: ../loader/urls.c:89 ../loader/urls.c:97 ../loader/urls.c:236
 #: ../loader/urls.c:241 ../packages.py:228 ../partitioning.py:865
 #: ../partitioning.py:896 ../textw/bootdisk_text.py:88
-#: ../textw/upgrade_text.py:162 ../textw/upgrade_text.py:169
-#: ../textw/upgrade_text.py:191 ../upgrade.py:265 ../upgrade.py:277
+#: ../textw/upgrade_text.py:167 ../textw/upgrade_text.py:174
+#: ../textw/upgrade_text.py:196 ../upgrade.py:265 ../upgrade.py:277
 msgid "Error"
 msgstr "Feil"
 
-#: ../fsset.py:617
+#: ../fsset.py:624
 #, fuzzy, c-format
 msgid ""
 "An error occurred trying to initialize swap on device %s.  This problem is "
@@ -175,7 +174,7 @@ msgstr ""
 "\n"
 "Press <Enter> for å starte systemet på nytt."
 
-#: ../fsset.py:635
+#: ../fsset.py:642
 #, fuzzy, c-format
 msgid ""
 "Error enabling swap device %s: %s\n"
@@ -190,7 +189,7 @@ msgstr ""
 "\n"
 "Trykk OK for å starte systemet på nytt."
 
-#: ../fsset.py:669
+#: ../fsset.py:676
 #, fuzzy, c-format
 msgid ""
 "An error occurred searching for bad blocks on %s.  This problem is serious, "
@@ -204,7 +203,7 @@ msgstr ""
 "\n"
 "Press <Enter> for å starte systemet på nytt."
 
-#: ../fsset.py:687
+#: ../fsset.py:694
 #, fuzzy, c-format
 msgid ""
 "An error occurred trying to format %s.  This problem is serious, and the "
@@ -218,7 +217,7 @@ msgstr ""
 "\n"
 "Press <Enter> for å starte systemet på nytt."
 
-#: ../fsset.py:709
+#: ../fsset.py:716
 #, fuzzy, c-format
 msgid ""
 "An error occurred trying to migrate %s.  This problem is serious, and the "
@@ -232,7 +231,7 @@ msgstr ""
 "\n"
 "Press <Enter> for å starte systemet på nytt."
 
-#: ../fsset.py:728
+#: ../fsset.py:735
 #, c-format
 msgid ""
 "Error mounting device %s as %s: %s\n"
@@ -247,20 +246,20 @@ msgstr ""
 "\n"
 "Trykk OK for å starte systemet på nytt."
 
-#: ../fsset.py:1195
+#: ../fsset.py:1202
 msgid "Formatting"
 msgstr "Formaterer"
 
-#: ../fsset.py:1196
+#: ../fsset.py:1203
 #, c-format
 msgid "Formatting %s filesystem..."
 msgstr "Formaterer %s-filsystem..."
 
-#: ../gui.py:103 ../text.py:268
+#: ../gui.py:104 ../text.py:268
 msgid "Fix"
 msgstr ""
 
-#: ../gui.py:104 ../iw/partition_gui.py:523 ../iw/partition_gui.py:581
+#: ../gui.py:105 ../iw/partition_gui.py:523 ../iw/partition_gui.py:581
 #: ../iw/welcome_gui.py:101 ../libfdisk/fsedit.c:953
 #: ../libfdisk/gnomefsedit.c:829 ../libfdisk/gnomefsedit.c:1237
 #: ../libfdisk/gnomefsedit.c:1376 ../libfdisk/gnomefsedit.c:1398
@@ -270,12 +269,12 @@ msgstr ""
 #: ../libfdisk/newtfsedit.c:1683 ../libfdisk/newtfsedit.c:1701
 #: ../libfdisk/newtfsedit.c:1788 ../loader/devices.c:230
 #: ../loader/loader.c:816 ../loader/net.c:845 ../text.py:269
-#: ../textw/bootdisk_text.py:25 ../textw/bootloader_text.py:75
-#: ../textw/constants_text.py:32 ../textw/upgrade_text.py:253
+#: ../textw/bootdisk_text.py:25 ../textw/bootloader_text.py:76
+#: ../textw/constants_text.py:32 ../textw/upgrade_text.py:258
 msgid "Yes"
 msgstr "Ja"
 
-#: ../gui.py:105 ../iw/partition_gui.py:525 ../iw/partition_gui.py:583
+#: ../gui.py:106 ../iw/partition_gui.py:525 ../iw/partition_gui.py:583
 #: ../iw/welcome_gui.py:104 ../libfdisk/fsedit.c:953
 #: ../libfdisk/gnomefsedit.c:829 ../libfdisk/gnomefsedit.c:1237
 #: ../libfdisk/gnomefsedit.c:1376 ../libfdisk/gnomefsedit.c:1398
@@ -285,13 +284,13 @@ msgstr "Ja"
 #: ../libfdisk/newtfsedit.c:1683 ../libfdisk/newtfsedit.c:1701
 #: ../libfdisk/newtfsedit.c:1788 ../loader/devices.c:231 ../loader/net.c:845
 #: ../text.py:270 ../textw/bootdisk_text.py:25 ../textw/bootdisk_text.py:54
-#: ../textw/bootloader_text.py:75 ../textw/constants_text.py:36
-#: ../textw/upgrade_text.py:253 ../textw/upgrade_text.py:260
+#: ../textw/bootloader_text.py:76 ../textw/constants_text.py:36
+#: ../textw/upgrade_text.py:258 ../textw/upgrade_text.py:265
 msgid "No"
 msgstr "Nei"
 
 #. code to create dialog in gtk+
-#: ../gui.py:106 ../libfdisk/fsedit.c:922 ../libfdisk/fsedit.c:929
+#: ../gui.py:107 ../libfdisk/fsedit.c:922 ../libfdisk/fsedit.c:929
 #: ../libfdisk/fsedit.c:936 ../libfdisk/fsedit.c:945 ../libfdisk/fsedit.c:972
 #: ../libfdisk/fsedit.c:985 ../libfdisk/fsedit.c:995 ../libfdisk/fsedit.c:1024
 #: ../libfdisk/fsedit.c:1034 ../libfdisk/fsedit.c:1052
@@ -315,37 +314,51 @@ msgstr "Nei"
 #: ../libfdisk/newtfsedit.c:851 ../libfdisk/newtfsedit.c:1480
 #: ../libfdisk/newtfsedit.c:1488 ../libfdisk/newtfsedit.c:1613
 #: ../libfdisk/newtfsedit.c:1634 ../libfdisk/newtfsedit.c:1662
-#: ../libfdisk/newtfsedit.c:1746 ../loader/urls.c:79 ../loader/urls.c:89
-#: ../loader/urls.c:97 ../loader/urls.c:247 ../text.py:271
-#: ../textw/constants_text.py:20 ../textw/fdisk_text.py:40
-#: ../textw/silo_text.py:147 ../textw/silo_text.py:160
+#: ../libfdisk/newtfsedit.c:1746 ../loader/cdrom.c:34 ../loader/devices.c:92
+#: ../loader/devices.c:237 ../loader/devices.c:259 ../loader/devices.c:266
+#: ../loader/devices.c:335 ../loader/devices.c:435 ../loader/devices.c:480
+#: ../loader/devices.c:500 ../loader/devices.c:532 ../loader/kickstart.c:58
+#: ../loader/kickstart.c:68 ../loader/kickstart.c:107 ../loader/lang.c:27
+#: ../loader/lang.c:102 ../loader/lang.c:300 ../loader/lang.c:596
+#: ../loader/loader.c:323 ../loader/loader.c:478 ../loader/loader.c:535
+#: ../loader/loader.c:853 ../loader/loader.c:912 ../loader/loader.c:967
+#: ../loader/loader.c:1061 ../loader/loader.c:1140 ../loader/loader.c:1145
+#: ../loader/loader.c:1185 ../loader/loader.c:1213 ../loader/loader.c:1244
+#: ../loader/loader.c:1483 ../loader/loader.c:2105 ../loader/loader.c:2135
+#: ../loader/loader.c:2198 ../loader/loader.c:2213 ../loader/loader.c:2425
+#: ../loader/net.c:185 ../loader/net.c:272 ../loader/net.c:357
+#: ../loader/net.c:678 ../loader/net.c:711 ../loader/pcmcia.c:104
+#: ../loader/pcmcia.c:114 ../loader/pcmcia.c:131 ../loader/urls.c:158
+#: ../loader/urls.c:236 ../loader/urls.c:241 ../loader/urls.c:387
+#: ../text.py:271 ../textw/fdisk_text.py:40 ../textw/silo_text.py:147
+#: ../textw/silo_text.py:160
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gui.py:107 ../libfdisk/fsedit.c:1385 ../libfdisk/fsedit.c:1463
+#: ../gui.py:108 ../libfdisk/fsedit.c:1385 ../libfdisk/fsedit.c:1463
 #: ../loader/net.c:277 ../loader/net.c:402 ../text.py:272
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: ../gui.py:108 ../text.py:273
+#: ../gui.py:109 ../text.py:273
 msgid "Ignore"
 msgstr ""
 
-#: ../gui.py:109 ../iw/account_gui.py:135 ../iw/account_gui.py:145
-#: ../iw/bootloader_gui.py:282 ../iw/partition_gui.py:694
-#: ../iw/partition_gui.py:1126 ../libfdisk/gnomefsedit.c:914
-#: ../libfdisk/gnomefsedit.c:2024 ../libfdisk/gnomefsedit.c:2586
-#: ../libfdisk/newtfsedit.c:581 ../libfdisk/newtfsedit.c:1701
-#: ../loader/devices.c:238 ../loader/devices.c:532 ../loader/loader.c:2196
-#: ../loader/pcmcia.c:104 ../text.py:114 ../text.py:115 ../text.py:242
-#: ../text.py:244 ../text.py:274 ../textw/bootloader_text.py:170
-#: ../textw/constants_text.py:24 ../textw/silo_text.py:147
-#: ../textw/silo_text.py:165 ../textw/userauth_text.py:75
-#: ../textw/welcome_text.py:48 ../textw/welcome_text.py:51
+#: ../gui.py:110 ../iw/account_gui.py:135 ../iw/account_gui.py:145
+#: ../iw/partition_gui.py:694 ../iw/partition_gui.py:1126
+#: ../libfdisk/gnomefsedit.c:914 ../libfdisk/gnomefsedit.c:2024
+#: ../libfdisk/gnomefsedit.c:2586 ../libfdisk/newtfsedit.c:581
+#: ../libfdisk/newtfsedit.c:1701 ../loader/devices.c:238
+#: ../loader/devices.c:532 ../loader/loader.c:2198 ../loader/pcmcia.c:104
+#: ../text.py:114 ../text.py:115 ../text.py:242 ../text.py:244 ../text.py:274
+#: ../textw/bootloader_text.py:171 ../textw/constants_text.py:24
+#: ../textw/silo_text.py:147 ../textw/silo_text.py:165
+#: ../textw/userauth_text.py:75 ../textw/welcome_text.py:48
+#: ../textw/welcome_text.py:51
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../gui.py:191 ../text.py:250
+#: ../gui.py:192 ../text.py:250
 #, fuzzy
 msgid ""
 "An unhandled exception has occured.  This is most likely a bug.  Please copy "
@@ -357,7 +370,7 @@ msgstr ""
 "hele teksten fra unntaksmeldingen og send inn en feilrapport på http://"
 "bugzilla.redhat.com/bugzilla"
 
-#: ../gui.py:305 ../text.py:240
+#: ../gui.py:306 ../text.py:240
 msgid ""
 "Please insert a floppy now. All contents of the disk will be erased, so "
 "please choose your diskette carefully."
@@ -365,32 +378,32 @@ msgstr ""
 "Sett inn en diskett: Alt innhold på disketten vil slettes, så vær forsiktig "
 "når du velger diskett."
 
-#: ../gui.py:368 ../gui.py:727
+#: ../gui.py:369 ../gui.py:728
 msgid "Online Help"
 msgstr "Online hjelp"
 
-#: ../gui.py:369 ../iw/language_gui.py:7 ../textw/language_text.py:43
+#: ../gui.py:370 ../iw/language_gui.py:7 ../textw/language_text.py:43
 msgid "Language Selection"
 msgstr "Valg av språk"
 
-#: ../gui.py:427 ../iw/firewall_gui.py:121 ../libfdisk/gnomefsedit.c:1388
+#: ../gui.py:428 ../iw/firewall_gui.py:121 ../libfdisk/gnomefsedit.c:1388
 #: ../libfdisk/gnomefsedit.c:1405
 msgid "Close"
 msgstr "Lukk"
 
-#: ../gui.py:432 ../gui.py:591
+#: ../gui.py:433 ../gui.py:592
 msgid "Release Notes"
 msgstr "Kommentarer til denne utgaven"
 
-#: ../gui.py:463
+#: ../gui.py:464
 msgid "Unable to load file!"
 msgstr "Kan ikke lese filen!"
 
-#: ../gui.py:484
+#: ../gui.py:485
 msgid "Release notes are missing.\n"
 msgstr ""
 
-#: ../gui.py:587 ../libfdisk/newtfsedit.c:1480 ../libfdisk/newtfsedit.c:1488
+#: ../gui.py:588 ../libfdisk/newtfsedit.c:1480 ../libfdisk/newtfsedit.c:1488
 #: ../loader/cdrom.c:34 ../loader/devices.c:93 ../loader/devices.c:238
 #: ../loader/devices.c:335 ../loader/lang.c:596 ../loader/loader.c:323
 #: ../loader/loader.c:816 ../loader/loader.c:853 ../loader/loader.c:967
@@ -403,33 +416,33 @@ msgstr ""
 msgid "Back"
 msgstr "Tilbake"
 
-#: ../gui.py:589
+#: ../gui.py:590
 msgid "Next"
 msgstr "Neste"
 
-#: ../gui.py:593
+#: ../gui.py:594
 msgid "Show Help"
 msgstr "Vis hjelp"
 
-#: ../gui.py:595
+#: ../gui.py:596
 msgid "Hide Help"
 msgstr "Skjul hjelp"
 
-#: ../gui.py:637
+#: ../gui.py:638
 msgid "Red Hat Linux Installer"
 msgstr "Red Hat Linux installasjon"
 
-#: ../gui.py:652
+#: ../gui.py:653
 #, c-format
 msgid "Red Hat Linux Installer on %s"
 msgstr "Red Hat Linux installasjon på %s"
 
-#: ../gui.py:691
+#: ../gui.py:692
 #, fuzzy
 msgid "Unable to load title bar"
 msgstr "Kan ikke lese filen!"
 
-#: ../gui.py:775
+#: ../gui.py:776
 msgid "Install Window"
 msgstr "Installasjonsvindu"
 
@@ -560,9 +573,9 @@ msgstr ""
 "valgt. Du må ha mer plass på følgende filsystemer:\n"
 "\n"
 
-#: ../iw/partition_gui.py:1316 ../iw/upgrade_swap_gui.py:119
+#: ../iw/partition_gui.py:1316 ../iw/upgrade_swap_gui.py:121
 #: ../libfdisk/gnomefsedit.c:3132 ../packages.py:536 ../packages.py:556
-#: ../textw/upgrade_text.py:111
+#: ../textw/upgrade_text.py:113
 msgid "Mount Point"
 msgstr "Monteringspunkt"
 
@@ -681,7 +694,7 @@ msgstr ""
 msgid "Error mounting filesystem on %s: %s"
 msgstr "Feil under montering av ext2 filsystem på %s: %s"
 
-#: ../partitioning.py:997
+#: ../partitioning.py:998
 #, fuzzy, c-format
 msgid ""
 "The partition table on device %s was unreadable. To create new partitions it "
@@ -692,11 +705,11 @@ msgstr ""
 "Partisjonstabellen på enhet %s er korrupt. For å opprette nye partisjoner må "
 "denne initialiseres. Dette medfører tap av ALLE DATA på denne disken."
 
-#: ../libfdisk/fsedit.c:1052 ../partitioning.py:1074
+#: ../libfdisk/fsedit.c:1052 ../partitioning.py:1075
 msgid "No Drives Found"
 msgstr "Ingen stasjoner funnet"
 
-#: ../partitioning.py:1075
+#: ../partitioning.py:1076
 #, fuzzy
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
@@ -705,7 +718,7 @@ msgstr ""
 "En feil har oppstått - ingen gyldige enheter for oppretting av filsystemer "
 "ble funnet. Vennligst sjekk maskinvaren din for å finne årsaken til dette."
 
-#: ../partitioning.py:1148
+#: ../partitioning.py:1149
 #, fuzzy
 msgid ""
 "You are about to delete a RAID device.\n"
@@ -713,7 +726,7 @@ msgid ""
 "Are you sure?"
 msgstr "Du må velge en RAID-enhet."
 
-#: ../partitioning.py:1151
+#: ../partitioning.py:1152
 #, fuzzy, c-format
 msgid ""
 "You are about to delete the /dev/%s partition.\n"
@@ -722,51 +735,51 @@ msgid ""
 msgstr "Er du sikker på at du vil slette denne partisjonen?"
 
 #: ../libfdisk/gnomefsedit.c:830 ../libfdisk/newtfsedit.c:878
-#: ../partitioning.py:1155
+#: ../partitioning.py:1156
 msgid "Are you sure you want to delete this partition?"
 msgstr "Er du sikker på at du vil slette denne partisjonen?"
 
-#: ../partitioning.py:1157
+#: ../partitioning.py:1158
 #, fuzzy
 msgid "Confirm Delete"
 msgstr "Bekreft: "
 
-#: ../partitioning.py:1161
+#: ../partitioning.py:1162
 #, fuzzy
 msgid "Confirm Reset"
 msgstr "Bekreft: "
 
-#: ../partitioning.py:1162
+#: ../partitioning.py:1163
 #, fuzzy
 msgid ""
 "Are you sure you want to reset the partition table to its original state?"
 msgstr "Er du sikker på at du vil slette denne partisjonen?"
 
-#: ../partitioning.py:1186
+#: ../partitioning.py:1187
 #, fuzzy
 msgid "the partition in use by the installer."
 msgstr "Du må begrense denne partisjonen til én stasjon."
 
-#: ../partitioning.py:1189
+#: ../partitioning.py:1190
 msgid "a partition which is a member of a RAID array."
 msgstr ""
 
-#: ../partitioning.py:1198 ../partitioning.py:1204 ../partitioning.py:1212
-#: ../partitioning.py:1223 ../partitioning.py:1230
+#: ../partitioning.py:1199 ../partitioning.py:1205 ../partitioning.py:1213
+#: ../partitioning.py:1224 ../partitioning.py:1231
 #, fuzzy
 msgid "Unable To Remove"
 msgstr "Kan ikke lese filen!"
 
-#: ../partitioning.py:1199
+#: ../partitioning.py:1200
 #, fuzzy
 msgid "You must first select a partition to remove."
 msgstr "Første sektor på oppstartspartisjonen"
 
-#: ../partitioning.py:1205
+#: ../partitioning.py:1206
 msgid "You cannot remove free space."
 msgstr ""
 
-#: ../partitioning.py:1213
+#: ../partitioning.py:1214
 #, fuzzy, c-format
 msgid ""
 "You cannot remove this partition, as it is an extended partition which "
@@ -775,57 +788,57 @@ msgstr ""
 "Du kan ikke fjerne \"/boot\" hvis \"/\" er på en RAID-enhet. Flytt \"/\" til "
 "en ikke-RAID-enhet først."
 
-#: ../partitioning.py:1224
+#: ../partitioning.py:1225
 msgid ""
 "You cannot remove this partition, as it is holding the data for the hard "
 "drive install."
 msgstr ""
 
-#: ../partitioning.py:1231
+#: ../partitioning.py:1232
 #, fuzzy
 msgid "You cannot remove this partition, as it is part of a RAID device."
 msgstr ""
 "Du kan ikke fjerne \"/boot\" hvis \"/\" er på en RAID-enhet. Flytt \"/\" til "
 "en ikke-RAID-enhet først."
 
-#: ../partitioning.py:1259 ../partitioning.py:1281
+#: ../partitioning.py:1260 ../partitioning.py:1282
 #, fuzzy
 msgid "Unable To Edit"
 msgstr "Kan ikke lese filen!"
 
-#: ../partitioning.py:1260
+#: ../partitioning.py:1261
 #, fuzzy
 msgid "You must select a partition to edit"
 msgstr "Du må velge minst ett språk for installasjon."
 
-#: ../partitioning.py:1282
+#: ../partitioning.py:1283
 #, fuzzy, c-format
 msgid ""
 "You cannot edit this partition, as it is an extended partition which "
 "contains %s"
 msgstr "Du må begrense denne partisjonen til én stasjon."
 
-#: ../partitioning.py:1290 ../partitioning.py:1295
+#: ../partitioning.py:1291 ../partitioning.py:1296
 #, fuzzy
 msgid "Unable to Edit"
 msgstr "Kan ikke lese filen!"
 
-#: ../partitioning.py:1291
+#: ../partitioning.py:1292
 #, fuzzy
 msgid "You cannot edit this partition, as it is in use by the installer."
 msgstr "Du må begrense denne partisjonen til én stasjon."
 
-#: ../partitioning.py:1296
+#: ../partitioning.py:1297
 #, fuzzy
 msgid "You cannot edit this partition as it is part of a RAID device"
 msgstr "Du må begrense denne partisjonen til én stasjon."
 
-#: ../partitioning.py:1317
+#: ../partitioning.py:1318
 #, fuzzy
 msgid "Format?"
 msgstr "Formaterer"
 
-#: ../partitioning.py:1318
+#: ../partitioning.py:1319
 #, fuzzy
 msgid ""
 "You have chosen to format a pre-existing partition.  This will destroy all "
@@ -838,29 +851,14 @@ msgstr ""
 " Er du sikker på at du vil gjøre dette?"
 
 #: ../iw/account_gui.py:134 ../iw/account_gui.py:144
-#: ../iw/bootloader_gui.py:281 ../iw/partition_gui.py:693
-#: ../iw/partition_gui.py:1125 ../loader/cdrom.c:34 ../loader/devices.c:92
-#: ../loader/devices.c:237 ../loader/devices.c:259 ../loader/devices.c:266
-#: ../loader/devices.c:335 ../loader/devices.c:435 ../loader/devices.c:480
-#: ../loader/devices.c:500 ../loader/devices.c:532 ../loader/kickstart.c:58
-#: ../loader/kickstart.c:68 ../loader/kickstart.c:107 ../loader/lang.c:27
-#: ../loader/lang.c:102 ../loader/lang.c:300 ../loader/lang.c:596
-#: ../loader/loader.c:323 ../loader/loader.c:478 ../loader/loader.c:535
-#: ../loader/loader.c:853 ../loader/loader.c:912 ../loader/loader.c:967
-#: ../loader/loader.c:1061 ../loader/loader.c:1140 ../loader/loader.c:1145
-#: ../loader/loader.c:1185 ../loader/loader.c:1213 ../loader/loader.c:1244
-#: ../loader/loader.c:1483 ../loader/loader.c:2103 ../loader/loader.c:2133
-#: ../loader/loader.c:2196 ../loader/loader.c:2211 ../loader/loader.c:2423
-#: ../loader/net.c:185 ../loader/net.c:272 ../loader/net.c:357
-#: ../loader/net.c:678 ../loader/net.c:711 ../loader/pcmcia.c:104
-#: ../loader/pcmcia.c:114 ../loader/pcmcia.c:131 ../loader/urls.c:158
-#: ../loader/urls.c:236 ../loader/urls.c:241 ../loader/urls.c:387
+#: ../iw/partition_gui.py:693 ../iw/partition_gui.py:1125 ../loader/urls.c:79
+#: ../loader/urls.c:89 ../loader/urls.c:97 ../loader/urls.c:247
 #: ../rescue.py:34 ../rescue.py:85 ../rescue.py:106 ../rescue.py:123
 #: ../text.py:380 ../textw/bootdisk_text.py:65 ../textw/bootdisk_text.py:67
 #: ../textw/complete_text.py:36 ../textw/complete_text.py:53
 #: ../textw/confirm_text.py:24 ../textw/confirm_text.py:36
-#: ../textw/firewall_text.py:201 ../textw/network_text.py:134
-#: ../textw/silo_text.py:110 ../xserver.py:50
+#: ../textw/constants_text.py:20 ../textw/firewall_text.py:201
+#: ../textw/network_text.py:134 ../textw/silo_text.py:110 ../xserver.py:50
 msgid "OK"
 msgstr "OK"
 
@@ -868,7 +866,7 @@ msgstr "OK"
 msgid "System to Rescue"
 msgstr "System som skal reddes"
 
-#: ../rescue.py:83 ../textw/upgrade_text.py:210
+#: ../rescue.py:83 ../textw/upgrade_text.py:215
 msgid "What partition holds the root partition of your installation?"
 msgstr "Hvilken partisjon inneholder rotpartisjonen til din installasjon?"
 
@@ -1034,19 +1032,19 @@ msgstr "Gjenoppbygging av RPM-databasen feilet. Ikke mer diskplass?"
 msgid "An error occured when finding the packages to upgrade."
 msgstr "En feil oppsto under søk etter pakker som skal oppgraderes."
 
-#: ../iw/xconfig_gui.py:15 ../textw/xconfig_text.py:470 ../xf86config.py:844
+#: ../iw/xconfig_gui.py:15 ../textw/xconfig_text.py:470 ../xf86config.py:848
 msgid "Video Card"
 msgstr "Skjermkort"
 
-#: ../iw/xconfig_gui.py:17 ../xf86config.py:846
+#: ../iw/xconfig_gui.py:17 ../xf86config.py:850
 msgid "Video Ram"
 msgstr "Minne på skjermkort"
 
-#: ../xf86config.py:849
+#: ../xf86config.py:853
 msgid "X server"
 msgstr "X-tjener"
 
-#: ../xf86config.py:852
+#: ../xf86config.py:856
 msgid "Unable to detect video card"
 msgstr "Kunne ikke finne skjermkort"
 
@@ -1133,11 +1131,13 @@ msgstr "Brukernavn"
 msgid "Full Name:"
 msgstr "Fullt navn"
 
-#: ../iw/account_gui.py:170 ../loader/urls.c:357 ../textw/userauth_text.py:36
+#: ../iw/account_gui.py:170 ../iw/bootloaderpassword_gui.py:59
+#: ../loader/urls.c:357 ../textw/userauth_text.py:36
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../iw/account_gui.py:172 ../textw/bootloader_text.py:350
+#: ../iw/account_gui.py:172 ../iw/bootloaderpassword_gui.py:63
+#: ../textw/bootloader_text.py:351
 #, fuzzy
 msgid "Confirm:"
 msgstr "Bekreft: "
@@ -1155,7 +1155,7 @@ msgstr ""
 msgid "Root Password: "
 msgstr "Root-passord: "
 
-#: ../iw/account_gui.py:272 ../iw/bootloader_gui.py:292
+#: ../iw/account_gui.py:272
 msgid "Confirm: "
 msgstr "Bekreft: "
 
@@ -1175,8 +1175,8 @@ msgstr "Legg til"
 
 #: ../iw/account_gui.py:315 ../iw/partition_gui.py:1305
 #: ../libfdisk/newtfsedit.c:1479 ../libfdisk/newtfsedit.c:1487
-#: ../textw/bootloader_text.py:246 ../textw/fdisk_text.py:40
-#: ../textw/partition_text.py:860 ../textw/silo_text.py:216
+#: ../textw/bootloader_text.py:247 ../textw/fdisk_text.py:40
+#: ../textw/partition_text.py:873 ../textw/silo_text.py:216
 #: ../textw/silo_text.py:238 ../textw/userauth_text.py:211
 msgid "Edit"
 msgstr "Redigér"
@@ -1256,16 +1256,16 @@ msgstr "Admin-tjener:"
 
 #: ../iw/auth_gui.py:195
 #, fuzzy
-msgid "Enable Samba Authentication"
+msgid "Enable SMB Authentication"
 msgstr "Autentisering"
 
 #: ../iw/auth_gui.py:198
 #, fuzzy
-msgid "Samba Server:"
-msgstr "SMB-tjener (Samba)"
+msgid "SMB Server:"
+msgstr "NIS-tjener:"
 
 #: ../iw/auth_gui.py:200
-msgid "Samba Workgroup:"
+msgid "SMB Workgroup:"
 msgstr ""
 
 #: ../iw/auth_gui.py:227
@@ -1282,9 +1282,8 @@ msgid "Kerberos 5"
 msgstr "Bruk Kerberos"
 
 #: ../iw/auth_gui.py:230
-#, fuzzy
-msgid "Samba"
-msgstr "Svalbard"
+msgid "SMB"
+msgstr ""
 
 #: ../iw/bootdisk_gui.py:10
 #, fuzzy
@@ -1320,122 +1319,117 @@ msgid "Skip boot disk creation"
 msgstr "Hopp over oppstartsdiskett"
 
 #: ../iw/bootloader_gui.py:25 ../textw/bootloader_text.py:50
-#: ../textw/bootloader_text.py:105 ../textw/bootloader_text.py:138
-#: ../textw/bootloader_text.py:255 ../textw/bootloader_text.py:332
+#: ../textw/bootloader_text.py:106 ../textw/bootloader_text.py:139
+#: ../textw/bootloader_text.py:256 ../textw/bootloader_text.py:333
 #, fuzzy
 msgid "Boot Loader Configuration"
 msgstr "Skjermkonfigurasjon"
 
-#: ../iw/bootloader_gui.py:225 ../iw/bootloader_gui.py:501
-#: ../iw/silo_gui.py:127 ../iw/silo_gui.py:280 ../iw/upgrade_swap_gui.py:119
-#: ../textw/upgrade_text.py:112
+#: ../iw/bootloader_gui.py:224 ../iw/bootloader_gui.py:419
+#: ../iw/silo_gui.py:127 ../iw/silo_gui.py:280 ../iw/upgrade_swap_gui.py:121
+#: ../textw/upgrade_text.py:114
 msgid "Partition"
 msgstr "Partisjon"
 
-#: ../iw/bootloader_gui.py:228 ../iw/bootloader_gui.py:502
+#: ../iw/bootloader_gui.py:227 ../iw/bootloader_gui.py:420
 #: ../iw/partition_gui.py:1316 ../iw/silo_gui.py:132 ../iw/silo_gui.py:281
 #: ../libfdisk/gnomefsedit.c:3136
 msgid "Type"
 msgstr "Type"
 
-#: ../iw/bootloader_gui.py:280
-#, fuzzy
-msgid "GRUB Password"
-msgstr "Root-passord"
-
-#: ../iw/bootloader_gui.py:289
-#, fuzzy
-msgid "Bootloader Password: "
-msgstr "Root-passord: "
-
-#: ../iw/bootloader_gui.py:319 ../textw/bootloader_text.py:379
-#, fuzzy
-msgid "Passwords Do Not Match"
-msgstr "Root-passordene er ikke like."
-
-#: ../iw/bootloader_gui.py:320 ../textw/bootloader_text.py:380
-#, fuzzy
-msgid "Passwords do not match"
-msgstr "Root-passordene er ikke like."
-
-#: ../iw/bootloader_gui.py:351
+#: ../iw/bootloader_gui.py:298
 #, fuzzy
 msgid "Install Boot Loader record on:"
 msgstr "Installér oppstartslaster på:"
 
-#: ../iw/bootloader_gui.py:372
+#: ../iw/bootloader_gui.py:319
 #, fuzzy
 msgid "Kernel Parameters"
 msgstr "Parametere for kjerne"
 
-#: ../iw/bootloader_gui.py:387
+#: ../iw/bootloader_gui.py:334
 msgid ""
 "Please select the boot loader that the computer will use.  GRUB is the "
 "default boot loader. However, if you do not wish to overwrite your current "
 "boot loader, select \"Do not install a boot loader.\"  "
 msgstr ""
 
-#: ../iw/bootloader_gui.py:394 ../iw/silo_gui.py:257
-#: ../textw/bootloader_text.py:231 ../textw/silo_text.py:207
+#: ../iw/bootloader_gui.py:341 ../iw/silo_gui.py:257
+#: ../textw/bootloader_text.py:232 ../textw/silo_text.py:207
 #: ../textw/xconfig_text.py:374 ../textw/xconfig_text.py:381
 #: ../textw/xconfig_text.py:474 ../textw/xconfig_text.py:475
 #: ../textw/xconfig_text.py:494 ../textw/xconfig_text.py:495
 msgid "Default"
 msgstr "Standard"
 
-#: ../iw/bootloader_gui.py:394 ../iw/mouse_gui.py:145
+#: ../iw/bootloader_gui.py:341 ../iw/mouse_gui.py:145
 #: ../iw/partition_gui.py:1315 ../iw/silo_gui.py:257
-#: ../libfdisk/gnomefsedit.c:3133 ../textw/bootloader_text.py:164
-#: ../textw/bootloader_text.py:231 ../textw/mouse_text.py:38
+#: ../libfdisk/gnomefsedit.c:3133 ../textw/bootloader_text.py:165
+#: ../textw/bootloader_text.py:232 ../textw/mouse_text.py:38
 #: ../textw/silo_text.py:142 ../textw/silo_text.py:207
 msgid "Device"
 msgstr "Enhet"
 
-#: ../iw/bootloader_gui.py:395 ../iw/silo_gui.py:257
-#: ../textw/bootloader_text.py:231 ../textw/silo_text.py:207
+#: ../iw/bootloader_gui.py:342 ../iw/silo_gui.py:257
+#: ../textw/bootloader_text.py:232 ../textw/silo_text.py:207
 msgid "Partition type"
 msgstr "Partisjonstype"
 
-#: ../iw/bootloader_gui.py:395 ../iw/bootloader_gui.py:512
-#: ../iw/silo_gui.py:257 ../iw/silo_gui.py:292 ../textw/bootloader_text.py:165
-#: ../textw/bootloader_text.py:231 ../textw/silo_text.py:143
+#: ../iw/bootloader_gui.py:342 ../iw/bootloader_gui.py:430
+#: ../iw/silo_gui.py:257 ../iw/silo_gui.py:292 ../textw/bootloader_text.py:166
+#: ../textw/bootloader_text.py:232 ../textw/silo_text.py:143
 #: ../textw/silo_text.py:207
 msgid "Boot label"
 msgstr "Oppstartsnavn"
 
-#: ../iw/bootloader_gui.py:399
+#: ../iw/bootloader_gui.py:346
 msgid "Use GRUB as the boot loader"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:400
+#: ../iw/bootloader_gui.py:347
 msgid "Use LILO as the boot loader"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:401
+#: ../iw/bootloader_gui.py:348
 #, fuzzy
 msgid "Do not install a boot loader"
 msgstr "Installér system"
 
-#: ../iw/bootloader_gui.py:432
+#: ../iw/bootloader_gui.py:427 ../iw/silo_gui.py:288
+msgid "Default boot image"
+msgstr "Sett standard bootfil"
+
+#: ../iw/bootloaderpassword_gui.py:27
+#, fuzzy
+msgid "Password accepted."
+msgstr "Root-passord godtatt."
+
+#: ../iw/bootloaderpassword_gui.py:32
+#, fuzzy
+msgid "Password is too short."
+msgstr "Root-passord er for kort."
+
+#: ../iw/bootloaderpassword_gui.py:34
+#, fuzzy
+msgid "Passwords do not match."
+msgstr "Root-passordene er ikke like."
+
+#: ../iw/bootloaderpassword_gui.py:49 ../textw/bootloader_text.py:328
 msgid ""
 "A GRUB password prevents users from passing arbitrary options to the "
 "kernel.  For highest security, we recommend setting a password, but this is "
 "not necessary for more casual users."
 msgstr ""
 
-#: ../iw/bootloader_gui.py:439
+#: ../iw/bootloaderpassword_gui.py:56
 #, fuzzy
 msgid "Use a GRUB Password?"
 msgstr "Bruk skyggepassord"
 
-#: ../iw/bootloader_gui.py:441
+#: ../iw/bootloaderpassword_gui.py:81
 #, fuzzy
-msgid "Set Password"
-msgstr "Root-passord"
-
-#: ../iw/bootloader_gui.py:509 ../iw/silo_gui.py:288
-msgid "Default boot image"
-msgstr "Sett standard bootfil"
+msgid "Please enter password"
+msgstr "Vennligst skriv inn brukers passord."
 
 #: ../iw/confirm_gui.py:43
 msgid "About to Install"
@@ -1571,7 +1565,7 @@ msgstr ""
 msgid "Please select the device containing the root filesystem: "
 msgstr "Vennligst velg enheten som inneholder rotfilsystemet: "
 
-#: ../iw/examine_gui.py:76 ../textw/upgrade_text.py:224
+#: ../iw/examine_gui.py:76 ../textw/upgrade_text.py:229
 #, c-format
 msgid "Upgrading the Red Hat Linux installation on partition /dev/%s"
 msgstr "Oppgraderer Red Hat Linux-systemet på partisjonen /dev/%s"
@@ -1648,36 +1642,36 @@ msgstr "Velg partisjoner som skal formateres"
 msgid "Installation Type"
 msgstr "Installasjonstype"
 
-#: ../iw/keyboard_gui.py:21
+#: ../iw/keyboard_gui.py:28
 msgid "Keyboard Configuration"
 msgstr "Konfigurasjon av tastatur"
 
-#: ../iw/keyboard_gui.py:97
+#: ../iw/keyboard_gui.py:103
 #, fuzzy
 msgid "Which model keyboard is attached to the computer?"
 msgstr "Hvilken type tastatur brukes på denne datamaskinen?"
 
-#: ../iw/keyboard_gui.py:106
+#: ../iw/keyboard_gui.py:112
 msgid "Model"
 msgstr "Modell"
 
-#: ../iw/keyboard_gui.py:126
+#: ../iw/keyboard_gui.py:132
 msgid "Layout"
 msgstr "Utforming"
 
-#: ../iw/keyboard_gui.py:146
+#: ../iw/keyboard_gui.py:152
 msgid "Dead Keys"
 msgstr "Døde taster"
 
-#: ../iw/keyboard_gui.py:156
+#: ../iw/keyboard_gui.py:162
 msgid "Enable dead keys"
 msgstr "Bruk døde taster"
 
-#: ../iw/keyboard_gui.py:157
+#: ../iw/keyboard_gui.py:163
 msgid "Disable dead keys"
 msgstr "Ikke bruk døde taster"
 
-#: ../iw/keyboard_gui.py:170
+#: ../iw/keyboard_gui.py:176
 msgid "Test your selection here:"
 msgstr "Test ditt valg her:"
 
@@ -1709,7 +1703,7 @@ msgid "Select all"
 msgstr "Velg alle"
 
 #: ../iw/language_support_gui.py:210 ../iw/partition_gui.py:1307
-#: ../textw/language_text.py:116
+#: ../textw/language_text.py:115
 msgid "Reset"
 msgstr "Nullstill"
 
@@ -1896,7 +1890,7 @@ msgstr ""
 msgid "Fill to maximum allowable size"
 msgstr ""
 
-#: ../iw/partition_gui.py:691 ../textw/partition_text.py:501
+#: ../iw/partition_gui.py:691 ../textw/partition_text.py:510
 #, fuzzy
 msgid "Add Partition"
 msgstr "Partisjon"
@@ -1928,7 +1922,7 @@ msgstr "Stasjon"
 
 #: ../iw/partition_gui.py:758 ../iw/partition_gui.py:793
 #: ../textw/partition_text.py:254 ../textw/partition_text.py:337
-#: ../textw/partition_text.py:559
+#: ../textw/partition_text.py:569
 #, fuzzy
 msgid "Size (MB):"
 msgstr "Størrelse (MB)"
@@ -1964,17 +1958,22 @@ msgstr "Rotpartisjon"
 msgid "Check for bad blocks?"
 msgstr "Sjekk etter dårlige blokker under formatering"
 
-#: ../iw/partition_gui.py:893 ../textw/partition_text.py:542
+#: ../iw/partition_gui.py:893 ../textw/partition_text.py:552
 msgid "Force to be a primary partition"
 msgstr ""
 
 #: ../iw/partition_gui.py:971 ../iw/partition_gui.py:980
 #: ../iw/partition_gui.py:1018 ../iw/partition_gui.py:1261
-#: ../textw/partition_text.py:666 ../textw/partition_text.py:682
-#: ../textw/partition_text.py:778
+#: ../textw/partition_text.py:676 ../textw/partition_text.py:692
+#: ../textw/partition_text.py:788
 msgid "Error With Request"
 msgstr ""
 
+#: ../iw/partition_gui.py:1077
+#, fuzzy, c-format
+msgid "Could not allocate requested partitions: %s."
+msgstr "Det finnes ikke-allokerte partisjoner..."
+
 #: ../iw/partition_gui.py:1083 ../textw/partition_text.py:147
 #, fuzzy
 msgid "Modify Partition"
@@ -2010,15 +2009,15 @@ msgid "Raid Members:"
 msgstr ""
 
 #: ../iw/partition_gui.py:1199
-msgid "Number of spares?:"
+msgid "Number of spares:"
 msgstr ""
 
-#: ../iw/partition_gui.py:1206 ../textw/partition_text.py:733
+#: ../iw/partition_gui.py:1206 ../textw/partition_text.py:743
 #, fuzzy
 msgid "Format partition?"
 msgstr "Rotpartisjon"
 
-#: ../iw/partition_gui.py:1304 ../textw/partition_text.py:860
+#: ../iw/partition_gui.py:1304 ../textw/partition_text.py:873
 msgid "New"
 msgstr "Ny"
 
@@ -2040,7 +2039,7 @@ msgstr ""
 msgid "Format"
 msgstr "Formaterer"
 
-#: ../iw/partition_gui.py:1362 ../textw/partition_text.py:908
+#: ../iw/partition_gui.py:1362 ../textw/partition_text.py:933
 msgid "Automatic Partitioning"
 msgstr "Automatisk partisjonering"
 
@@ -2055,7 +2054,7 @@ msgstr "Du må velge minst ett språk for installasjon."
 msgid "I want to have automatic partitioning:"
 msgstr "Automatisk partisjonering"
 
-#: ../iw/partition_gui.py:1451 ../textw/partition_text.py:931
+#: ../iw/partition_gui.py:1451 ../textw/partition_text.py:956
 #, fuzzy
 msgid "Which drive(s) do you want to use for this installation?"
 msgstr "Hvor vil du installere oppstartslasteren?"
@@ -2159,7 +2158,7 @@ msgstr "Lag oppstartsdiskett"
 msgid "Do not install SILO"
 msgstr "Ikke installer SILO"
 
-#: ../iw/timezone_gui.py:31 ../textw/timezone_text.py:98
+#: ../iw/timezone_gui.py:31 ../textw/timezone_text.py:95
 msgid "Time Zone Selection"
 msgstr "Valg av tidssone"
 
@@ -2215,19 +2214,27 @@ msgstr ""
 "konfigurert,\n"
 "men du kan opprette mer swap på et av dine filsystemer nå."
 
-#: ../iw/upgrade_swap_gui.py:105
+#: ../iw/upgrade_swap_gui.py:95
+#, c-format
+msgid ""
+"\n"
+"\n"
+"The installer has detected %s MB of RAM.\n"
+msgstr ""
+
+#: ../iw/upgrade_swap_gui.py:107
 msgid "I want to create a swap file"
 msgstr "Jeg ønsker å lage en swapfil."
 
-#: ../iw/upgrade_swap_gui.py:114
+#: ../iw/upgrade_swap_gui.py:116
 msgid "Select the partition to put the swap file on:"
 msgstr "Velg partisjonen å legge swapfilen på:"
 
-#: ../iw/upgrade_swap_gui.py:119
+#: ../iw/upgrade_swap_gui.py:121
 msgid "Free Space (MB)"
 msgstr "Fri diskplass (Mb)"
 
-#: ../iw/upgrade_swap_gui.py:134
+#: ../iw/upgrade_swap_gui.py:136
 #, c-format
 msgid ""
 "It is recommended that your swap file be at least %d MB.  Please enter a "
@@ -2235,15 +2242,15 @@ msgid ""
 msgstr ""
 "Det anbefales at swapfilen er minst %d MB. Oppgi en størelse for swapfilen:"
 
-#: ../iw/upgrade_swap_gui.py:149 ../textw/upgrade_text.py:130
+#: ../iw/upgrade_swap_gui.py:151 ../textw/upgrade_text.py:135
 msgid "Swap file size (MB):"
 msgstr "Størrelse på swapfil(MB):"
 
-#: ../iw/upgrade_swap_gui.py:158
+#: ../iw/upgrade_swap_gui.py:160
 msgid "I don't want to create a swap file"
 msgstr "Jeg ønsker ikke å lage en swapfil."
 
-#: ../iw/upgrade_swap_gui.py:168
+#: ../iw/upgrade_swap_gui.py:170
 msgid ""
 "It is stongly recommended that you create a swap file.  Failure to do so "
 "could cause the installer to abort abnormally.  Are you sure that you wish "
@@ -2254,11 +2261,11 @@ msgstr ""
 "sikker\n"
 "på at du vil fortsette?"
 
-#: ../iw/upgrade_swap_gui.py:176 ../textw/upgrade_text.py:175
+#: ../iw/upgrade_swap_gui.py:178 ../textw/upgrade_text.py:180
 msgid "The swap file must be between 1 and 2000 MB in size."
 msgstr "Størrelsen på swapfilen må være mellom 1 og 2000 MB."
 
-#: ../iw/upgrade_swap_gui.py:183 ../textw/upgrade_text.py:170
+#: ../iw/upgrade_swap_gui.py:185 ../textw/upgrade_text.py:175
 msgid ""
 "There is not enough space on the device you selected for the swap partition."
 msgstr "Det er ikke nok plass på enheten du oppga for swapområdet."
@@ -2451,13 +2458,13 @@ msgid "Boot Disk"
 msgstr "Oppstartsdiskett"
 
 #: ../textw/bootdisk_text.py:67 ../textw/bootdisk_text.py:93
-#: ../textw/silo_text.py:36 ../textw/upgrade_text.py:123
+#: ../textw/silo_text.py:36 ../textw/upgrade_text.py:125
 msgid "Skip"
 msgstr "Hopp over"
 
 #: ../textw/bootloader_text.py:29
 #, fuzzy
-msgid "Which bootloader would you like to use?"
+msgid "Which boot loader would you like to use?"
 msgstr "Hvilken enhet ønsker du å legge til?"
 
 #: ../textw/bootloader_text.py:45
@@ -2473,12 +2480,12 @@ msgstr ""
 msgid "No Boot Loader"
 msgstr "Bootloader-feil"
 
-#: ../textw/bootloader_text.py:65
+#: ../textw/bootloader_text.py:66
 #, fuzzy
 msgid "Skip Boot Loader"
 msgstr "Bootloader-feil"
 
-#: ../textw/bootloader_text.py:66
+#: ../textw/bootloader_text.py:67
 #, fuzzy
 msgid ""
 "You have elected to not install any boot loader. It is strongly recommended "
@@ -2494,7 +2501,7 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil hoppe over LILO?"
 
-#: ../textw/bootloader_text.py:94 ../textw/silo_text.py:25
+#: ../textw/bootloader_text.py:95 ../textw/silo_text.py:25
 msgid ""
 "A few systems will need to pass special options to the kernel at boot time "
 "for the system to function properly. If you need to pass boot options to the "
@@ -2506,33 +2513,33 @@ msgstr ""
 "oppstartsflagg til kjernen, skriv dem inn nå. Hvis du ikke trenger dette, "
 "eller ikke er sikker, kan du la dette stå tomt."
 
-#: ../textw/bootloader_text.py:139
+#: ../textw/bootloader_text.py:140
 #, fuzzy
 msgid "Where do you want to install the boot loader?"
 msgstr "Hvor vil du installere oppstartslasteren?"
 
-#: ../textw/bootloader_text.py:169 ../textw/silo_text.py:147
+#: ../textw/bootloader_text.py:170 ../textw/silo_text.py:147
 #: ../textw/silo_text.py:168
 msgid "Clear"
 msgstr "Slett"
 
-#: ../textw/bootloader_text.py:178
+#: ../textw/bootloader_text.py:179
 msgid "Edit Boot Label Please"
 msgstr "Vennligst redigér oppstartsnavn"
 
-#: ../textw/bootloader_text.py:196 ../textw/bootloader_text.py:201
+#: ../textw/bootloader_text.py:197 ../textw/bootloader_text.py:202
 msgid "Invalid Boot Label"
 msgstr "Ugyldig oppstartsnavn"
 
-#: ../textw/bootloader_text.py:197
+#: ../textw/bootloader_text.py:198
 msgid "Boot label may not be empty."
 msgstr "Oppstartsnavnet kan ikke være tomt."
 
-#: ../textw/bootloader_text.py:202
+#: ../textw/bootloader_text.py:203
 msgid "Boot label contains illegal characters."
 msgstr "Oppstartsnavnet inneholder ugyldige tegn."
 
-#: ../textw/bootloader_text.py:250 ../textw/silo_text.py:219
+#: ../textw/bootloader_text.py:251 ../textw/silo_text.py:219
 msgid ""
 "The boot manager Red Hat uses can boot other operating systems as well. You "
 "need to tell me what partitions you would like to be able to boot and what "
@@ -2542,23 +2549,26 @@ msgstr ""
 "også. Du må fortelle hvilke partisjoner du ønsker å starte andre systemer "
 "fra og hvilket navn du vil gi hvert av dem."
 
-#: ../textw/bootloader_text.py:327
-msgid ""
-"A GRUB password prevents users from passing arbitraryoptions to the kernel.  "
-"For highest security, werecommend setting a password, but this is "
-"notnecessary for more casual users."
-msgstr ""
-
-#: ../textw/bootloader_text.py:337
+#: ../textw/bootloader_text.py:338
 #, fuzzy
 msgid "Use a GRUB Password"
 msgstr "Bruk skyggepassord"
 
-#: ../textw/bootloader_text.py:349
+#: ../textw/bootloader_text.py:350
 #, fuzzy
 msgid "Boot Loader Password:"
 msgstr "Root-passord: "
 
+#: ../textw/bootloader_text.py:380
+#, fuzzy
+msgid "Passwords Do Not Match"
+msgstr "Root-passordene er ikke like."
+
+#: ../textw/bootloader_text.py:381
+#, fuzzy
+msgid "Passwords do not match"
+msgstr "Root-passordene er ikke like."
+
 #: ../textw/complete_text.py:20
 msgid "<Return> to reboot"
 msgstr "<Enter> for å starte på nytt"
@@ -2678,7 +2688,7 @@ msgid "Other ports"
 msgstr "Andre porter"
 
 #: ../textw/firewall_text.py:135 ../textw/firewall_text.py:199
-#: ../textw/language_text.py:153
+#: ../textw/language_text.py:152
 msgid "Invalid Choice"
 msgstr "Ugyldig valg"
 
@@ -2716,27 +2726,27 @@ msgstr "Tastaturvalg"
 msgid "Which model keyboard is attached to this computer?"
 msgstr "Hvilken type tastatur brukes på denne datamaskinen?"
 
-#: ../textw/language_text.py:116
+#: ../textw/language_text.py:115
 msgid "Select All"
 msgstr "Velg alle"
 
-#: ../textw/language_text.py:118
+#: ../textw/language_text.py:117
 msgid "Choose additional languages that you would like to use on this system:"
 msgstr ""
 
-#: ../textw/language_text.py:122
+#: ../textw/language_text.py:121
 msgid "Language Support"
 msgstr "Språkstøtte"
 
-#: ../textw/language_text.py:154
+#: ../textw/language_text.py:153
 msgid "You must select at least one language to install."
 msgstr "Du må velge minst ett språk for installasjon."
 
-#: ../textw/language_text.py:182
+#: ../textw/language_text.py:181
 msgid "Default Language"
 msgstr "Standardspråk"
 
-#: ../textw/language_text.py:183
+#: ../textw/language_text.py:182
 #, fuzzy
 msgid "Choose the default language for this system: "
 msgstr "Velg et standardspråk:   "
@@ -2863,7 +2873,7 @@ msgstr ""
 msgid "Number of spares?"
 msgstr ""
 
-#: ../textw/partition_text.py:408 ../textw/partition_text.py:581
+#: ../textw/partition_text.py:408 ../textw/partition_text.py:591
 #, fuzzy
 msgid "Filesystem Options"
 msgstr "Formatering av filsystem"
@@ -2877,7 +2887,7 @@ msgstr ""
 "Vennligst velg hvilket verktøy du vil bruke for å partisjonere ditt system "
 "for Red Hat Linux."
 
-#: ../textw/partition_text.py:417 ../textw/partition_text.py:545
+#: ../textw/partition_text.py:417 ../textw/partition_text.py:555
 #, fuzzy
 msgid "Check for bad blocks"
 msgstr "Sjekk etter dårlige blokker under formatering"
@@ -2890,58 +2900,58 @@ msgstr ""
 msgid "Migrate to:"
 msgstr ""
 
-#: ../textw/partition_text.py:555
+#: ../textw/partition_text.py:565
 #, fuzzy
 msgid "Filesystem Type:"
 msgstr "Størrelse på rot-filsystem"
 
-#: ../textw/partition_text.py:563
+#: ../textw/partition_text.py:573
 #, fuzzy
 msgid "Filesystem Option:"
 msgstr "Størrelse på rot-filsystem"
 
-#: ../textw/partition_text.py:589
+#: ../textw/partition_text.py:599
 #, c-format
 msgid "Format as %s"
 msgstr ""
 
-#: ../textw/partition_text.py:591
+#: ../textw/partition_text.py:601
 #, c-format
 msgid "Migrate to %s"
 msgstr ""
 
-#: ../textw/partition_text.py:593
+#: ../textw/partition_text.py:603
 #, fuzzy
 msgid "Leave unchanged"
 msgstr "Lagre endringer"
 
-#: ../textw/partition_text.py:708
+#: ../textw/partition_text.py:718
 #, fuzzy
 msgid "Make RAID Device"
 msgstr "_Opprett RAID-enhet"
 
-#: ../textw/partition_text.py:850
+#: ../textw/partition_text.py:863
 #, fuzzy
 msgid "Partitioning"
 msgstr "Partisjon"
 
-#: ../textw/partition_text.py:860
+#: ../textw/partition_text.py:873
 #, fuzzy
 msgid "RAID"
 msgstr "<RAID>"
 
-#: ../textw/partition_text.py:863
+#: ../textw/partition_text.py:876
 #, fuzzy
 msgid ""
 "    F1-Help     F2-New      F3-Edit   F4-Delete    F5-Reset    F12-Ok        "
 msgstr ""
 "    F1-Hjelp    F2-Legg til F3-Redigér F4-Slett    F5-Nullstill F12-Ok       "
 
-#: ../libfdisk/newtfsedit.c:1613 ../textw/partition_text.py:887
+#: ../libfdisk/newtfsedit.c:1613 ../textw/partition_text.py:903
 msgid "No Root Partition"
 msgstr "Ingen rotpartisjon"
 
-#: ../textw/partition_text.py:888
+#: ../textw/partition_text.py:904
 #, fuzzy
 msgid "Must have a / partition to install on."
 msgstr ""
@@ -3017,15 +3027,15 @@ msgstr "Hvor vil du installere oppstartslasteren?"
 msgid "Edit Boot Label"
 msgstr "Redigér oppstartsnavn"
 
-#: ../textw/timezone_text.py:80
+#: ../textw/timezone_text.py:77
 msgid "What time zone are you located in?"
 msgstr "Hvilken tidssone befinner du deg i?"
 
-#: ../textw/timezone_text.py:95
+#: ../textw/timezone_text.py:92
 msgid "Hardware clock set to GMT?"
 msgstr "Maskinvareklokken satt til GMT?"
 
-#: ../textw/upgrade_text.py:94
+#: ../textw/upgrade_text.py:96
 #, c-format
 msgid ""
 "The 2.4 kernel needs significantly more swap than older kernels, as much as "
@@ -3038,39 +3048,43 @@ msgstr ""
 "konfigurert,\n"
 "men du kan opprette mer swap på et av dine filsystemer nå."
 
-#: ../textw/upgrade_text.py:112
+#: ../textw/upgrade_text.py:114
 msgid "Free Space"
 msgstr "Fri diskplass"
 
-#: ../textw/upgrade_text.py:127
+#: ../textw/upgrade_text.py:129
+msgid "RAM detected (MB):"
+msgstr ""
+
+#: ../textw/upgrade_text.py:132
 msgid "Suggested size (MB):"
 msgstr "Anbefalt størrelse(MB):"
 
-#: ../textw/upgrade_text.py:138
+#: ../textw/upgrade_text.py:143
 msgid "Add Swap"
 msgstr "Legg til swap"
 
-#: ../textw/upgrade_text.py:163
+#: ../textw/upgrade_text.py:168
 msgid "The value you entered is not a valid number."
 msgstr "Størrelsen du oppgav er ikke et gyldig tall."
 
-#: ../textw/upgrade_text.py:192
+#: ../textw/upgrade_text.py:197
 msgid "You don't have any Linux partitions. You can't upgrade this system!"
 msgstr "Du har ingen Linux-partisjoner. Du kan ikke oppgradere dette systemet!"
 
-#: ../textw/upgrade_text.py:209
+#: ../textw/upgrade_text.py:214
 msgid "System to Upgrade"
 msgstr "System som skal oppgraderes"
 
-#: ../textw/upgrade_text.py:223
+#: ../textw/upgrade_text.py:228
 msgid "Upgrade Partition"
 msgstr "Oppgradér partisjon"
 
-#: ../textw/upgrade_text.py:245
+#: ../textw/upgrade_text.py:250
 msgid "Customize Packages to Upgrade"
 msgstr "Tilpass pakker som skal oppgraderes"
 
-#: ../textw/upgrade_text.py:246
+#: ../textw/upgrade_text.py:251
 msgid ""
 "The packages you have installed, and any other packages which are needed to "
 "satisfy their dependencies, have been selected for installation. Would you "
@@ -4316,9 +4330,10 @@ msgid "Miscellaneous"
 msgstr "Forskjellig"
 
 #: ../loader/devices.c:86
+#, fuzzy
 msgid ""
 "This module can take parameters which affects its operation. If you don't "
-"know what parameters to supply, just skip this screen by pressing the \"OK\" "
+"know what parameters to supply, just skip this screen by pressing the \"Ok\" "
 "button now."
 msgstr ""
 "Denne modulen kan ta parametere som har innvirkning på måten den virker. "
@@ -4339,7 +4354,8 @@ msgid "Do you have a driver disk?"
 msgstr "Har du en driverdisk?"
 
 #: ../loader/devices.c:239
-msgid "Insert your driver disk and press \"OK\" to continue."
+#, fuzzy
+msgid "Insert your driver disk and press \"Ok\" to continue."
 msgstr "Sett inn driverdisketten og trykk \"OK\" for å fortsette."
 
 #: ../loader/devices.c:260
@@ -4483,7 +4499,7 @@ msgstr ""
 "Har ikke lastet noen spesielle enhetsdrivere for ditt system. Vil du at jeg "
 "skal gjøre det nå?"
 
-#: ../loader/loader.c:536 ../loader/loader.c:2134
+#: ../loader/loader.c:536 ../loader/loader.c:2136
 #, c-format
 msgid "Failed to read directory %s: %s"
 msgstr "Kunne ikke lese katalog %s: %s"
@@ -4584,19 +4600,19 @@ msgstr "Hvilken type media inneholder redningsbildet?"
 msgid "What type of media contains the packages to be installed?"
 msgstr "Hvilken type media inneholder pakkene som skal installeres?"
 
-#: ../loader/loader.c:2104
+#: ../loader/loader.c:2106
 msgid "Cannot find ks.cfg on boot floppy."
 msgstr "Kan ikke finne ks.cfg på oppstartsdisketten."
 
-#: ../loader/loader.c:2196
+#: ../loader/loader.c:2198
 msgid "Updates Disk"
 msgstr "Oppdateringsdiskett"
 
-#: ../loader/loader.c:2197
+#: ../loader/loader.c:2199
 msgid "Insert your updates disk and press \"OK\" to continue."
 msgstr "Sett inn oppdateringsdisketten og trykk \"OK\" for å fortsette."
 
-#: ../loader/loader.c:2202
+#: ../loader/loader.c:2204
 msgid ""
 "The floppy disk you inserted is not a valid update disk for this release of "
 "Red Hat Linux."
@@ -4604,28 +4620,28 @@ msgstr ""
 "Disketten du satte inn er ikke en gyldig oppdateringsdiskett for denne "
 "utgaven av Red Hat Linux."
 
-#: ../loader/loader.c:2212
+#: ../loader/loader.c:2214
 msgid "Failed to mount floppy disk."
 msgstr "Kunne ikke montere disketten."
 
 #. Copy everything to /tmp/updates so .so files don't get run
 #. from /dev/floppy. We could (and probably should) get smarter
 #. about this at some point.
-#: ../loader/loader.c:2217
+#: ../loader/loader.c:2219
 msgid "Updates"
 msgstr "Oppdateringer"
 
-#: ../loader/loader.c:2217
+#: ../loader/loader.c:2219
 msgid "Reading anaconda updates..."
 msgstr "Leser anaconda-oppdateringer..."
 
-#: ../loader/loader.c:2423
+#: ../loader/loader.c:2425
 #, fuzzy
 msgid "You do not have enough RAM to install Red Hat Linux on this machine."
 msgstr ""
 "Du har ikke nok systemminne til å installere Red Hat på denne maskinen."
 
-#: ../loader/loader.c:2911
+#: ../loader/loader.c:2913
 msgid "Running anaconda - please wait...\n"
 msgstr "Kjører anaconda - snart tilbake...\n"
 
@@ -5792,6 +5808,26 @@ msgstr "Tyrkisk"
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
+#, fuzzy
+#~ msgid "Samba Server:"
+#~ msgstr "SMB-tjener (Samba)"
+
+#, fuzzy
+#~ msgid "Samba"
+#~ msgstr "Svalbard"
+
+#, fuzzy
+#~ msgid "GRUB Password"
+#~ msgstr "Root-passord"
+
+#, fuzzy
+#~ msgid "Bootloader Password: "
+#~ msgstr "Root-passord: "
+
+#, fuzzy
+#~ msgid "Set Password"
+#~ msgstr "Root-passord"
+
 #~ msgid ""
 #~ "An internal error occurred in the installation program. Please report "
 #~ "this error to Red Hat (through the bugzilla.redhat.com web site) as soon "