no_comment

2 files changed, 461 insertions, 484 deletions

diff --git a/perl-install/share/po/Makefile b/perl-install/share/po/Makefile
index 8c7948b42..9f3f08d30 100644
--- a/perl-install/share/po/Makefile
+++ b/perl-install/share/po/Makefile
@@ -1,21 +1,26 @@
-PMSFILES = $(shell find .. -name "*.pm" | grep -v "^../po")
-POFILES = $(wildcard *.po)
+PMSFILES = $(shell find .. -name "*.pm" | grep -v "^../po" | grep -v "^../c/")
+PMSCFILES = $(PMSFILES:%=%_.c)
+POFILES = $(shell ls *.po | grep -v empty.po)
 FROMPOFILES = $(POFILES:%.po=%.pm)
 
 all: $(FROMPOFILES)
 
 clean:
-	rm -f $(FROMPOFILES)
+	rm -f empty.po $(FROMPOFILES) $(POFILES:%=%t) $(PMSCFILES)
 
 $(FROMPOFILES): %.pm: %.po
 	./po2perl < $< > $@
 
-%.po: $(PMSFILES)
-	touch $@
-	for i in $(PMSFILES); do \
-		sed -e 's/#\(.*\)/\/*\1*\//' -e 's/$$/\\n\\/' < $$i > $${i}c; \
-		xgettext -j -F -Lc -n --omit-header --keyword=_ --keyword=__ -o $@ $${i}c; \
-		rm $${i}c; \
-	done
+$(POFILES): empty.po
+	cp -f $@ $@t
+	msgmerge $@t $< > $@
+	rm $@t
+
+empty.po: $(PMSFILES)
+	$(MAKE) $(PMSCFILES);
+	xgettext -F -n --omit-header --keyword=_ --keyword=__ -o empty.po $(PMSCFILES)
+	rm $(PMSCFILES)
+
+$(PMSCFILES): %_.c: %
+	perl -pe 's|#(.*)|/*\1*\/|; s|$$|\\n\\|' $< > $@
 
-FORCE:
\ No newline at end of file
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 3bc54ea2d..65edc1412 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -1,431 +1,425 @@
-#: ../Xconfigurator.pmc:150 ../Xconfigurator.pmc:153
+#: ../Xconfigurator.pm_.c:157
 msgid "Choose a graphic card"
 msgstr "Velg et grafikk-kort"
 
-#: ../Xconfigurator.pmc:171 ../Xconfigurator.pmc:175
+#: ../Xconfigurator.pm_.c:179
 msgid "Give your graphic card memory size"
 msgstr "Oppgi hvor mye minne grafikk-kortet ditt har"
 
-#: ../Xconfigurator.pmc:182 ../Xconfigurator.pmc:188
+#: ../Xconfigurator.pm_.c:192
 msgid "Choose a monitor"
 msgstr "Velg en monitor"
 
-#: ../Xconfigurator.pmc:214 ../Xconfigurator.pmc:220
+#: ../Xconfigurator.pm_.c:224
 msgid "Monitor not configured yet"
 msgstr "Monitoren er ikke konfigurert enn�"
 
-#: ../Xconfigurator.pmc:217 ../Xconfigurator.pmc:223
+#: ../Xconfigurator.pm_.c:227
 msgid "Graphic card not configured yet"
 msgstr "Grafikk-kortet er ikke konfigurert enn�"
 
-#: ../Xconfigurator.pmc:220 ../Xconfigurator.pmc:226
+#: ../Xconfigurator.pm_.c:230
 msgid "Resolutions not chosen yet"
 msgstr "Oppl�sninger er ikke valgt enn�"
 
-#: ../Xconfigurator.pmc:227 ../Xconfigurator.pmc:233
+#: ../Xconfigurator.pm_.c:237
 msgid "Do you want to test configuration?"
 msgstr "Vil du teste konfigurasjonen?"
 
-#: ../Xconfigurator.pmc:227 ../Xconfigurator.pmc:233
+#: ../Xconfigurator.pm_.c:237
 msgid "Test configuration"
 msgstr "Test konfigurasjon"
 
-#: ../Xconfigurator.pmc:253 ../Xconfigurator.pmc:265
+#: ../Xconfigurator.pm_.c:269
 #, c-format
 msgid "(leaving in %d seconds)"
 msgstr "(slutter om %d sekunder)"
 
-#: ../Xconfigurator.pmc:257 ../Xconfigurator.pmc:269
+#: ../Xconfigurator.pm_.c:273
 msgid "Is this ok?"
 msgstr "Er dette ok?"
 
-#: ../Xconfigurator.pmc:264 ../Xconfigurator.pmc:278
+#: ../Xconfigurator.pm_.c:281
 msgid "An error occured, try changing some parameters"
 msgstr "En feil oppsto, pr�v � endre noen parametere"
 
-#: ../Xconfigurator.pmc:273 ../Xconfigurator.pmc:286 ../Xconfigurator.pmc:414
-#: ../Xconfigurator.pmc:426
+#: ../Xconfigurator.pm_.c:289 ../Xconfigurator.pm_.c:429
 msgid "Automatic resolutions"
 msgstr "Automatiske oppl�sninger"
 
-#: ../Xconfigurator.pmc:317 ../Xconfigurator.pmc:330
+#: ../Xconfigurator.pm_.c:333
 msgid "Resolution"
 msgstr "Oppl�sning"
 
-#: ../Xconfigurator.pmc:348 ../Xconfigurator.pmc:361
+#: ../Xconfigurator.pm_.c:364
 msgid "Choose resolution and color depth"
 msgstr "Velg oppl�sning og fargedybde"
 
-#: ../Xconfigurator.pmc:611 ../Xconfigurator.pmc:626
+#: ../Xconfigurator.pm_.c:628
 msgid "Change Monitor"
 msgstr "Endre monitor"
 
-#: ../Xconfigurator.pmc:612 ../Xconfigurator.pmc:627
+#: ../Xconfigurator.pm_.c:629
 msgid "Change Graphic card"
 msgstr "Endre grafikk-kort"
 
-#: ../Xconfigurator.pmc:613 ../Xconfigurator.pmc:628
+#: ../Xconfigurator.pm_.c:630
 msgid "Change Resolution"
 msgstr "Endre oppl�sning"
 
-#: ../Xconfigurator.pmc:614 ../Xconfigurator.pmc:629
+#: ../Xconfigurator.pm_.c:631
 msgid "Automaticall resolutions search"
 msgstr "Automatisk oppl�sningss�k"
 
-#: ../Xconfigurator.pmc:615 ../Xconfigurator.pmc:633
+#: ../Xconfigurator.pm_.c:635
 msgid "Test again"
 msgstr "Test igjen"
 
-#: ../Xconfigurator.pmc:616 ../Xconfigurator.pmc:634
+#: ../Xconfigurator.pm_.c:636
 msgid "Quit"
 msgstr "Slutt"
 
-#: ../Xconfigurator.pmc:619 ../Xconfigurator.pmc:637
+#: ../Xconfigurator.pm_.c:639
 msgid "What do you want to do?"
 msgstr "Hva vil du gj�re?"
 
-#: ../Xconfigurator.pmc:624 ../Xconfigurator.pmc:642
+#: ../Xconfigurator.pm_.c:644
 msgid "X at startup"
 msgstr "X ved oppstart"
 
-#: ../Xconfigurator.pmc:630 ../Xconfigurator.pmc:648
+#: ../Xconfigurator.pm_.c:650
 msgid "X successfully configured"
 msgstr "Konfigurasjon av X vellykket"
 
-#: ../Xconfigurator_consts.pmc:4
+#: ../Xconfigurator_consts.pm_.c:4
 msgid "256 colors"
 msgstr "256 farger"
 
-#: ../Xconfigurator_consts.pmc:6
+#: ../Xconfigurator_consts.pm_.c:6
 msgid "65 thousand colors"
 msgstr "65 tusen farger"
 
-#: ../Xconfigurator_consts.pmc:7
+#: ../Xconfigurator_consts.pm_.c:7
 msgid "16 millions of colors"
 msgstr "16 millioner farger"
 
-#: ../Xconfigurator_consts.pmc:8
+#: ../Xconfigurator_consts.pm_.c:8
 msgid "4 billions of colors"
 msgstr "4 milliarder farger"
 
-#: ../Xconfigurator_consts.pmc:20
+#: ../Xconfigurator_consts.pm_.c:20
 msgid "256 kb"
 msgstr "256 kb"
 
-#: ../Xconfigurator_consts.pmc:21
+#: ../Xconfigurator_consts.pm_.c:21
 msgid "512 kb"
 msgstr "512 kb"
 
-#: ../Xconfigurator_consts.pmc:22
+#: ../Xconfigurator_consts.pm_.c:22
 msgid "1 mb"
 msgstr "1 mb"
 
-#: ../Xconfigurator_consts.pmc:23
+#: ../Xconfigurator_consts.pm_.c:23
 msgid "2 mb"
 msgstr "2 mb"
 
-#: ../Xconfigurator_consts.pmc:24
+#: ../Xconfigurator_consts.pm_.c:24
 msgid "4 mb"
 msgstr "4 mb"
 
-#: ../Xconfigurator_consts.pmc:25
+#: ../Xconfigurator_consts.pm_.c:25
 msgid "8 mb"
 msgstr "8 mb"
 
-#: ../Xconfigurator_consts.pmc:26
+#: ../Xconfigurator_consts.pm_.c:26
 msgid "16 mb or more"
 msgstr "16 mb eller mer"
 
-#: ../Xconfigurator_consts.pmc:30
+#: ../Xconfigurator_consts.pm_.c:30
 msgid "Standard VGA, 640x480 in 60 Hz"
 msgstr "Standard VGA, 640x480 i 60 Hz"
 
-#: ../Xconfigurator_consts.pmc:31
+#: ../Xconfigurator_consts.pm_.c:31
 msgid "Super VGA, 800x600 in 56 Hz"
 msgstr "Super VGA 800x600 i 56 Hz"
 
-#: ../Xconfigurator_consts.pmc:32
+#: ../Xconfigurator_consts.pm_.c:32
 msgid "8514 Compatible, 1024x768 in 87 Hz interlaced (no 800x600)"
 msgstr "8514 kompatibel, 1024x768 i 87 Hz interlaced (ikke 800x600)"
 
-#: ../Xconfigurator_consts.pmc:33
+#: ../Xconfigurator_consts.pm_.c:33
 msgid "Super VGA, 1024x768 in 87 Hz interlaced, 800x600 in 56 Hz"
 msgstr "Super VGA, 1024x768 i 87 Hz interlaced, 800x600 i 56 Hz"
 
-#: ../Xconfigurator_consts.pmc:34
+#: ../Xconfigurator_consts.pm_.c:34
 msgid "Extended Super VGA, 800x600 in 60 Hz, 640x480 in 72 Hz"
 msgstr "Utvidet Super VGA, 800x600 i 60 Hz, 640x480 i 72 Hz"
 
-#: ../Xconfigurator_consts.pmc:35
+#: ../Xconfigurator_consts.pm_.c:35
 msgid "Non-Interlaced SVGA, 1024x768 in 60 Hz, 800x600 in 72 Hz"
 msgstr "Ikke-interlaced SVGA, 1024x768 i 60 Hz, 800x600 i 72 Hz"
 
-#: ../Xconfigurator_consts.pmc:36
+#: ../Xconfigurator_consts.pm_.c:36
 msgid "High Frequency SVGA, 1024x768 in 70 Hz"
 msgstr "H�yfrekvens SVGA, 1024x768 i 70 Hz"
 
-#: ../Xconfigurator_consts.pmc:37
+#: ../Xconfigurator_consts.pm_.c:37
 msgid "Multi-frequency that can do 1280x1024 in 60 Hz"
 msgstr "Flerfrekvens som kan klare 1280x1024 i 60 Hz"
 
-#: ../Xconfigurator_consts.pmc:38
+#: ../Xconfigurator_consts.pm_.c:38
 msgid "Multi-frequency that can do 1280x1024 in 74 Hz"
 msgstr "Flerfrekvens som kan klare 1280x1024 i 74 Hz"
 
-#: ../Xconfigurator_consts.pmc:39
+#: ../Xconfigurator_consts.pm_.c:39
 msgid "Multi-frequency that can do 1280x1024 in 76 Hz"
 msgstr "Flerfrekvens som kan klare 1280x1024 i 76 Hz"
 
-#: ../Xconfigurator_consts.pmc:40
+#: ../Xconfigurator_consts.pm_.c:40
 msgid "Monitor that can do 1600x1200 in 70 Hz"
 msgstr "Monitor som kan klare 1600x1200 i 70 Hz"
 
-#: ../Xconfigurator_consts.pmc:41
+#: ../Xconfigurator_consts.pm_.c:41
 msgid "Monitor that can do 1600x1200 in 76 Hz"
 msgstr "Monitor som kan klare 1600x1200 i 76 Hz"
 
-#: ../Xconfigurator_consts.pmc:46
+#: ../Xconfigurator_consts.pm_.c:46
 msgid "No RAMDAC Setting (recommended)"
 msgstr "Ingen RAMDAC innstilling (anbefalt)"
 
-#: ../Xconfigurator_consts.pmc:47
+#: ../Xconfigurator_consts.pm_.c:47
 msgid "AT&T 20C490 (S3 and AGX servers, ARK driver)"
 msgstr "AT&T 20C490 (S3 og AGX tjenere, ARK driver)"
 
-#: ../Xconfigurator_consts.pmc:48
+#: ../Xconfigurator_consts.pm_.c:48
 msgid "AT&T 20C498/21C498/22C498 (S3, autodetected)"
 msgstr "AT&T 20C498/21C498/22C498 (S3, oppdaget automatisk)"
 
-#: ../Xconfigurator_consts.pmc:49
+#: ../Xconfigurator_consts.pm_.c:49
 msgid "AT&T 20C409/20C499 (S3, autodetected)"
 msgstr "AT&T 20C409/20C499 (S3, oppdaget automatisk)"
 
-#: ../Xconfigurator_consts.pmc:50
+#: ../Xconfigurator_consts.pm_.c:50
 msgid "AT&T 20C505 (S3)"
 msgstr "AT&T 20C505 (S3)"
 
-#: ../Xconfigurator_consts.pmc:51
+#: ../Xconfigurator_consts.pm_.c:51
 msgid "BrookTree BT481 (AGX)"
 msgstr "BrookTree BT481 (AGX)"
 
-#: ../Xconfigurator_consts.pmc:52
+#: ../Xconfigurator_consts.pm_.c:52
 msgid "BrookTree BT482 (AGX)"
 msgstr "BrookTree BT482 (AGX)"
 
-#: ../Xconfigurator_consts.pmc:53
+#: ../Xconfigurator_consts.pm_.c:53
 msgid "BrookTree BT485/9485 (S3)"
 msgstr "BrookTree BT485/9485 (S3)"
 
-#: ../Xconfigurator_consts.pmc:54
+#: ../Xconfigurator_consts.pm_.c:54
 msgid "Sierra SC15025 (S3, AGX)"
 msgstr "Sierra SC15025 (S3, AGX)"
 
-#: ../Xconfigurator_consts.pmc:55
+#: ../Xconfigurator_consts.pm_.c:55
 msgid "S3 GenDAC (86C708) (autodetected)"
 msgstr "S3 GenDAC (86C708) (oppdaget automatisk)"
 
-#: ../Xconfigurator_consts.pmc:56
+#: ../Xconfigurator_consts.pm_.c:56
 msgid "S3 SDAC (86C716) (autodetected)"
 msgstr "S3 SDAC (86C716) (oppdaget automatisk)"
 
-#: ../Xconfigurator_consts.pmc:57
+#: ../Xconfigurator_consts.pm_.c:57
 msgid "STG-1700 (S3, autodetected)"
 msgstr "STG-1700 (S3, oppdaget automatisk)"
 
-#: ../Xconfigurator_consts.pmc:58
+#: ../Xconfigurator_consts.pm_.c:58
 msgid "STG-1703 (S3, autodetected)"
 msgstr "STG-1703 (S3, oppdaget automatisk)"
 
-#: ../Xconfigurator_consts.pmc:59
+#: ../Xconfigurator_consts.pm_.c:59
 msgid "TI 3020 (S3)"
 msgstr "TI 3020 (S3)"
 
-#: ../Xconfigurator_consts.pmc:60
+#: ../Xconfigurator_consts.pm_.c:60
 msgid "TI 3025 (S3, autodetected)"
 msgstr "TI 3025 (S3, oppdaget automatisk)"
 
-#: ../Xconfigurator_consts.pmc:61
+#: ../Xconfigurator_consts.pm_.c:61
 msgid "TI 3026 (S3, autodetected)"
 msgstr "TI 3026 (S3, oppdaget automatisk)"
 
-#: ../Xconfigurator_consts.pmc:62
+#: ../Xconfigurator_consts.pm_.c:62
 msgid "IBM RGB 514 (S3, autodetected)"
 msgstr "IBM RGB 514 (S3, oppdaget automatisk)"
 
-#: ../Xconfigurator_consts.pmc:63
+#: ../Xconfigurator_consts.pm_.c:63
 msgid "IBM RGB 524 (S3, autodetected)"
 msgstr "IBM RGB 524 (S3, oppdaget automatisk)"
 
-#: ../Xconfigurator_consts.pmc:64
+#: ../Xconfigurator_consts.pm_.c:64
 msgid "IBM RGB 525 (S3, autodetected)"
 msgstr "IBM RGB 525 (S3, oppdaget automatisk)"
 
-#: ../Xconfigurator_consts.pmc:65
+#: ../Xconfigurator_consts.pm_.c:65
 msgid "IBM RGB 526 (S3)"
 msgstr "IBM RGB 526 (S3)"
 
-#: ../Xconfigurator_consts.pmc:66
+#: ../Xconfigurator_consts.pm_.c:66
 msgid "IBM RGB 528 (S3, autodetected)"
 msgstr "IBM RGB 528 (S3, oppdaget automatisk)"
 
-#: ../Xconfigurator_consts.pmc:67
+#: ../Xconfigurator_consts.pm_.c:67
 msgid "ICS5342 (S3, ARK)"
 msgstr "ICS5342 (S3, ARK)"
 
-#: ../Xconfigurator_consts.pmc:68
+#: ../Xconfigurator_consts.pm_.c:68
 msgid "ICS5341 (W32)"
 msgstr "ICS5341 (W32)"
 
-#: ../Xconfigurator_consts.pmc:69
+#: ../Xconfigurator_consts.pm_.c:69
 msgid "IC Works w30C516 ZoomDac (ARK)"
 msgstr "IC Works w30C516 ZoomDac (ARK)"
 
-#: ../Xconfigurator_consts.pmc:70
+#: ../Xconfigurator_consts.pm_.c:70
 msgid "Normal DAC"
 msgstr "Normal DAC"
 
-#: ../Xconfigurator_consts.pmc:74
+#: ../Xconfigurator_consts.pm_.c:74
 msgid "No Clockchip Setting (recommended)"
 msgstr "Ingen Clockchip innstilling (anbefalt)"
 
-#: ../Xconfigurator_consts.pmc:75
+#: ../Xconfigurator_consts.pm_.c:75
 msgid "Chrontel 8391"
 msgstr "Chrontel 8391"
 
-#: ../Xconfigurator_consts.pmc:76
+#: ../Xconfigurator_consts.pm_.c:76
 msgid "ICD2061A and compatibles (ICS9161A => DCS2824)"
 msgstr "ICD2061A og kompatible (ICS9161A => DCS2824)"
 
-#: ../Xconfigurator_consts.pmc:77
+#: ../Xconfigurator_consts.pm_.c:77
 msgid "ICS2595"
 msgstr "ICS2595"
 
-#: ../Xconfigurator_consts.pmc:78
+#: ../Xconfigurator_consts.pm_.c:78
 msgid "ICS5342 (similar to SDAC, but not completely compatible)"
 msgstr "ICS5342 (lik SDAC, men ikke helt kompatibel)"
 
-#: ../Xconfigurator_consts.pmc:79
+#: ../Xconfigurator_consts.pm_.c:79
 msgid "ICS5341"
 msgstr "ICS5341"
 
-#: ../Xconfigurator_consts.pmc:80
+#: ../Xconfigurator_consts.pm_.c:80
 msgid "S3 GenDAC (86C708) and ICS5300 (autodetected)"
 msgstr "S3 GenDAC (86C708) og ICS5300 (oppdaget automatisk)"
 
-#: ../Xconfigurator_consts.pmc:81
+#: ../Xconfigurator_consts.pm_.c:81
 msgid "S3 SDAC (86C716)"
 msgstr "S3 SDAC (86C716)"
 
-#: ../Xconfigurator_consts.pmc:82
+#: ../Xconfigurator_consts.pm_.c:82
 msgid "STG 1703 (autodetected)"
 msgstr "STG 1703 (oppdaget automatisk)"
 
-#: ../Xconfigurator_consts.pmc:83
+#: ../Xconfigurator_consts.pm_.c:83
 msgid "Sierra SC11412"
 msgstr "Sierra SC11412"
 
-#: ../Xconfigurator_consts.pmc:84
+#: ../Xconfigurator_consts.pm_.c:84
 msgid "TI 3025 (autodetected)"
 msgstr "TI 3025 (oppdaget automatisk)"
 
-#: ../Xconfigurator_consts.pmc:85
+#: ../Xconfigurator_consts.pm_.c:85
 msgid "TI 3026 (autodetected)"
 msgstr "TI 3026 (oppdaget automatisk)"
 
-#: ../Xconfigurator_consts.pmc:86
+#: ../Xconfigurator_consts.pm_.c:86
 msgid "IBM RGB 51x/52x (autodetected)"
 msgstr "IBM RGB 51x/52x (oppdaget automatisk)"
 
-#: ../diskdrake.pmc:15 ../diskdrake.pmc:16
+#: ../diskdrake.pm_.c:15
 msgid "Create"
 msgstr "Opprett"
 
-#: ../diskdrake.pmc:16 ../diskdrake.pmc:17
+#: ../diskdrake.pm_.c:16
 msgid "Umount"
 msgstr "Demonter"
 
-#: ../diskdrake.pmc:17 ../diskdrake.pmc:18
+#: ../diskdrake.pm_.c:17
 msgid "Delete"
 msgstr "Slett"
 
-#: ../diskdrake.pmc:17 ../diskdrake.pmc:18
+#: ../diskdrake.pm_.c:17
 msgid "Format"
 msgstr "Formater"
 
-#: ../diskdrake.pmc:17 ../diskdrake.pmc:379
+#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:382
 msgid "Move"
 msgstr "Flytt"
 
-#: ../diskdrake.pmc:17 ../diskdrake.pmc:18 ../diskdrake.pmc:345
-#: ../diskdrake.pmc:384 ../diskdrake.pmc:435
+#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:429
 msgid "Resize"
 msgstr "Endre st�rrelse"
 
-#: ../diskdrake.pmc:17 ../diskdrake.pmc:18
+#: ../diskdrake.pm_.c:17
 msgid "Type"
 msgstr "Type"
 
-#: ../diskdrake.pmc:18 ../diskdrake.pmc:19
+#: ../diskdrake.pm_.c:18
 msgid "Mount_point"
 msgstr "Monteringspunkt"
 
-#: ../diskdrake.pmc:30 ../diskdrake.pmc:42 ../diskdrake.pmc:58
+#: ../diskdrake.pm_.c:30
 msgid "Write /etc/fstab"
 msgstr "Skriv /etc/fstab"
 
-#: ../diskdrake.pmc:31
+#: ../diskdrake.pm_.c:31
 msgid "Normal > Expert"
 msgstr "Normal > Ekspert"
 
-#: ../diskdrake.pmc:32
+#: ../diskdrake.pm_.c:32
 msgid "Expert > Normal"
 msgstr "Expert > Normal"
 
-#: ../diskdrake.pmc:33 ../diskdrake.pmc:44
+#: ../diskdrake.pm_.c:33
 msgid "Restore from file"
 msgstr "Gjenopprett fra fil"
 
-#: ../diskdrake.pmc:34 ../diskdrake.pmc:45
+#: ../diskdrake.pm_.c:34
 msgid "Save in file"
 msgstr "Lagre i fil"
 
-#: ../diskdrake.pmc:35 ../diskdrake.pmc:46
+#: ../diskdrake.pm_.c:35
 msgid "Restore from floppy"
 msgstr "Gjenopprett fra diskett"
 
-#: ../diskdrake.pmc:36 ../diskdrake.pmc:47
+#: ../diskdrake.pm_.c:36
 msgid "Save on floppy"
 msgstr "Lagre p� diskett"
 
-#: ../diskdrake.pmc:37 ../diskdrake.pmc:48 ../diskdrake.pmc:60
+#: ../diskdrake.pm_.c:37
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../diskdrake.pmc:40 ../diskdrake.pmc:50 ../diskdrake.pmc:51
+#: ../diskdrake.pm_.c:40
 msgid "Clear all"
 msgstr "Fjern alle"
 
-#: ../diskdrake.pmc:41 ../diskdrake.pmc:51 ../diskdrake.pmc:52
+#: ../diskdrake.pm_.c:41
 msgid "Format all"
 msgstr "Formater alle"
 
-#: ../diskdrake.pmc:42 ../diskdrake.pmc:52 ../diskdrake.pmc:53
+#: ../diskdrake.pm_.c:42
 msgid "Auto allocate"
 msgstr "Automatisk allokering"
 
-#: ../diskdrake.pmc:43
-msgid "Expert"
-msgstr "Expert"
-
-#: ../diskdrake.pmc:45 ../diskdrake.pmc:55 ../diskdrake.pmc:56
+#: ../diskdrake.pm_.c:45
 msgid "All primary partitions are used"
 msgstr "Alle prim�re partisjoner er i bruk"
 
-#: ../diskdrake.pmc:45 ../diskdrake.pmc:55 ../diskdrake.pmc:56
+#: ../diskdrake.pm_.c:45
 msgid "I can't add no more partition"
 msgstr "Jeg kan ikke legge til flere partisjoner"
 
-#: ../diskdrake.pmc:45 ../diskdrake.pmc:55 ../diskdrake.pmc:56
+#: ../diskdrake.pm_.c:45
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -433,79 +427,80 @@ msgstr ""
 "For � ha flere partisjoner vennligst slett en for � kunne opprette en "
 "utvidet partisjon"
 
-#: ../diskdrake.pmc:48
+#: ../diskdrake.pm_.c:48
 msgid "Undo"
 msgstr "Angre"
 
-#: ../diskdrake.pmc:49 ../diskdrake.pmc:59
+#: ../diskdrake.pm_.c:49
 msgid "Write partition table"
 msgstr "Skriv partisjonstabell"
 
-#: ../diskdrake.pmc:93 ../diskdrake.pmc:96 ../diskdrake.pmc:113
+#: ../diskdrake.pm_.c:114
 #, c-format
 msgid "After %s partition %s,"
 msgstr "Etter %s partisjon %s,"
 
-#: ../diskdrake.pmc:93 ../diskdrake.pmc:96 ../diskdrake.pmc:113
-#: ../diskdrake.pmc:302 ../diskdrake.pmc:310 ../diskdrake.pmc:341
-#: ../diskdrake.pmc:349 ../diskdrake.pmc:370 ../diskdrake.pmc:400
+#: ../diskdrake.pm_.c:114 ../diskdrake.pm_.c:373 ../diskdrake.pm_.c:400
 msgid "Read carefully!"
 msgstr "Lese n�ye!"
 
-#: ../diskdrake.pmc:93 ../diskdrake.pmc:96 ../diskdrake.pmc:113
+#: ../diskdrake.pm_.c:114
 msgid "all data on this partition will be lost"
 msgstr "alle data p� denne partisjonen vil g� tapt"
 
-#: ../diskdrake.pmc:109 ../diskdrake.pmc:112 ../diskdrake.pmc:131
-#: ../install_steps_interactive.pmc:39 ../install_steps_interactive.pmc:41
+#: ../diskdrake.pm_.c:132 ../install_steps_interactive.pm_.c:41
 msgid "Error"
 msgstr "Feil"
 
-#: ../diskdrake.pmc:125 ../diskdrake.pmc:130 ../diskdrake.pmc:152
-#: ../diskdrake.pmc:422 ../diskdrake.pmc:461 ../diskdrake.pmc:512
+#: ../diskdrake.pm_.c:153 ../diskdrake.pm_.c:497
 msgid "Mount point: "
 msgstr "Monteringspunkt: "
 
-#: ../diskdrake.pmc:126 ../diskdrake.pmc:131 ../diskdrake.pmc:148
-#: ../diskdrake.pmc:153 ../diskdrake.pmc:175
+#: ../diskdrake.pm_.c:154 ../diskdrake.pm_.c:176
 msgid "Device: "
 msgstr "Enhet: "
 
-#: ../diskdrake.pmc:127 ../diskdrake.pmc:133 ../diskdrake.pmc:151
-#: ../diskdrake.pmc:155 ../diskdrake.pmc:178
+#: ../diskdrake.pm_.c:155
+#, c-format
+msgid "DOS letter: %s (just a guess)\n"
+msgstr "DOS bokstav: %s (bare en gjetning)\n"
+
+#: ../diskdrake.pm_.c:156 ../diskdrake.pm_.c:179
 msgid "Type: "
 msgstr "Type: "
 
-#: ../diskdrake.pmc:128
-msgid "Start: sector"
-msgstr "Start: sektor"
+#: ../diskdrake.pm_.c:157
+#, fuzzy, c-format
+msgid "Start: sector /*%s\n"
+msgstr "Start: sektor /*%s\n"
+
+#: ../diskdrake.pm_.c:158
+msgid "Size: %s MB (%s%%)"
+msgstr "St�rrelse: %s MB (%s%%)"
 
-#: ../diskdrake.pmc:129
-msgid "Mb\n"
-msgstr "Mb\n"
+#: ../diskdrake.pm_.c:159
+#, c-format
+msgid ", %s sectors"
+msgstr ", %s sektorer"
 
-#: ../diskdrake.pmc:129 ../diskdrake.pmc:149
-msgid "Size: "
-msgstr "St�rrelse: "
+#: ../diskdrake.pm_.c:161
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Sylinder %d til sylinder %d\n"
 
-#: ../diskdrake.pmc:130 ../diskdrake.pmc:137 ../diskdrake.pmc:161
+#: ../diskdrake.pm_.c:162
 msgid "Formatted\n"
 msgstr "Formatert\n"
 
-#: ../diskdrake.pmc:131 ../diskdrake.pmc:138 ../diskdrake.pmc:162
+#: ../diskdrake.pm_.c:163
 msgid "Not formatted\n"
 msgstr "Ikke formatert\n"
 
-#: ../diskdrake.pmc:132 ../diskdrake.pmc:154
-#, c-format
-msgid "DOS letter: %s (just a guess)\n"
-msgstr "DOS bokstav: %s (bare en gjetning)\n"
-
-#: ../diskdrake.pmc:132 ../diskdrake.pmc:139 ../diskdrake.pmc:163
+#: ../diskdrake.pm_.c:164
 msgid "Mounted\n"
 msgstr "Montert\n"
 
-#: ../diskdrake.pmc:133 ../diskdrake.pmc:140 ../diskdrake.pmc:164
+#: ../diskdrake.pm_.c:165
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -513,346 +508,278 @@ msgstr ""
 "Partisjon startet opp som standard\n"
 "    (for MS-DOS oppstart, ikke for lilo)\n"
 
-#: ../diskdrake.pmc:134
-msgid "Size: %s Mb (%s%%)\n"
-msgstr "St�rrelse: %s Mb (%s%%)\n"
-
-#: ../diskdrake.pmc:135 ../diskdrake.pmc:156
-#, c-format
-msgid "Start: sector /*%s\n"
-msgstr "Start: sektor /*%s\n"
+#: ../diskdrake.pm_.c:177
+#, fuzzy, c-format
+msgid "Size: %d MB\n"
+msgstr "St�rrelse: %d MB\n"
 
-#: ../diskdrake.pmc:136 ../diskdrake.pmc:160
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "Sylinder %d til sylinder %d\n"
-
-#: ../diskdrake.pmc:145 ../diskdrake.pmc:164 ../diskdrake.pmc:191
-msgid "Mount"
-msgstr "Montere"
-
-#: ../diskdrake.pmc:147 ../diskdrake.pmc:166 ../diskdrake.pmc:193
-msgid "Active"
-msgstr "Aktiv"
-
-#: ../diskdrake.pmc:149 ../install_steps_graphical.pmc:211
-#: ../install_steps_graphical.pmc:215 ../install_steps_graphical.pmc:262
-msgid " Mb"
-msgstr "Mb"
-
-#: ../diskdrake.pmc:150 ../diskdrake.pmc:177
+#: ../diskdrake.pm_.c:178
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometri: %s sylindere, %s hoder, %s sektorer\n"
 
-#: ../diskdrake.pmc:152 ../diskdrake.pmc:179
+#: ../diskdrake.pm_.c:180
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "p� buss %d id %d\n"
 
-#: ../diskdrake.pmc:157
-msgid "Size: %s MB (%s%%)"
-msgstr "St�rrelse: %s MB (%s%%)"
-
-#: ../diskdrake.pmc:158
-#, c-format
-msgid ", %s sectors"
-msgstr ", %s sektorer"
+#: ../diskdrake.pm_.c:192
+msgid "Mount"
+msgstr "Montere"
 
-#: ../diskdrake.pmc:176
-#, c-format
-msgid "Size: %d MB\b"
-msgstr "St�rrelse: %d MB\b"
+#: ../diskdrake.pm_.c:194
+msgid "Active"
+msgstr "Aktiv"
 
-#: ../diskdrake.pmc:229
-msgid "Forget the modification to partition table?"
-msgstr "Glem modifiseringen til partisjonstabellen?"
+#: ../diskdrake.pm_.c:286
+msgid ""
+"You're adding a root partition far on the drive (on a cylinder > 1024),\n"
+"and you have no /boot partition. So if you plan to use lilo (the boot "
+"manager),\n"
+"be carefull to add a /boot partition"
+msgstr ""
+"Du er i ferd med � legge til en rotpartisjon langt ute p� disken (p� en\n"
+"sylinder > 1024), og du har ingen /boot partisjon. S� hvis du planlegger � "
+"bruke lilo (oppstartsh�ndtereren), s� v�re forsiktig n�r du legger til\n"
+"en /boot partisjon."
 
-#: ../diskdrake.pmc:229 ../diskdrake.pmc:269 ../diskdrake.pmc:298
+#: ../diskdrake.pm_.c:300
 msgid "Leave without saving"
 msgstr "Slutt uten � lagre"
 
-#: ../diskdrake.pmc:243 ../diskdrake.pmc:283 ../diskdrake.pmc:312
+#: ../diskdrake.pm_.c:300
+msgid "Quit program without writing partition table?"
+msgstr "Avslutte programmet uten � skrive partisjonstabell?"
+
+#: ../diskdrake.pm_.c:315
 msgid "changing type of"
 msgstr "endrer type av"
 
-#: ../diskdrake.pmc:245 ../diskdrake.pmc:285 ../diskdrake.pmc:314
+#: ../diskdrake.pm_.c:317
 msgid "Change partition type"
 msgstr "Endre partisjonstype"
 
-#: ../diskdrake.pmc:246 ../diskdrake.pmc:286 ../diskdrake.pmc:315
+#: ../diskdrake.pm_.c:318
 msgid "Which partition type do you want?"
 msgstr "Hvilken partisjonstype �nsker du?"
 
-#: ../diskdrake.pmc:256 ../diskdrake.pmc:285
-msgid ""
-"You're adding a root partition far on the drive (on a cylinder > 1024),\n"
-"and you have no /boot partition. So if you plan to use lilo (the boot "
-"manager),\n"
-"be carefull to add a /boot partition"
-msgstr ""
-"Du er i ferd med � legge til en rotpartisjon langt ute p� disken (p� en\n"
-"sylinder > 1024), og du har ingen /boot partisjon. S� hvis du planlegger "
-"� bruke lilo (oppstartsh�ndtereren), s� v�re forsiktig n�r du legger til\n"
-"en /boot partisjon."
-
-#: ../diskdrake.pmc:263 ../diskdrake.pmc:303 ../diskdrake.pmc:332
+#: ../diskdrake.pm_.c:335
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Hvor vil du montere %s enheten?"
 
-#: ../diskdrake.pmc:269 ../diskdrake.pmc:298
-msgid "Quit program without writing partition table?"
-msgstr "Avslutte programmet uten � skrive partisjonstabell?"
-
-#: ../diskdrake.pmc:296 ../diskdrake.pmc:335 ../diskdrake.pmc:364
+#: ../diskdrake.pm_.c:367
 msgid "formatting"
 msgstr "formatering"
 
-#: ../diskdrake.pmc:302 ../diskdrake.pmc:341 ../diskdrake.pmc:370
+#: ../diskdrake.pm_.c:373
 msgid "After formatting all partitions,"
 msgstr "Etter formatering av alle partisjonene"
 
-#: ../diskdrake.pmc:302 ../diskdrake.pmc:341 ../diskdrake.pmc:370
+#: ../diskdrake.pm_.c:373
 msgid "all data on these partitions will be lost"
 msgstr "alle data p� disse partisjonene vil g� tapt"
 
-#: ../diskdrake.pmc:310 ../diskdrake.pmc:349 ../diskdrake.pmc:400
-#, c-format
-msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "Partisjonstabellen p� disk %s blir n� skrevet til disk!"
-
-#: ../diskdrake.pmc:330 ../diskdrake.pmc:369 ../diskdrake.pmc:372
-#: ../diskdrake.pmc:411 ../diskdrake.pmc:420 ../diskdrake.pmc:462
-msgid "Resizing"
-msgstr "Endrer st�rrelse"
-
-#: ../diskdrake.pmc:331 ../diskdrake.pmc:370 ../diskdrake.pmc:421
-msgid "Computing fat filesystem bounds"
-msgstr "Beregner fat filsystemgrense"
-
-#: ../diskdrake.pmc:331 ../diskdrake.pmc:370 ../diskdrake.pmc:374
-#: ../diskdrake.pmc:389 ../diskdrake.pmc:413 ../diskdrake.pmc:421
-#: ../diskdrake.pmc:464
-msgid "Please wait"
-msgstr "Vennligst vent"
-
-#: ../diskdrake.pmc:342 ../diskdrake.pmc:381 ../diskdrake.pmc:432
-msgid "resizing"
-msgstr "Endrer st�rrelse"
-
-#: ../diskdrake.pmc:352 ../diskdrake.pmc:391 ../diskdrake.pmc:442
-msgid "Choose the new size"
-msgstr "Velg ny st�rrelse"
-
-#: ../diskdrake.pmc:352 ../diskdrake.pmc:391
-msgid "Mb"
-msgstr "Mb"
-
-#: ../diskdrake.pmc:380
+#: ../diskdrake.pm_.c:383
 msgid "Which disk do you want to move to?"
 msgstr "Hvilken disk vil du flytte til?"
 
-#: ../diskdrake.pmc:384
+#: ../diskdrake.pm_.c:387
 msgid "Sector"
 msgstr "Sektor"
 
-#: ../diskdrake.pmc:385
+#: ../diskdrake.pm_.c:388
 msgid "Which sector do you want to move to?"
 msgstr "Hvilken sektor vil du flytte til?"
 
-#: ../diskdrake.pmc:387
+#: ../diskdrake.pm_.c:391
 msgid "Moving"
 msgstr "Flytter"
 
-#: ../diskdrake.pmc:389
+#: ../diskdrake.pm_.c:391
 msgid "Moving partition..."
 msgstr "Flytter partisjon..."
 
-#: ../diskdrake.pmc:399 ../diskdrake.pmc:438 ../diskdrake.pmc:489
-msgid "Create a new partition"
-msgstr "Opprette en ny partisjon"
+#: ../diskdrake.pm_.c:400
+#, c-format
+msgid "Partition table of drive %s is going to be written to disk!"
+msgstr "Partisjonstabellen p� disk %s blir n� skrevet til disk!"
 
-#: ../diskdrake.pmc:415 ../diskdrake.pmc:454 ../diskdrake.pmc:505
-msgid "Start sector: "
-msgstr "Start sektor: "
+#: ../diskdrake.pm_.c:420
+msgid "Computing fat filesystem bounds"
+msgstr "Beregner fat filsystemgrense"
+
+#: ../diskdrake.pm_.c:420 ../diskdrake.pm_.c:456 ../interactive_gtk.pm_.c:81
+msgid "Resizing"
+msgstr "Endrer st�rrelse"
 
-#: ../diskdrake.pmc:418 ../diskdrake.pmc:457
-msgid "Size in Mb: "
-msgstr "St�rrelse i Mb: "
+#: ../diskdrake.pm_.c:426
+msgid "resizing"
+msgstr "Endrer st�rrelse"
 
-#: ../diskdrake.pmc:421 ../diskdrake.pmc:460 ../diskdrake.pmc:511
-msgid "Filesystem type: "
-msgstr "Filsystemtype: "
+#: ../diskdrake.pm_.c:436
+msgid "Choose the new size"
+msgstr "Velg ny st�rrelse"
 
-#: ../diskdrake.pmc:442
+#: ../diskdrake.pm_.c:436
 msgid "MB"
 msgstr "MB"
 
-#: ../diskdrake.pmc:492 ../diskdrake.pmc:512 ../diskdrake.pmc:555
-#: ../diskdrake.pmc:573
-msgid "Select file"
-msgstr "Velg fil"
+#: ../diskdrake.pm_.c:474
+msgid "Create a new partition"
+msgstr "Opprette en ny partisjon"
+
+#: ../diskdrake.pm_.c:490
+msgid "Start sector: "
+msgstr "Start sektor: "
 
-#: ../diskdrake.pmc:508
+#: ../diskdrake.pm_.c:493
 msgid "Size in MB: "
 msgstr "St�rrelse i MB: "
 
-#: ../diskdrake.pmc:513
+#: ../diskdrake.pm_.c:496
+msgid "Filesystem type: "
+msgstr "Filsystemtype: "
+
+#: ../diskdrake.pm_.c:498
 msgid "Preference: "
 msgstr "Valg: "
 
-#: ../diskdrake.pmc:574
+#: ../diskdrake.pm_.c:540 ../diskdrake.pm_.c:556
+msgid "Select file"
+msgstr "Velg fil"
+
+#: ../diskdrake.pm_.c:557
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../fs.pmc:68 ../fs.pmc:74
+#: ../fs.pm_.c:69 ../fs.pm_.c:75
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s formatering av %s mislykket"
 
-#: ../fs.pmc:93
+#: ../fs.pm_.c:94
 #, c-format
 msgid "don't know how to format %s in type %s"
 msgstr "Vet ikke hvordan formatere %s i type %s"
 
-#: ../fs.pmc:106
+#: ../fs.pm_.c:107
 msgid "nfs mount failed"
 msgstr "nfs montering mislykket"
 
-#: ../fs.pmc:117
+#: ../fs.pm_.c:124
 msgid "mount failed: "
 msgstr "montering mislykket: "
 
-#: ../fs.pmc:127
+#: ../fs.pm_.c:134
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "feil ved demontering av %s: %s"
 
-#: ../fsedit.pmc:41 ../fsedit.pmc:43
+#: ../fsedit.pm_.c:43
 #, c-format
 msgid "An error occurred while getting the geometry of block device %s: %s"
 msgstr "En feil oppsto ved henting av geometrien til blokkenhet %s: %s"
 
-#: ../fsedit.pmc:117 ../fsedit.pmc:120 ../fsedit.pmc:124
+#: ../fsedit.pm_.c:124
 msgid "Mount points must begin with a leading /"
 msgstr "Monteringspunkter m� begynne med /"
 
-#: ../fsedit.pmc:120 ../fsedit.pmc:123 ../fsedit.pmc:127
+#: ../fsedit.pm_.c:127
 #, c-format
 msgid "There is already a partition with mount point %s"
 msgstr "Det finnes allerede en partisjon med monteringspunkt %s"
 
-#: ../fsedit.pmc:247
+#: ../fsedit.pm_.c:251
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Feil ved �pning av %s for skriving: %s"
 
-#: ../install2.pmc:25 ../install2.pmc:27
+#: ../install2.pm_.c:25
 msgid "Choose your language"
 msgstr "Velg ditt spr�k"
 
-#: ../install2.pmc:26 ../install2.pmc:28 ../install2.pmc:50 ../install2.pmc:52
+#: ../install2.pm_.c:26
 msgid "Choose install or upgrade"
 msgstr "Velg installering eller oppgradering"
 
-#: ../install2.pmc:26 ../install2.pmc:27 ../install2.pmc:28 ../install2.pmc:29
-#: ../install2.pmc:30 ../install2.pmc:31 ../install2.pmc:32 ../install2.pmc:33
-#: ../install2.pmc:34 ../install2.pmc:35 ../install2.pmc:37 ../install2.pmc:39
-#: ../install2.pmc:40 ../install2.pmc:41 ../install2.pmc:42 ../install2.pmc:43
-#: ../install2.pmc:44 ../install2.pmc:46 ../install2.pmc:50 ../install2.pmc:51
-#: ../install2.pmc:52 ../install2.pmc:53 ../install2.pmc:54 ../install2.pmc:55
-#: ../install2.pmc:56 ../install2.pmc:57 ../install2.pmc:58 ../install2.pmc:59
-#: ../install2.pmc:60 ../install2.pmc:61
+#: ../install2.pm_.c:26 ../install2.pm_.c:27 ../install2.pm_.c:28
+#: ../install2.pm_.c:29 ../install2.pm_.c:30 ../install2.pm_.c:31
+#: ../install2.pm_.c:32 ../install2.pm_.c:34 ../install2.pm_.c:38
+#: ../install2.pm_.c:39 ../install2.pm_.c:40 ../install2.pm_.c:41
+#: ../install2.pm_.c:42 ../install2.pm_.c:43
 msgid "help"
 msgstr "hjelp"
 
-#: ../install2.pmc:27 ../install2.pmc:29 ../install2.pmc:51 ../install2.pmc:53
+#: ../install2.pm_.c:27
 msgid "Select installation class"
 msgstr "Velg installasjonsklasse"
 
-#: ../install2.pmc:28 ../install2.pmc:30 ../install2.pmc:52 ../install2.pmc:54
+#: ../install2.pm_.c:28
 msgid "Setup SCSI"
 msgstr "Oppsett SCSI"
 
-#: ../install2.pmc:29 ../install2.pmc:31
+#: ../install2.pm_.c:29
 msgid "Setup filesystems"
 msgstr "Oppsett filsystemer"
 
-#: ../install2.pmc:30 ../install2.pmc:32
+#: ../install2.pm_.c:30
 msgid "Format partitions"
 msgstr "Formater partisjoner"
 
-#: ../install2.pmc:31 ../install2.pmc:33 ../install2.pmc:54 ../install2.pmc:56
-msgid "Find installation files"
-msgstr "Finn installasjonsfiler"
-
-#: ../install2.pmc:32 ../install2.pmc:34
+#: ../install2.pm_.c:31
 msgid "Choose packages to install"
 msgstr "Velg pakker for installering"
 
-#: ../install2.pmc:33 ../install2.pmc:35
+#: ../install2.pm_.c:32
 msgid "Install system"
 msgstr "Installer systemet"
 
-#: ../install2.pmc:35 ../install2.pmc:37
+#: ../install2.pm_.c:34
 msgid "Configure networking"
 msgstr "Konfigurer nettverk"
 
-#: ../install2.pmc:39 ../install2.pmc:41 ../install_steps_graphical.pmc:296
-#: ../install_steps_graphical.pmc:298 ../install_steps_graphical.pmc:348
+#: ../install2.pm_.c:38 ../install_steps_graphical.pm_.c:369
 msgid "Set root password"
 msgstr "Sett root passord"
 
-#: ../install2.pmc:40 ../install2.pmc:42
+#: ../install2.pm_.c:39
 msgid "Add a user"
 msgstr "Legg til en bruker"
 
-#: ../install2.pmc:41 ../install2.pmc:43 ../install2.pmc:57 ../install2.pmc:59
+#: ../install2.pm_.c:40
 msgid "Create bootdisk"
 msgstr "Opprett oppstartdiskett"
 
-#: ../install2.pmc:42 ../install2.pmc:44 ../install2.pmc:58 ../install2.pmc:60
+#: ../install2.pm_.c:41
 msgid "Install bootloader"
 msgstr "Installer oppstartslaster"
 
-#: ../install2.pmc:43
+#: ../install2.pm_.c:42
 msgid "Configure X"
 msgstr "Konfigurer X"
 
-#: ../install2.pmc:44 ../install2.pmc:46 ../install2.pmc:59 ../install2.pmc:61
+#: ../install2.pm_.c:43
 msgid "Exit install"
 msgstr "G� ut av installering"
 
-#: ../install2.pmc:53 ../install2.pmc:55
-msgid "Find current installation"
-msgstr "Finn n�v�rende installasjon"
-
-#: ../install2.pmc:55 ../install2.pmc:57
-msgid "Choose packages to upgrade"
-msgstr "Velg pakker som skal oppgraderes"
-
-#: ../install2.pmc:56 ../install2.pmc:58
-msgid "Upgrade system"
-msgstr "Oppgrader systemet"
+#: ../install2.pm_.c:56
+msgid "beginner"
+msgstr ""
 
-#: ../install2.pmc:80 ../install2.pmc:82
+#: ../install2.pm_.c:56
 msgid "developer"
 msgstr "utvikler"
 
-#: ../install2.pmc:80 ../install2.pmc:82
+#: ../install2.pm_.c:56
 msgid "expert"
 msgstr "Ekspert"
 
-#: ../install2.pmc:80 ../install2.pmc:82
-msgid "newbie"
-msgstr "nybegynner"
-
-#: ../install2.pmc:80 ../install2.pmc:82
+#: ../install2.pm_.c:56
 msgid "server"
 msgstr "tjener"
 
-#: ../install2.pmc:137 ../install2.pmc:146
+#: ../install2.pm_.c:129
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
@@ -860,151 +787,185 @@ msgstr ""
 "En feil har oppst�tt - ingen gyldige enheter ble funnet for � opprette nye "
 "filsystemer. Vennligst sjekk maskinvaren din for �rsaken til dette problemet"
 
-#: ../install2.pmc:156 ../install2.pmc:165
+#: ../install2.pm_.c:150
 msgid "partitionning failed: no root filesystem"
 msgstr "partisjonering feilet: intet root filsystem"
 
-#: ../install_steps_graphical.pmc:93 ../install_steps_interactive.pmc:52
-#: ../install_steps_interactive.pmc:53
-msgid "Install/Upgrade"
-msgstr "Installer/Oppgrader"
-
-#: ../install_steps_graphical.pmc:94 ../install_steps_interactive.pmc:54
-#: ../install_steps_interactive.pmc:55
-msgid "Install"
-msgstr "Installer"
-
-#: ../install_steps_graphical.pmc:94 ../install_steps_interactive.pmc:53
-#: ../install_steps_interactive.pmc:54
-msgid "Is it an install or an upgrade?"
-msgstr "Er det en installasjon eller en oppgradering?"
-
-#: ../install_steps_graphical.pmc:94 ../install_steps_interactive.pmc:54
-#: ../install_steps_interactive.pmc:55
-msgid "Upgrade"
-msgstr "Oppgrader"
-
-#: ../install_steps_graphical.pmc:105 ../install_steps_interactive.pmc:67
-#: ../install_steps_interactive.pmc:85
-msgid "You need to reboot for the partition table modifications to take place"
-msgstr "" 
-"Du m� starte maskinen p� nytt for at modifiseringene av partisjonstabellen "
-"skal tre i kraft"
+#: ../install_steps_graphical.pm_.c:216
+#, fuzzy
+msgid "Select All"
+msgstr "Velg fil"
 
-#: ../install_steps_graphical.pmc:106 ../install_steps_graphical.pmc:115
-#: ../install_steps_graphical.pmc:148
-msgid "Choose partitions you want to format"
-msgstr "Velg partisjoner du �nsker � formatere"
+#: ../install_steps_graphical.pm_.c:216
+#, fuzzy
+msgid "Unselect All"
+msgstr "Velg fil"
 
-#: ../install_steps_graphical.pmc:199 ../install_steps_graphical.pmc:203
-#: ../install_steps_graphical.pmc:251
+#: ../install_steps_graphical.pm_.c:265
 msgid "Choose the packages you want to install"
 msgstr "Velg pakker du �nsker � installere"
 
-#: ../install_steps_graphical.pmc:211 ../install_steps_graphical.pmc:215
-#: ../install_steps_graphical.pmc:262
+#: ../install_steps_graphical.pm_.c:276
+msgid " Mb"
+msgstr "Mb"
+
+#: ../install_steps_graphical.pm_.c:276
 msgid "Total size: "
 msgstr "Total st�rrelse: "
 
-#: ../install_steps_graphical.pmc:219 ../install_steps_graphical.pmc:270
+#: ../install_steps_graphical.pm_.c:284
 msgid "Show All"
 msgstr "Vis alle"
 
-#: ../install_steps_graphical.pmc:232 ../install_steps_graphical.pmc:234
-#: ../install_steps_graphical.pmc:284
+#: ../install_steps_graphical.pm_.c:303
 msgid "Installing"
 msgstr "Installerer"
 
-#: ../install_steps_graphical.pmc:237 ../install_steps_graphical.pmc:239
-#: ../install_steps_graphical.pmc:289
+#: ../install_steps_graphical.pm_.c:309
 msgid "Please wait, "
 msgstr "Vennligst vent, "
 
-#: ../install_steps_graphical.pmc:239 ../install_steps_graphical.pmc:241
-#: ../install_steps_graphical.pmc:291
+#: ../install_steps_graphical.pm_.c:311
 msgid "Time remaining "
 msgstr "Tid som gjenst�r "
 
-#: ../install_steps_graphical.pmc:240 ../install_steps_graphical.pmc:242
-#: ../install_steps_graphical.pmc:292
+#: ../install_steps_graphical.pm_.c:312
 msgid "Total time "
 msgstr "Total tid "
 
-#: ../install_steps_graphical.pmc:245 ../install_steps_graphical.pmc:247
-#: ../install_steps_graphical.pmc:297
+#: ../install_steps_graphical.pm_.c:317
 msgid "preparing installation"
 msgstr "forbereder installasjon"
 
-#: ../install_steps_graphical.pmc:266 ../install_steps_graphical.pmc:268
-#: ../install_steps_graphical.pmc:318
+#: ../install_steps_graphical.pm_.c:338
 #, c-format
 msgid "installing package %s"
 msgstr "installerer pakke %s"
 
-#: ../install_steps_graphical.pmc:300 ../install_steps_graphical.pmc:302
-#: ../install_steps_graphical.pmc:326 ../install_steps_graphical.pmc:329
-#: ../install_steps_graphical.pmc:352 ../install_steps_graphical.pmc:379
+#: ../install_steps_graphical.pm_.c:373 ../install_steps_graphical.pm_.c:407
 msgid "Password"
 msgstr "Passord"
 
-#: ../install_steps_graphical.pmc:301 ../install_steps_graphical.pmc:303
-#: ../install_steps_graphical.pmc:327 ../install_steps_graphical.pmc:330
-#: ../install_steps_graphical.pmc:353 ../install_steps_graphical.pmc:380
+#: ../install_steps_graphical.pm_.c:374 ../install_steps_graphical.pm_.c:408
 msgid "Password (again)"
 msgstr "Passord (igjen)"
 
-#: ../install_steps_graphical.pmc:311 ../install_steps_graphical.pmc:313
-#: ../install_steps_graphical.pmc:343 ../install_steps_graphical.pmc:346
-#: ../install_steps_graphical.pmc:363 ../install_steps_graphical.pmc:396
+#: ../install_steps_graphical.pm_.c:390 ../install_steps_graphical.pm_.c:431
 msgid "Please try again"
 msgstr "Vennligst pr�v igjen"
 
-#: ../install_steps_graphical.pmc:311 ../install_steps_graphical.pmc:313
-#: ../install_steps_graphical.pmc:343 ../install_steps_graphical.pmc:346
-#: ../install_steps_graphical.pmc:363 ../install_steps_graphical.pmc:396
+#: ../install_steps_graphical.pm_.c:390 ../install_steps_graphical.pm_.c:431
 msgid "You must enter the same password"
 msgstr "Du m� skrive inn det samme passordet"
 
-#: ../install_steps_graphical.pmc:312
-msgid "You must give a password"
-msgstr "Du m� oppgi et passord"
-
-#: ../install_steps_graphical.pmc:314 ../install_steps_graphical.pmc:364
+#: ../install_steps_graphical.pm_.c:391
 msgid "This password is too simple"
 msgstr "Dette passordet er for enkelt"
 
-#: ../install_steps_graphical.pmc:321 ../install_steps_graphical.pmc:324
-#: ../install_steps_graphical.pmc:374
+#: ../install_steps_graphical.pm_.c:402
 msgid "Add user"
 msgstr "Legg til bruker"
 
-#: ../install_steps_graphical.pmc:325 ../install_steps_graphical.pmc:328
-#: ../install_steps_graphical.pmc:378
+#: ../install_steps_graphical.pm_.c:406
 msgid "User name"
 msgstr "Brukernavn"
 
-#: ../install_steps_graphical.pmc:328 ../install_steps_graphical.pmc:331
-#: ../install_steps_graphical.pmc:381
+#: ../install_steps_graphical.pm_.c:409
 msgid "Real name"
 msgstr "Virkelig navn"
 
-#: ../install_steps_graphical.pmc:329 ../install_steps_graphical.pmc:332
-#: ../install_steps_graphical.pmc:382
+#: ../install_steps_graphical.pm_.c:410
 msgid "Shell"
 msgstr "Skall"
 
-#: ../install_steps_graphical.pmc:345 ../install_steps_graphical.pmc:348
-#: ../install_steps_graphical.pmc:398
+#: ../install_steps_graphical.pm_.c:433
 msgid "Please give a user name"
 msgstr "Vennligst oppgi et brukernavn"
 
-#: ../install_steps_graphical.pmc:346 ../install_steps_graphical.pmc:349
-#: ../install_steps_graphical.pmc:399
+#: ../install_steps_graphical.pm_.c:434
 msgid "The user name must contain only letters, numbers, `-' and `_'"
 msgstr "Brukernavnet kan kun inneholde bokstaver, tall, `-' og `_'"
 
-#: ../install_steps_graphical.pmc:358 ../install_steps_interactive.pmc:101
-#: ../install_steps_interactive.pmc:104
+#: ../install_steps_interactive.pm_.c:41
+msgid "An error occured"
+msgstr "En feil oppsto"
+
+#: ../install_steps_interactive.pm_.c:48
+msgid "Which language do you want?"
+msgstr "Hvilket spr�k �nsker du?"
+
+#: ../install_steps_interactive.pm_.c:54
+msgid "Install/Upgrade"
+msgstr "Installer/Oppgrader"
+
+#: ../install_steps_interactive.pm_.c:55
+#, fuzzy
+msgid "Is it an install or an updgrade?"
+msgstr "Er det en installasjon eller en oppgradering?"
+
+#: ../install_steps_interactive.pm_.c:56
+msgid "Install"
+msgstr "Installer"
+
+#: ../install_steps_interactive.pm_.c:56
+msgid "Upgrade"
+msgstr "Oppgrader"
+
+#: ../install_steps_interactive.pm_.c:62
+msgid "Install Class"
+msgstr "Installeringsklasse"
+
+#: ../install_steps_interactive.pm_.c:63
+msgid "What type of user will you have?"
+msgstr "Hva slags brukertype vil du ha?"
+
+#: ../install_steps_interactive.pm_.c:72
+#, c-format
+msgid "Installing driver for scsi card %s"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:73
+#, c-format
+msgid "(module %s)"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:82
+#, fuzzy
+msgid " scsi interfaces"
+msgstr "scsi grensesnitt"
+
+#: ../install_steps_interactive.pm_.c:82
+msgid "Found "
+msgstr "Funnet"
+
+#: ../install_steps_interactive.pm_.c:83
+msgid "Do you have another one?"
+msgstr "Har du enda ett?"
+
+#: ../install_steps_interactive.pm_.c:84
+msgid "Do you have an scsi interface?"
+msgstr "Har du et scsi grensesnitt"
+
+#: ../install_steps_interactive.pm_.c:86
+msgid "What scsi card have you?"
+msgstr "Hva slags scsi-kort har du?"
+
+#: ../install_steps_interactive.pm_.c:95
+msgid "You need to reboot for the partition table modifications to take place"
+msgstr ""
+"Du m� starte maskinen p� nytt for at modifiseringene av partisjonstabellen "
+"skal tre i kraft"
+
+#: ../install_steps_interactive.pm_.c:103
+msgid "Choose the partitions you want to format"
+msgstr "Velg de partisjonene du �nsker � formatere"
+
+#: ../install_steps_interactive.pm_.c:116
+#, fuzzy, c-format
+msgid "Formatting partition %s"
+msgstr "Formater partisjoner"
+
+#: ../install_steps_interactive.pm_.c:126
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -1025,138 +986,149 @@ msgstr ""
 "med din maskinvarekonfigurasjon. En egendefinert oppstartsdiskett kan ogs� "
 "brukes sammen med\n"
 "Mandrake's redningsdiskett som gj�r det lettere � gjenopprette etter "
-"systemfeil.\n" 
+"systemfeil.\n"
 "�nsker du � opprette en oppstartsdisk for systemet ditt?"
 
-#: ../install_steps_graphical.pmc:369 ../install_steps_interactive.pmc:112
-#: ../install_steps_interactive.pmc:121
+#: ../install_steps_interactive.pm_.c:133
+msgid "Insert a floppy in drive fd0 (aka A:)"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:134
+#, fuzzy
+msgid "Creating bootdisk"
+msgstr "Opprett oppstartdiskett"
+
+#: ../install_steps_interactive.pm_.c:141
 msgid "First sector of boot partition"
 msgstr "F�rste sektor av oppstartspartisjonen"
 
-#: ../install_steps_graphical.pmc:369 ../install_steps_graphical.pmc:370
-#: ../install_steps_interactive.pmc:112 ../install_steps_interactive.pmc:113
-#: ../install_steps_interactive.pmc:121 ../install_steps_interactive.pmc:122
+#: ../install_steps_interactive.pm_.c:141
 msgid "First sector of drive"
 msgstr "F�rste sektor av disk"
 
-#: ../install_steps_graphical.pmc:369 ../install_steps_interactive.pmc:112
-#: ../install_steps_interactive.pmc:121
+#: ../install_steps_interactive.pm_.c:144
 msgid "Lilo Installation"
 msgstr "Lilo installasjon"
 
-#: ../install_steps_graphical.pmc:369 ../install_steps_interactive.pmc:112
-#: ../install_steps_interactive.pmc:121
+#: ../install_steps_interactive.pm_.c:145
 msgid "Where do you want to install the bootloader?"
 msgstr "Hvor �nsker du � installer oppstartslasteren?"
 
-#: ../install_steps_interactive.pmc:39 ../install_steps_interactive.pmc:41
-msgid "An error occured"
-msgstr "En feil oppsto"
-
-#: ../install_steps_interactive.pmc:46 ../install_steps_interactive.pmc:47
-msgid "Which language do you want?"
-msgstr "Hvilket spr�k �nsker du?"
-
-#: ../install_steps_interactive.pmc:60 ../install_steps_interactive.pmc:61
-msgid "Install Class"
-msgstr "Installeringsklasse"
-
-#: ../install_steps_interactive.pmc:61 ../install_steps_interactive.pmc:62
-msgid "What type of user will you have?"
-msgstr "Hva slags brukertype vil du ha?"
-
-#: ../install_steps_interactive.pmc:72
-msgid " scsi interface"
-msgstr "scsi grensesnitt"
-
-#: ../install_steps_interactive.pmc:72
-msgid "Found "
-msgstr "Funnet"
-
-#: ../install_steps_interactive.pmc:73
-msgid "Do you have another one?"
-msgstr "Har du enda ett?"
-
-#: ../install_steps_interactive.pmc:74 ../install_steps_interactive.pmc:92
-msgid "Choose the partitions you want to format"
-msgstr "Velg de partisjonene du �nsker � formatere"
-
-#: ../install_steps_interactive.pmc:74
-msgid "Do you have an scsi interface?"
-msgstr "Har du et scsi grensesnitt"
-
-#: ../install_steps_interactive.pmc:76
-msgid "What scsi card have you?"
-msgstr "Hva slags scsi-kort har du?"
-
-#: ../install_steps_stdio.pmc:21
+#: ../install_steps_stdio.pm_.c:21
 #, c-format
 msgid "Starting step `%s'\n"
 msgstr "Starter steg `%s'\n"
 
-#: ../interactive.pmc:19 ../interactive.pmc:27 ../my_gtk.pmc:132
-#: ../my_gtk.pmc:161 ../my_gtk.pmc:171 ../my_gtk.pmc:227 ../my_gtk.pmc:262
-#: ../my_gtk.pmc:300 ../my_gtk.pmc:307 ../my_gtk.pmc:336 ../my_gtk.pmc:381
+#: ../interactive.pm_.c:19 ../interactive.pm_.c:27 ../my_gtk.pm_.c:174
+#: ../my_gtk.pm_.c:316 ../my_gtk.pm_.c:390
 msgid "Ok"
 msgstr "Ok"
 
-#: ../interactive.pmc:23 ../my_gtk.pmc:226 ../my_gtk.pmc:261 ../my_gtk.pmc:306
+#: ../interactive.pm_.c:23 ../my_gtk.pm_.c:315
 msgid "No"
 msgstr "Nei"
 
-#: ../interactive.pmc:23 ../my_gtk.pmc:226 ../my_gtk.pmc:261 ../my_gtk.pmc:306
+#: ../interactive.pm_.c:23 ../my_gtk.pm_.c:315
 msgid "Yes"
 msgstr "Ja"
 
-#: ../interactive.pmc:27 ../my_gtk.pmc:133 ../my_gtk.pmc:162 ../my_gtk.pmc:172
-#: ../my_gtk.pmc:227 ../my_gtk.pmc:262 ../my_gtk.pmc:307
+#: ../interactive.pm_.c:27 ../my_gtk.pm_.c:175 ../my_gtk.pm_.c:316
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../interactive_stdio.pmc:34
+#: ../interactive.pm_.c:65
+msgid "Please wait"
+msgstr "Vennligst vent"
+
+#: ../interactive_stdio.pm_.c:34
 #, c-format
 msgid "Ambiguity (%s) be more precise\n"
 msgstr "Tvetydig (%s) v�r mere presis\n"
 
-#: ../interactive_stdio.pmc:35 ../interactive_stdio.pmc:50
-#: ../interactive_stdio.pmc:69
+#: ../interactive_stdio.pm_.c:35 ../interactive_stdio.pm_.c:50
+#: ../interactive_stdio.pm_.c:69
 msgid "Bad choice, try again\n"
 msgstr "D�rlig valg, pr�v igjen\n"
 
-#: ../interactive_stdio.pmc:38
+#: ../interactive_stdio.pm_.c:38
 #, c-format
 msgid " ? (default %s) "
 msgstr " ? (standard %s) "
 
-#: ../interactive_stdio.pmc:51
+#: ../interactive_stdio.pm_.c:51
 #, c-format
 msgid "Your choice? (default %s) "
 msgstr "Ditt valg? (standard %s) "
 
-#: ../interactive_stdio.pmc:70
+#: ../interactive_stdio.pm_.c:70
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Ditt valg? (standard %s  trykk `none' for ingen) "
 
-#: ../my_gtk.pmc:227 ../my_gtk.pmc:262 ../my_gtk.pmc:307
+#: ../my_gtk.pm_.c:316
 msgid "Is it ok?"
 msgstr "Er det ok?"
 
-#: ../partition_table.pmc:365 ../partition_table.pmc:451
+#: ../partition_table.pm_.c:457
 #, c-format
 msgid "Error reading file %s"
 msgstr "Feil ved lesing av fil %s"
 
-#: ../partition_table.pmc:372 ../partition_table.pmc:458
+#: ../partition_table.pm_.c:464
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Gjenoppretting fra fil %s mislykket: %s"
 
-#: ../partition_table.pmc:374 ../partition_table.pmc:460
+#: ../partition_table.pm_.c:466
 msgid "Bad backup file"
 msgstr "D�rlig backup-fil"
 
-#: ../partition_table.pmc:394 ../partition_table.pmc:480
+#: ../partition_table.pm_.c:486
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Feil ved skriving til fil %s"
+
+#~ msgid "Expert"
+#~ msgstr "Expert"
+
+#~ msgid "Start: sector"
+#~ msgstr "Start: sektor"
+
+#~ msgid "Mb\n"
+#~ msgstr "Mb\n"
+
+#~ msgid "Size: "
+#~ msgstr "St�rrelse: "
+
+#~ msgid "Size: %s Mb (%s%%)\n"
+#~ msgstr "St�rrelse: %s Mb (%s%%)\n"
+
+#~ msgid "Forget the modification to partition table?"
+#~ msgstr "Glem modifiseringen til partisjonstabellen?"
+
+#~ msgid "Mb"
+#~ msgstr "Mb"
+
+#~ msgid "Size in Mb: "
+#~ msgstr "St�rrelse i Mb: "
+
+#~ msgid "Find installation files"
+#~ msgstr "Finn installasjonsfiler"
+
+#~ msgid "Find current installation"
+#~ msgstr "Finn n�v�rende installasjon"
+
+#~ msgid "Choose packages to upgrade"
+#~ msgstr "Velg pakker som skal oppgraderes"
+
+#~ msgid "Upgrade system"
+#~ msgstr "Oppgrader systemet"
+
+#~ msgid "newbie"
+#~ msgstr "nybegynner"
+
+#~ msgid "Choose partitions you want to format"
+#~ msgstr "Velg partisjoner du �nsker � formatere"
+
+#~ msgid "You must give a password"
+#~ msgstr "Du m� oppgi et passord"