summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-11-18 19:07:47 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-11-18 19:07:47 +0000
commitc98ddd12f5d5f777099376ce9718c01acf55566b (patch)
tree283b87c6f5a2fb1420ae70b86746fc568d928870 /perl-install
parent7c32cf9c3f2c6ad9884716f67aee1a2979812de9 (diff)
downloaddrakx-backup-do-not-use-c98ddd12f5d5f777099376ce9718c01acf55566b.tar
drakx-backup-do-not-use-c98ddd12f5d5f777099376ce9718c01acf55566b.tar.gz
drakx-backup-do-not-use-c98ddd12f5d5f777099376ce9718c01acf55566b.tar.bz2
drakx-backup-do-not-use-c98ddd12f5d5f777099376ce9718c01acf55566b.tar.xz
drakx-backup-do-not-use-c98ddd12f5d5f777099376ce9718c01acf55566b.zip
no_comment
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/Makefile23
-rw-r--r--perl-install/Xconfigurator.pm2
-rw-r--r--perl-install/c/Makefile6
-rw-r--r--perl-install/install_any.pm5
-rw-r--r--perl-install/install_steps_interactive.pm2
-rw-r--r--perl-install/interactive_newt.pm1
-rw-r--r--perl-install/share/compssList7
-rw-r--r--perl-install/share/po/DrakX.pot326
-rw-r--r--perl-install/share/po/no.po333
9 files changed, 358 insertions, 347 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 1b9f28c49..e314c283d 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -28,20 +28,11 @@ clean:
rm -rf auto ../diskdrake*
find . -name "*~" -o -name ".#*" -o -name "TAGS" -o -name "*.old" | xargs rm -f
-tar: clean
- cd .. ; tar cfy perl-install.tar.bz2 $(EXCLUDE:%=--exclude %) perl-install
-
-tar-diskdrake: clean pci_probing
- cd .. ; rm -rf diskdrake ; cp -af perl-install diskdrake
-
- l=`./perl2fcalls -uses -excludec -excluderesize_fat::c_rewritten diskdrake | sort | uniq | grep -v "^resize_fat::" | sed -e 's/::/\//' -e 's/^/diskdrake\//' -e 's/$$/.pm/'` ; \
- cd .. ; tar cfz diskdrake.tgz --exclude CVS $(patsubst %,diskdrake/%,c c.pm resize_fat po diskdrake*) $$l
-
-tar-XFdrake: clean
- cd .. ; rm -rf XFdrake ; cp -af perl-install XFdrake
-
- l=`./perl2fcalls -uses -excludec -excludepci_probing::ids XFdrake | sort | uniq | sed -e 's/::/\//' -e 's/^/XFdrake\//' -e 's/$$/.pm/'` ; \
- cd .. ; tar cfz XFdrake.tgz --exclude CVS $(patsubst %,XFdrake/%,c MonitorsDB po pci_probing XFdrake*) $$l
+tar-drakxtools: clean
+ cd .. ; rm -rf drakxtools ; cp -af perl-install drakxtools ; cp -af tools/ddcprobe drakxtools
+ cd ../drakxtools ; rm -f install* ForMakefile.pm pkgs.pm ftp.pm t.pm ; mv Makefile.drakxtools Makefile
+ cd .. ; tar cfy drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile MonitorsDB Newt c ddcprobe po pci_probing resize_fat diskdrake diskdrake.rc XFdrake *.pm)
+ cd .. ; rm -rf drakxtools
$(DIRS):
install -d auto
@@ -91,6 +82,7 @@ get_needed_files: $(DIRS)
install -d $(DEST)/usr/share
install -d $(DEST)/usr/share/gtk
install -d $(DEST)/usr/share/xmodmap
+ install -d $(DEST)/usr/X11R6/lib/X11
install -d $(ROOTDEST)/Mandrake/base
install -s $(LOCALFILES) $(DEST)/usr/bin
cp -f $(LOCALFILES2) $(DEST)/usr/bin
@@ -126,7 +118,8 @@ get_needed_files: $(DIRS)
cp -a keymaps $(DEST)/usr/share
cp -a consolefonts $(DEST)/usr/share
- cp ifcfg-ppp.* chat-ppp.* kppprc.in modparm.lst MonitorsDB $(DEST)/usr/share
+ cp ifcfg-ppp.* chat-ppp.* kppprc.in modparm.lst $(DEST)/usr/share
+ cp MonitorsDB $(DEST)/usr/X11R6/lib/X11
cp logo-mandrake.xpm $(DEST)/usr/share
cp -a themes $(DEST)/usr/share/gtk
cp compss compssUsers compssList $(ROOTDEST)/Mandrake/base
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index cdedd020e..b7ce31282 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -214,7 +214,7 @@ sub monitorConfiguration(;$$) {
} else {
$monitor->{hsyncrange} && $monitor->{vsyncrange} and return $monitor;
- readMonitorsDB(-e "MonitorsDB" ? "MonitorsDB" : "/usr/share/MonitorsDB");
+ readMonitorsDB(-e "MonitorsDB" ? "MonitorsDB" : "/usr/X11R6/lib/X11/MonitorsDB");
add2hash($monitor, { type => $in->ask_from_list('', _("Choose a monitor"), ['Unlisted', keys %monitors]) }) unless $monitor->{type};
if ($monitor->{type} eq 'Unlisted') {
diff --git a/perl-install/c/Makefile b/perl-install/c/Makefile
index cd8256d97..14308d97c 100644
--- a/perl-install/c/Makefile
+++ b/perl-install/c/Makefile
@@ -1,7 +1,9 @@
.PHONY: clean
+C_RPM = 1
+
stuff: %: %.xs
- test -e Makefile_c || C_RPM=1 perl Makefile.PL
+ test -e Makefile_c || C_RPM=$(C_RPM) perl Makefile.PL
$(MAKE) -f Makefile_c
rm -f ../auto/c ; ln -s ../c/blib/arch/auto ../auto/c
@@ -11,5 +13,5 @@ clean:
stuff.xs: %: %.pm
rm -f $@
- export C_RPM=1 ; perl $< > $@
+ export C_RPM=$(C_RPM) ; perl $< > $@
chmod a-w $@
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 9086ac435..10a11c639 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -334,12 +334,15 @@ sub killCardServices {
$pid and kill(15, $pid); #- send SIGTERM
}
+sub unlockCdrom() {
+ cat_("/proc/mounts") =~ m|/tmp/(\S+)\s+/tmp/rhimage|;
+ eval { ioctl detect_devices::tryOpen($1), c::CDROM_LOCKDOOR(), 0 };
+}
sub ejectCdrom() {
cat_("/proc/mounts") =~ m|/tmp/(\S+)\s+/tmp/rhimage|;
my $f = eval { detect_devices::tryOpen($1) } or return;
getFile("XXX"); #- close still opened filehandle
eval { fs::umount("/tmp/rhimage") };
- ioctl $f, c::CDROM_LOCKDOOR(), 0; #- in case the umount fails...
ioctl $f, c::CDROMEJECT(), 1;
}
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 822b38493..a0567d5f1 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -941,6 +941,8 @@ _("Some steps are not completed.
Do you really want to quit now?"), 0);
+ install_any::unlockCdrom;
+
$o->ask_warn('',
_("Congratulations, installation is complete.
Remove the boot media and press return to reboot.
diff --git a/perl-install/interactive_newt.pm b/perl-install/interactive_newt.pm
index 4a58dc1a2..3325dfb28 100644
--- a/perl-install/interactive_newt.pm
+++ b/perl-install/interactive_newt.pm
@@ -46,7 +46,6 @@ sub ask_from_listW {
my ($title, @okcancel) = ref $title_ ? @$title_ : ($title_, _("Ok"), _("Cancel"));
my $mesg = join("\n", @$messages);
- log::l("ask_from_listW: " . (join "|", @$l));
if (@$l == 1) {
Newt::WinMessage($title, @$l, $mesg);
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index 70f4316d9..3e99b1a80 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -286,13 +286,6 @@ kdf 88 0 66
kdiff 82 0 60
kdiskcat 82 0 60
kdpms 82 0 60
-kernel-doc 1 0 71
-kernel-headers 1 0 77
-kernel-ibcs 1 0 0
-kernel-pcmcia-cs 0 0 0
-kernel-smp 0 0 0
-kernel-smp-fb 1 0 0
-kernel-source 1 0 68
kernelcfg 15 90 80
kfortune 82 0 60
kfsstatus 82 0 60
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 7dbda2357..ee29ffc1a 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-11-17 17:21+0100\n"
+"POT-Creation-Date: 1999-11-18 20:02+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,27 +14,27 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: ../Xconfigurator.pm_.c:158
+#: ../Xconfigurator.pm_.c:159
msgid "Select a graphic card"
msgstr ""
-#: ../Xconfigurator.pm_.c:159
+#: ../Xconfigurator.pm_.c:160
msgid "Choose a X server"
msgstr ""
-#: ../Xconfigurator.pm_.c:178
+#: ../Xconfigurator.pm_.c:179
msgid "Select the memory size of your graphic card"
msgstr ""
-#: ../Xconfigurator.pm_.c:200
+#: ../Xconfigurator.pm_.c:201
msgid "Choose options for server"
msgstr ""
-#: ../Xconfigurator.pm_.c:218
+#: ../Xconfigurator.pm_.c:219
msgid "Choose a monitor"
msgstr ""
-#: ../Xconfigurator.pm_.c:221
+#: ../Xconfigurator.pm_.c:222
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
"rate\n"
@@ -48,184 +48,184 @@ msgid ""
" If in doubt, choose a conservative setting."
msgstr ""
-#: ../Xconfigurator.pm_.c:228
+#: ../Xconfigurator.pm_.c:229
msgid "Horizontal refresh rate"
msgstr ""
-#: ../Xconfigurator.pm_.c:228
+#: ../Xconfigurator.pm_.c:229
msgid "Vertical refresh rate"
msgstr ""
-#: ../Xconfigurator.pm_.c:269
+#: ../Xconfigurator.pm_.c:270
msgid "Monitor not configured"
msgstr ""
-#: ../Xconfigurator.pm_.c:272
+#: ../Xconfigurator.pm_.c:273
msgid "Graphic card not configured yet"
msgstr ""
-#: ../Xconfigurator.pm_.c:275
+#: ../Xconfigurator.pm_.c:276
msgid "Resolutions not chosen yet"
msgstr ""
-#: ../Xconfigurator.pm_.c:284
+#: ../Xconfigurator.pm_.c:285
msgid "Do you want to test the configuration?"
msgstr ""
-#: ../Xconfigurator.pm_.c:284
+#: ../Xconfigurator.pm_.c:285
msgid "Test configuration"
msgstr ""
-#: ../Xconfigurator.pm_.c:316
+#: ../Xconfigurator.pm_.c:317
msgid "An error occurred:"
msgstr ""
-#: ../Xconfigurator.pm_.c:318
+#: ../Xconfigurator.pm_.c:319
msgid ""
"\n"
"try changing some parameters"
msgstr ""
-#: ../Xconfigurator.pm_.c:339
+#: ../Xconfigurator.pm_.c:340
#, c-format
msgid "(leaving in %d seconds)"
msgstr ""
-#: ../Xconfigurator.pm_.c:343 ../install_steps_interactive.pm_.c:599
+#: ../Xconfigurator.pm_.c:344 ../install_steps_interactive.pm_.c:599
#: ../my_gtk.pm_.c:438
msgid "Is this correct?"
msgstr ""
-#: ../Xconfigurator.pm_.c:351
+#: ../Xconfigurator.pm_.c:352
msgid "An error occurred, try changing some parameters"
msgstr ""
-#: ../Xconfigurator.pm_.c:359 ../Xconfigurator.pm_.c:524
+#: ../Xconfigurator.pm_.c:360 ../Xconfigurator.pm_.c:525
msgid "Automatic resolutions"
msgstr ""
-#: ../Xconfigurator.pm_.c:360
+#: ../Xconfigurator.pm_.c:361
msgid ""
"To find the available resolutions I will try different ones.\n"
"Your screen will blink...\n"
"You can switch if off if you want, you'll hear a beep when it's over"
msgstr ""
-#: ../Xconfigurator.pm_.c:411 ../install_steps_interactive.pm_.c:564
+#: ../Xconfigurator.pm_.c:412 ../install_steps_interactive.pm_.c:564
msgid "Resolution"
msgstr ""
-#: ../Xconfigurator.pm_.c:446
+#: ../Xconfigurator.pm_.c:447
msgid "Choose resolution and color depth"
msgstr ""
-#: ../Xconfigurator.pm_.c:454
+#: ../Xconfigurator.pm_.c:455
msgid "Show all"
msgstr ""
-#: ../Xconfigurator.pm_.c:525
+#: ../Xconfigurator.pm_.c:526
msgid ""
"I can try to find the available resolutions (eg: 800x600).\n"
"Sometimes, though, it may hang the machine.\n"
"Do you want to try?"
msgstr ""
-#: ../Xconfigurator.pm_.c:530
+#: ../Xconfigurator.pm_.c:531
msgid ""
"No valid modes found\n"
"Try with another video card or monitor"
msgstr ""
-#: ../Xconfigurator.pm_.c:721
+#: ../Xconfigurator.pm_.c:722
#, c-format
msgid "Keyboard layout: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:722
+#: ../Xconfigurator.pm_.c:723
#, c-format
msgid "Mouse type: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:723
+#: ../Xconfigurator.pm_.c:724
#, c-format
msgid "Mouse device: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:724
+#: ../Xconfigurator.pm_.c:725
#, c-format
msgid "Monitor: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:725
+#: ../Xconfigurator.pm_.c:726
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:726
+#: ../Xconfigurator.pm_.c:727
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:727
+#: ../Xconfigurator.pm_.c:728
#, c-format
msgid "Graphic card: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:728
+#: ../Xconfigurator.pm_.c:729
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:729
+#: ../Xconfigurator.pm_.c:730
#, c-format
msgid "XFree86 server: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:743
+#: ../Xconfigurator.pm_.c:744
msgid "Preparing X-Window configuration"
msgstr ""
-#: ../Xconfigurator.pm_.c:757
+#: ../Xconfigurator.pm_.c:758
msgid "Change Monitor"
msgstr ""
-#: ../Xconfigurator.pm_.c:758
+#: ../Xconfigurator.pm_.c:759
msgid "Change Graphic card"
msgstr ""
-#: ../Xconfigurator.pm_.c:759
+#: ../Xconfigurator.pm_.c:760
msgid "Change Server options"
msgstr ""
-#: ../Xconfigurator.pm_.c:760
+#: ../Xconfigurator.pm_.c:761
msgid "Change Resolution"
msgstr ""
-#: ../Xconfigurator.pm_.c:761
+#: ../Xconfigurator.pm_.c:762
msgid "Automatical resolutions search"
msgstr ""
-#: ../Xconfigurator.pm_.c:765
+#: ../Xconfigurator.pm_.c:766
msgid "Show information"
msgstr ""
-#: ../Xconfigurator.pm_.c:766
+#: ../Xconfigurator.pm_.c:767
msgid "Test again"
msgstr ""
-#: ../Xconfigurator.pm_.c:767
+#: ../Xconfigurator.pm_.c:768
msgid "Quit"
msgstr ""
-#: ../Xconfigurator.pm_.c:770
+#: ../Xconfigurator.pm_.c:771
msgid "What do you want to do?"
msgstr ""
-#: ../Xconfigurator.pm_.c:777
+#: ../Xconfigurator.pm_.c:778
msgid "X at startup"
msgstr ""
-#: ../Xconfigurator.pm_.c:778
+#: ../Xconfigurator.pm_.c:779
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -251,79 +251,79 @@ msgstr ""
msgid "4 billion colors (32 bits)"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:101
+#: ../Xconfigurator_consts.pm_.c:93
msgid "256 kB"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:102
+#: ../Xconfigurator_consts.pm_.c:94
msgid "512 kB"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:103
+#: ../Xconfigurator_consts.pm_.c:95
msgid "1 MB"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:104
+#: ../Xconfigurator_consts.pm_.c:96
msgid "2 MB"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:105
+#: ../Xconfigurator_consts.pm_.c:97
msgid "4 MB"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:106
+#: ../Xconfigurator_consts.pm_.c:98
msgid "8 MB"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:107
+#: ../Xconfigurator_consts.pm_.c:99
msgid "16 MB or more"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:111 ../Xconfigurator_consts.pm_.c:112
+#: ../Xconfigurator_consts.pm_.c:103 ../Xconfigurator_consts.pm_.c:104
msgid "Standard VGA, 640x480 at 60 Hz"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:113
+#: ../Xconfigurator_consts.pm_.c:105
msgid "Super VGA, 800x600 at 56 Hz"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:114
+#: ../Xconfigurator_consts.pm_.c:106
msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:115
+#: ../Xconfigurator_consts.pm_.c:107
msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:116
+#: ../Xconfigurator_consts.pm_.c:108
msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:117
+#: ../Xconfigurator_consts.pm_.c:109
msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:118
+#: ../Xconfigurator_consts.pm_.c:110
msgid "High Frequency SVGA, 1024x768 at 70 Hz"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:119
+#: ../Xconfigurator_consts.pm_.c:111
msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:120
+#: ../Xconfigurator_consts.pm_.c:112
msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:121
+#: ../Xconfigurator_consts.pm_.c:113
msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:122
+#: ../Xconfigurator_consts.pm_.c:114
msgid "Monitor that can do 1600x1200 at 70 Hz"
msgstr ""
-#: ../Xconfigurator_consts.pm_.c:123
+#: ../Xconfigurator_consts.pm_.c:115
msgid "Monitor that can do 1600x1200 at 76 Hz"
msgstr ""
@@ -701,9 +701,8 @@ msgstr ""
msgid "Choose the new size"
msgstr ""
-#: ../diskdrake.pm_.c:491 ../install_steps_graphical.pm_.c:287
-#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:287
-#: ../install_steps_gtk.pm_.c:334
+#: ../diskdrake.pm_.c:491 ../install_steps_gtk.pm_.c:287
+#: ../install_steps_gtk.pm_.c:334 ../unused/install_steps_graphical.pm_.c:314
msgid "MB"
msgstr ""
@@ -794,27 +793,27 @@ msgstr ""
msgid "error unmounting %s: %s"
msgstr ""
-#: ../fsedit.pm_.c:186
+#: ../fsedit.pm_.c:185
msgid "Mount points must begin with a leading /"
msgstr ""
-#: ../fsedit.pm_.c:189
+#: ../fsedit.pm_.c:188
#, c-format
msgid "There is already a partition with mount point %s"
msgstr ""
-#: ../fsedit.pm_.c:273
+#: ../fsedit.pm_.c:272
#, c-format
msgid "Error opening %s for writing: %s"
msgstr ""
-#: ../fsedit.pm_.c:345
+#: ../fsedit.pm_.c:344
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"
msgstr ""
-#: ../fsedit.pm_.c:360
+#: ../fsedit.pm_.c:359
msgid "You don't have any partitions!"
msgstr ""
@@ -1371,11 +1370,11 @@ msgstr ""
msgid "server"
msgstr ""
-#: ../install2.pm_.c:310
+#: ../install2.pm_.c:311
msgid "Partitioning failed: no root filesystem"
msgstr ""
-#: ../install2.pm_.c:324
+#: ../install2.pm_.c:325
msgid "Not enough swap to fulfill installation, please add some"
msgstr ""
@@ -1412,11 +1411,11 @@ msgstr ""
msgid "Can't use broadcast with no NIS domain"
msgstr ""
-#: ../install_any.pm_.c:422
+#: ../install_any.pm_.c:425
msgid "Error reading file $f"
msgstr ""
-#: ../install_any.pm_.c:428
+#: ../install_any.pm_.c:431
#, c-format
msgid "Bad kickstart file %s (failed %s)"
msgstr ""
@@ -1441,87 +1440,83 @@ msgstr ""
msgid "Entering step `%s'\n"
msgstr ""
-#: ../install_steps_graphical.pm_.c:259 ../install_steps_gtk.pm_.c:259
+#: ../install_steps_gtk.pm_.c:259 ../unused/install_steps_graphical.pm_.c:255
msgid "You must have a swap partition"
msgstr ""
-#: ../install_steps_graphical.pm_.c:261 ../install_steps_gtk.pm_.c:261
+#: ../install_steps_gtk.pm_.c:261 ../unused/install_steps_graphical.pm_.c:258
msgid ""
"You don't have a swap partition\n"
"\n"
"Continue anyway?"
msgstr ""
-#: ../install_steps_graphical.pm_.c:287 ../install_steps_gtk.pm_.c:287
+#: ../install_steps_gtk.pm_.c:287
msgid "Choose the size you want to install"
msgstr ""
-#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:334
+#: ../install_steps_gtk.pm_.c:334 ../unused/install_steps_graphical.pm_.c:314
msgid "Total size: "
msgstr ""
-#: ../install_steps_graphical.pm_.c:346 ../install_steps_gtk.pm_.c:346
+#: ../install_steps_gtk.pm_.c:346 ../unused/install_steps_graphical.pm_.c:284
#, c-format
msgid "Version: %s\n"
msgstr ""
-#: ../install_steps_graphical.pm_.c:347 ../install_steps_gtk.pm_.c:347
+#: ../install_steps_gtk.pm_.c:347 ../unused/install_steps_graphical.pm_.c:285
#, c-format
msgid "Size: %d KB\n"
msgstr ""
-#: ../install_steps_graphical.pm_.c:462 ../install_steps_gtk.pm_.c:462
+#: ../install_steps_gtk.pm_.c:462 ../unused/install_steps_graphical.pm_.c:421
msgid "Choose the packages you want to install"
msgstr ""
-#: ../install_steps_graphical.pm_.c:465 ../install_steps_gtk.pm_.c:465
+#: ../install_steps_gtk.pm_.c:465 ../unused/install_steps_graphical.pm_.c:424
msgid "Info"
msgstr ""
-#: ../install_steps_graphical.pm_.c:473 ../install_steps_gtk.pm_.c:473
-#: ../install_steps_interactive.pm_.c:87
+#: ../install_steps_gtk.pm_.c:473 ../install_steps_interactive.pm_.c:87
+#: ../unused/install_steps_graphical.pm_.c:432
msgid "Install"
msgstr ""
-#: ../install_steps_graphical.pm_.c:492 ../install_steps_gtk.pm_.c:492
-#: ../install_steps_interactive.pm_.c:251
+#: ../install_steps_gtk.pm_.c:492 ../install_steps_interactive.pm_.c:251
+#: ../unused/install_steps_graphical.pm_.c:451
msgid "Installing"
msgstr ""
-#: ../install_steps_graphical.pm_.c:499 ../install_steps_gtk.pm_.c:499
+#: ../install_steps_gtk.pm_.c:499 ../unused/install_steps_graphical.pm_.c:457
msgid "Please wait, "
msgstr ""
-#: ../install_steps_graphical.pm_.c:501 ../install_steps_gtk.pm_.c:501
+#: ../install_steps_gtk.pm_.c:501 ../unused/install_steps_graphical.pm_.c:459
msgid "Time remaining "
msgstr ""
-#: ../install_steps_graphical.pm_.c:502 ../install_steps_gtk.pm_.c:502
+#: ../install_steps_gtk.pm_.c:502 ../unused/install_steps_graphical.pm_.c:460
msgid "Total time "
msgstr ""
-#: ../install_steps_graphical.pm_.c:507 ../install_steps_gtk.pm_.c:507
-#: ../install_steps_interactive.pm_.c:251
+#: ../install_steps_gtk.pm_.c:507 ../install_steps_interactive.pm_.c:251
+#: ../unused/install_steps_graphical.pm_.c:465
msgid "Preparing installation"
msgstr ""
-#: ../install_steps_graphical.pm_.c:528 ../install_steps_gtk.pm_.c:522
+#: ../install_steps_gtk.pm_.c:522 ../unused/install_steps_graphical.pm_.c:486
#, c-format
msgid "Installing package %s"
msgstr ""
-#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:547
+#: ../install_steps_gtk.pm_.c:547 ../unused/install_steps_graphical.pm_.c:511
msgid "Go on anyway?"
msgstr ""
-#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:547
+#: ../install_steps_gtk.pm_.c:547 ../unused/install_steps_graphical.pm_.c:511
msgid "There was an error ordering packages:"
msgstr ""
-#: ../install_steps_graphical.pm_.c:577 ../install_steps_interactive.pm_.c:916
-msgid "Use existing configuration for X11?"
-msgstr ""
-
#: ../install_steps_interactive.pm_.c:43
msgid "An error occurred"
msgstr ""
@@ -1973,7 +1968,7 @@ msgid "Yes, print both test pages"
msgstr ""
#: ../install_steps_interactive.pm_.c:531
-#: ../install_steps_interactive.pm_.c:1041 ../interactive.pm_.c:52
+#: ../install_steps_interactive.pm_.c:1043 ../interactive.pm_.c:52
#: ../my_gtk.pm_.c:437
msgid "No"
msgstr ""
@@ -2021,9 +2016,9 @@ msgstr ""
#: ../install_steps_interactive.pm_.c:614
#: ../install_steps_interactive.pm_.c:824 ../interactive.pm_.c:47
#: ../interactive.pm_.c:57 ../interactive.pm_.c:136
-#: ../interactive_newt.pm_.c:46 ../interactive_newt.pm_.c:91
+#: ../interactive_newt.pm_.c:46 ../interactive_newt.pm_.c:90
#: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:200 ../my_gtk.pm_.c:438
-#: ../my_gtk.pm_.c:535
+#: ../my_gtk.pm_.c:535 ../unused/install_steps_graphical.pm_.c:608
msgid "Ok"
msgstr ""
@@ -2385,6 +2380,11 @@ msgstr ""
msgid "Give the ram size in Mb"
msgstr ""
+#: ../install_steps_interactive.pm_.c:916
+#: ../unused/install_steps_graphical.pm_.c:535
+msgid "Use existing configuration for X11?"
+msgstr ""
+
#: ../install_steps_interactive.pm_.c:940
msgid ""
"Some steps are not completed.\n"
@@ -2392,7 +2392,7 @@ msgid ""
"Do you really want to quit now?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:945
+#: ../install_steps_interactive.pm_.c:947
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -2405,22 +2405,22 @@ msgid ""
"install chapter of the Official Linux-Mandrake User's Guide."
msgstr ""
-#: ../install_steps_interactive.pm_.c:966
+#: ../install_steps_interactive.pm_.c:968
#, c-format
msgid "Installing driver for %s card %s"
msgstr ""
-#: ../install_steps_interactive.pm_.c:967
+#: ../install_steps_interactive.pm_.c:969
#, c-format
msgid "(module %s)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:977
+#: ../install_steps_interactive.pm_.c:979
#, c-format
msgid "Which %s driver should I try?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:984
+#: ../install_steps_interactive.pm_.c:986
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -2432,20 +2432,20 @@ msgid ""
"not cause any damage."
msgstr ""
-#: ../install_steps_interactive.pm_.c:989
+#: ../install_steps_interactive.pm_.c:991
msgid "Autoprobe"
msgstr ""
-#: ../install_steps_interactive.pm_.c:989
+#: ../install_steps_interactive.pm_.c:991
msgid "Specify options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:993
+#: ../install_steps_interactive.pm_.c:995
#, c-format
msgid "You may now provide its options to module %s."
msgstr ""
-#: ../install_steps_interactive.pm_.c:999
+#: ../install_steps_interactive.pm_.c:1001
#, c-format
msgid ""
"You may now provide its options to module %s.\n"
@@ -2453,54 +2453,54 @@ msgid ""
"For instance, ``io=0x300 irq=7''"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1002
+#: ../install_steps_interactive.pm_.c:1004
msgid "Module options:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1012
+#: ../install_steps_interactive.pm_.c:1014
#, c-format
msgid ""
"Loading module %s failed.\n"
"Do you want to try again with other parameters?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1025
+#: ../install_steps_interactive.pm_.c:1027
#, c-format
msgid "Skip %s PCMCIA probing"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1026
+#: ../install_steps_interactive.pm_.c:1028
msgid "Configuring PCMCIA cards..."
msgstr ""
-#: ../install_steps_interactive.pm_.c:1026
+#: ../install_steps_interactive.pm_.c:1028
msgid "PCMCIA"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1033
+#: ../install_steps_interactive.pm_.c:1035
msgid "Try to find PCI devices?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1037
+#: ../install_steps_interactive.pm_.c:1039
#, c-format
msgid "Found %s %s interfaces"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1038
+#: ../install_steps_interactive.pm_.c:1040
msgid "Do you have another one?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1039
+#: ../install_steps_interactive.pm_.c:1041
#, c-format
msgid "Do you have any %s interface?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1041 ../interactive.pm_.c:52
+#: ../install_steps_interactive.pm_.c:1043 ../interactive.pm_.c:52
#: ../my_gtk.pm_.c:437
msgid "Yes"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1042
+#: ../install_steps_interactive.pm_.c:1044
msgid "See hardware info"
msgstr ""
@@ -2515,7 +2515,7 @@ msgid ""
msgstr ""
#: ../interactive.pm_.c:57 ../interactive.pm_.c:135
-#: ../interactive_newt.pm_.c:46 ../interactive_newt.pm_.c:91
+#: ../interactive_newt.pm_.c:46 ../interactive_newt.pm_.c:90
#: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:201 ../my_gtk.pm_.c:438
msgid "Cancel"
msgstr ""
@@ -2669,127 +2669,127 @@ msgid ""
"\n"
msgstr ""
-#: ../mouse.pm_.c:20
+#: ../mouse.pm_.c:21
msgid "No Mouse"
msgstr ""
-#: ../mouse.pm_.c:21
+#: ../mouse.pm_.c:22
msgid "Microsoft Rev 2.1A or higher (serial)"
msgstr ""
-#: ../mouse.pm_.c:22
+#: ../mouse.pm_.c:23
msgid "Logitech CC Series (serial)"
msgstr ""
-#: ../mouse.pm_.c:23
+#: ../mouse.pm_.c:24
msgid "Logitech MouseMan+/FirstMouse+ (serial)"
msgstr ""
-#: ../mouse.pm_.c:24
+#: ../mouse.pm_.c:25
msgid "ASCII MieMouse (serial)"
msgstr ""
-#: ../mouse.pm_.c:25
+#: ../mouse.pm_.c:26
msgid "Genius NetMouse (serial)"
msgstr ""
-#: ../mouse.pm_.c:26
+#: ../mouse.pm_.c:27
msgid "Microsoft IntelliMouse (serial)"
msgstr ""
-#: ../mouse.pm_.c:27
+#: ../mouse.pm_.c:28
msgid "MM Series (serial)"
msgstr ""
-#: ../mouse.pm_.c:28
+#: ../mouse.pm_.c:29
msgid "MM HitTablet (serial)"
msgstr ""
-#: ../mouse.pm_.c:29
+#: ../mouse.pm_.c:30
msgid "Logitech Mouse (serial, old C7 type)"
msgstr ""
-#: ../mouse.pm_.c:30
+#: ../mouse.pm_.c:31
msgid "Logitech MouseMan/FirstMouse (serial)"
msgstr ""
-#: ../mouse.pm_.c:31
+#: ../mouse.pm_.c:32
msgid "Generic Mouse (serial)"
msgstr ""
-#: ../mouse.pm_.c:32
+#: ../mouse.pm_.c:33
msgid "Microsoft compatible (serial)"
msgstr ""
-#: ../mouse.pm_.c:33
+#: ../mouse.pm_.c:34
msgid "Generic 3 Button Mouse (serial)"
msgstr ""
-#: ../mouse.pm_.c:34
+#: ../mouse.pm_.c:35
msgid "Mouse Systems (serial)"
msgstr ""
-#: ../mouse.pm_.c:35
+#: ../mouse.pm_.c:36
msgid "Generic Mouse (PS/2)"
msgstr ""
-#: ../mouse.pm_.c:36
+#: ../mouse.pm_.c:37
msgid "Logitech MouseMan/FirstMouse (ps/2)"
msgstr ""
-#: ../mouse.pm_.c:37
+#: ../mouse.pm_.c:38
msgid "Generic 3 Button Mouse (PS/2)"
msgstr ""
-#: ../mouse.pm_.c:38
+#: ../mouse.pm_.c:39
msgid "ALPS GlidePoint (PS/2)"
msgstr ""
-#: ../mouse.pm_.c:39
+#: ../mouse.pm_.c:40
msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
msgstr ""
-#: ../mouse.pm_.c:40
+#: ../mouse.pm_.c:41
msgid "Kensington Thinking Mouse (PS/2)"
msgstr ""
-#: ../mouse.pm_.c:41
+#: ../mouse.pm_.c:42
msgid "ASCII MieMouse (PS/2)"
msgstr ""
-#: ../mouse.pm_.c:42
+#: ../mouse.pm_.c:43
msgid "Genius NetMouse (PS/2)"
msgstr ""
-#: ../mouse.pm_.c:43
+#: ../mouse.pm_.c:44
msgid "Genius NetMouse Pro (PS/2)"
msgstr ""
-#: ../mouse.pm_.c:44
+#: ../mouse.pm_.c:45
msgid "Genius NetScroll (PS/2)"
msgstr ""
-#: ../mouse.pm_.c:45
+#: ../mouse.pm_.c:46
msgid "Microsoft IntelliMouse (PS/2)"
msgstr ""
-#: ../mouse.pm_.c:46
+#: ../mouse.pm_.c:47
msgid "ATI Bus Mouse"
msgstr ""
-#: ../mouse.pm_.c:47
+#: ../mouse.pm_.c:48
msgid "Microsoft Bus Mouse"
msgstr ""
-#: ../mouse.pm_.c:48
+#: ../mouse.pm_.c:49
msgid "Logitech Bus Mouse"
msgstr ""
-#: ../mouse.pm_.c:49
+#: ../mouse.pm_.c:50
msgid "USB Mouse"
msgstr ""
-#: ../mouse.pm_.c:50
+#: ../mouse.pm_.c:51
msgid "USB Mouse (3 buttons or more)"
msgstr ""
@@ -2848,3 +2848,15 @@ msgstr ""
#, c-format
msgid "Not enough partitions for RAID level %d\n"
msgstr ""
+
+#: ../t.pm_.c:8
+msgid "installation_cd"
+msgstr ""
+
+#: ../unused/install_steps_graphical.pm_.c:433
+msgid "Show less"
+msgstr ""
+
+#: ../unused/install_steps_graphical.pm_.c:434
+msgid "Show more"
+msgstr ""
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 75b740af2..53f13687c 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 1999-11-17 17:21+0100\n"
+"POT-Creation-Date: 1999-11-18 20:02+0100\n"
"PO-Revision-Date: 1999-08-25 11:07+0200\n"
"Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
"Language-Team: norwegian\n"
@@ -13,28 +13,28 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../Xconfigurator.pm_.c:158
+#: ../Xconfigurator.pm_.c:159
msgid "Select a graphic card"
msgstr "Velg et grafikk-kort"
-#: ../Xconfigurator.pm_.c:159
+#: ../Xconfigurator.pm_.c:160
msgid "Choose a X server"
msgstr "Velg en X-tjener"
-#: ../Xconfigurator.pm_.c:178
+#: ../Xconfigurator.pm_.c:179
msgid "Select the memory size of your graphic card"
msgstr "Velg minnestørrelsen til grafikk-kortet ditt"
-#: ../Xconfigurator.pm_.c:200
+#: ../Xconfigurator.pm_.c:201
#, fuzzy
msgid "Choose options for server"
msgstr "Velg en X-tjener"
-#: ../Xconfigurator.pm_.c:218
+#: ../Xconfigurator.pm_.c:219
msgid "Choose a monitor"
msgstr "Velg en monitor"
-#: ../Xconfigurator.pm_.c:221
+#: ../Xconfigurator.pm_.c:222
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
"rate\n"
@@ -58,39 +58,39 @@ msgstr ""
"skjermen din.\n"
"Hvis du er usikker, velg en konservativ innstilling."
-#: ../Xconfigurator.pm_.c:228
+#: ../Xconfigurator.pm_.c:229
msgid "Horizontal refresh rate"
msgstr "Horisontal oppfrisknings-rate"
-#: ../Xconfigurator.pm_.c:228
+#: ../Xconfigurator.pm_.c:229
msgid "Vertical refresh rate"
msgstr "Vertikal oppfrisknings-rate"
-#: ../Xconfigurator.pm_.c:269
+#: ../Xconfigurator.pm_.c:270
msgid "Monitor not configured"
msgstr "Monitor er ikke konfigurert"
-#: ../Xconfigurator.pm_.c:272
+#: ../Xconfigurator.pm_.c:273
msgid "Graphic card not configured yet"
msgstr "Grafikk-kort er ikke konfigurert ennå"
-#: ../Xconfigurator.pm_.c:275
+#: ../Xconfigurator.pm_.c:276
msgid "Resolutions not chosen yet"
msgstr "Oppløsninger er ikke valgt ennå"
-#: ../Xconfigurator.pm_.c:284
+#: ../Xconfigurator.pm_.c:285
msgid "Do you want to test the configuration?"
msgstr "Vil du teste konfigurasjonen?"
-#: ../Xconfigurator.pm_.c:284
+#: ../Xconfigurator.pm_.c:285
msgid "Test configuration"
msgstr "Test konfigurasjon"
-#: ../Xconfigurator.pm_.c:316
+#: ../Xconfigurator.pm_.c:317
msgid "An error occurred:"
msgstr "En feil oppsto:"
-#: ../Xconfigurator.pm_.c:318
+#: ../Xconfigurator.pm_.c:319
msgid ""
"\n"
"try changing some parameters"
@@ -98,25 +98,25 @@ msgstr ""
"\n"
"prøv å endre noen parametere"
-#: ../Xconfigurator.pm_.c:339
+#: ../Xconfigurator.pm_.c:340
#, c-format
msgid "(leaving in %d seconds)"
msgstr "(slutter om %d sekunder)"
-#: ../Xconfigurator.pm_.c:343 ../install_steps_interactive.pm_.c:599
+#: ../Xconfigurator.pm_.c:344 ../install_steps_interactive.pm_.c:599
#: ../my_gtk.pm_.c:438
msgid "Is this correct?"
msgstr "Er dette riktig?"
-#: ../Xconfigurator.pm_.c:351
+#: ../Xconfigurator.pm_.c:352
msgid "An error occurred, try changing some parameters"
msgstr "En feil oppsto, prøv å endre noen parametere"
-#: ../Xconfigurator.pm_.c:359 ../Xconfigurator.pm_.c:524
+#: ../Xconfigurator.pm_.c:360 ../Xconfigurator.pm_.c:525
msgid "Automatic resolutions"
msgstr "Automatiske oppløsninger"
-#: ../Xconfigurator.pm_.c:360
+#: ../Xconfigurator.pm_.c:361
msgid ""
"To find the available resolutions I will try different ones.\n"
"Your screen will blink...\n"
@@ -126,19 +126,19 @@ msgstr ""
"Skjermen din vil blinke...\n"
"Du kan slå av hvis du vil, du vil høre et bipp når det er ferdig"
-#: ../Xconfigurator.pm_.c:411 ../install_steps_interactive.pm_.c:564
+#: ../Xconfigurator.pm_.c:412 ../install_steps_interactive.pm_.c:564
msgid "Resolution"
msgstr "Oppløsning"
-#: ../Xconfigurator.pm_.c:446
+#: ../Xconfigurator.pm_.c:447
msgid "Choose resolution and color depth"
msgstr "Velg oppløsning og fargedybde"
-#: ../Xconfigurator.pm_.c:454
+#: ../Xconfigurator.pm_.c:455
msgid "Show all"
msgstr "Vis alle"
-#: ../Xconfigurator.pm_.c:525
+#: ../Xconfigurator.pm_.c:526
msgid ""
"I can try to find the available resolutions (eg: 800x600).\n"
"Sometimes, though, it may hang the machine.\n"
@@ -148,7 +148,7 @@ msgstr ""
"Noen ganger kan dette forårsake at maskinen stopper opp.\n"
"Ønsker du å prøve?"
-#: ../Xconfigurator.pm_.c:530
+#: ../Xconfigurator.pm_.c:531
msgid ""
"No valid modes found\n"
"Try with another video card or monitor"
@@ -156,98 +156,98 @@ msgstr ""
"Ingen gyldige modus funnet\n"
"Prøv med et annet skjermkort eller monitor"
-#: ../Xconfigurator.pm_.c:721
+#: ../Xconfigurator.pm_.c:722
#, c-format
msgid "Keyboard layout: %s\n"
msgstr "Tastatur-oppsett: %s\n"
-#: ../Xconfigurator.pm_.c:722
+#: ../Xconfigurator.pm_.c:723
#, c-format
msgid "Mouse type: %s\n"
msgstr "Type mus: %s\n"
-#: ../Xconfigurator.pm_.c:723
+#: ../Xconfigurator.pm_.c:724
#, c-format
msgid "Mouse device: %s\n"
msgstr "Enhet mus: %s\n"
-#: ../Xconfigurator.pm_.c:724
+#: ../Xconfigurator.pm_.c:725
#, c-format
msgid "Monitor: %s\n"
msgstr "Monitor: %s\n"
-#: ../Xconfigurator.pm_.c:725
+#: ../Xconfigurator.pm_.c:726
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr "Monitor HorizSync: %s\n"
-#: ../Xconfigurator.pm_.c:726
+#: ../Xconfigurator.pm_.c:727
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr "Monitor VertRefresh: %s\n"
-#: ../Xconfigurator.pm_.c:727
+#: ../Xconfigurator.pm_.c:728
#, c-format
msgid "Graphic card: %s\n"
msgstr "Grafikk-kort: %s\n"
-#: ../Xconfigurator.pm_.c:728
+#: ../Xconfigurator.pm_.c:729
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr "Minne grafikk: %s kB\n"
-#: ../Xconfigurator.pm_.c:729
+#: ../Xconfigurator.pm_.c:730
#, c-format
msgid "XFree86 server: %s\n"
msgstr "XFree86-tjener: %s\n"
-#: ../Xconfigurator.pm_.c:743
+#: ../Xconfigurator.pm_.c:744
#, fuzzy
msgid "Preparing X-Window configuration"
msgstr "Forbereder installasjon"
-#: ../Xconfigurator.pm_.c:757
+#: ../Xconfigurator.pm_.c:758
msgid "Change Monitor"
msgstr "Endre monitor"
-#: ../Xconfigurator.pm_.c:758
+#: ../Xconfigurator.pm_.c:759
msgid "Change Graphic card"
msgstr "Endre grafikk-kort"
-#: ../Xconfigurator.pm_.c:759
+#: ../Xconfigurator.pm_.c:760
#, fuzzy
msgid "Change Server options"
msgstr "Endre oppløsning"
-#: ../Xconfigurator.pm_.c:760
+#: ../Xconfigurator.pm_.c:761
msgid "Change Resolution"
msgstr "Endre oppløsning"
-#: ../Xconfigurator.pm_.c:761
+#: ../Xconfigurator.pm_.c:762
msgid "Automatical resolutions search"
msgstr "Automatisk oppløsningssøk"
-#: ../Xconfigurator.pm_.c:765
+#: ../Xconfigurator.pm_.c:766
msgid "Show information"
msgstr "Vis informasjon"
-#: ../Xconfigurator.pm_.c:766
+#: ../Xconfigurator.pm_.c:767
msgid "Test again"
msgstr "Test igjen"
-#: ../Xconfigurator.pm_.c:767
+#: ../Xconfigurator.pm_.c:768
msgid "Quit"
msgstr "Avslutt"
-#: ../Xconfigurator.pm_.c:770
+#: ../Xconfigurator.pm_.c:771
msgid "What do you want to do?"
msgstr "Hva vil du gjøre?"
-#: ../Xconfigurator.pm_.c:777
+#: ../Xconfigurator.pm_.c:778
msgid "X at startup"
msgstr "X ved oppstart"
-#: ../Xconfigurator.pm_.c:778
+#: ../Xconfigurator.pm_.c:779
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -280,79 +280,79 @@ msgstr "16 millioner farger"
msgid "4 billion colors (32 bits)"
msgstr "4 milliarder farger"
-#: ../Xconfigurator_consts.pm_.c:101
+#: ../Xconfigurator_consts.pm_.c:93
msgid "256 kB"
msgstr "256 kB"
-#: ../Xconfigurator_consts.pm_.c:102
+#: ../Xconfigurator_consts.pm_.c:94
msgid "512 kB"
msgstr "512 kB"
-#: ../Xconfigurator_consts.pm_.c:103
+#: ../Xconfigurator_consts.pm_.c:95
msgid "1 MB"
msgstr "1 MB"
-#: ../Xconfigurator_consts.pm_.c:104
+#: ../Xconfigurator_consts.pm_.c:96
msgid "2 MB"
msgstr "2 MB"
-#: ../Xconfigurator_consts.pm_.c:105
+#: ../Xconfigurator_consts.pm_.c:97
msgid "4 MB"
msgstr "4 MB"
-#: ../Xconfigurator_consts.pm_.c:106
+#: ../Xconfigurator_consts.pm_.c:98
msgid "8 MB"
msgstr "8 MB"
-#: ../Xconfigurator_consts.pm_.c:107
+#: ../Xconfigurator_consts.pm_.c:99
msgid "16 MB or more"
msgstr "16 MB eller mer"
-#: ../Xconfigurator_consts.pm_.c:111 ../Xconfigurator_consts.pm_.c:112
+#: ../Xconfigurator_consts.pm_.c:103 ../Xconfigurator_consts.pm_.c:104
msgid "Standard VGA, 640x480 at 60 Hz"
msgstr "Standard VGA, 640x480 ved 60 Hz"
-#: ../Xconfigurator_consts.pm_.c:113
+#: ../Xconfigurator_consts.pm_.c:105
msgid "Super VGA, 800x600 at 56 Hz"
msgstr "Super VGA 800x600 ved 56 Hz"
-#: ../Xconfigurator_consts.pm_.c:114
+#: ../Xconfigurator_consts.pm_.c:106
msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
msgstr "8514 kompatibel, 1024x768 ved 87 Hz interlaced (ikke 800x600)"
-#: ../Xconfigurator_consts.pm_.c:115
+#: ../Xconfigurator_consts.pm_.c:107
msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
msgstr "Super VGA, 1024x768 ved 87 Hz interlaced, 800x600 ved 56 Hz"
-#: ../Xconfigurator_consts.pm_.c:116
+#: ../Xconfigurator_consts.pm_.c:108
msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
msgstr "Utvidet Super VGA, 800x600 ved 60 Hz, 640x480 ved 72 Hz"
-#: ../Xconfigurator_consts.pm_.c:117
+#: ../Xconfigurator_consts.pm_.c:109
msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
msgstr "Ikke-interlaced SVGA, 1024x768 ved 60 Hz, 800x600 ved 72 Hz"
-#: ../Xconfigurator_consts.pm_.c:118
+#: ../Xconfigurator_consts.pm_.c:110
msgid "High Frequency SVGA, 1024x768 at 70 Hz"
msgstr "Høyfrekvens SVGA, 1024x768 ved 70 Hz"
-#: ../Xconfigurator_consts.pm_.c:119
+#: ../Xconfigurator_consts.pm_.c:111
msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
msgstr "Flerfrekvens som kan klare 1280x1024 ved 60 Hz"
-#: ../Xconfigurator_consts.pm_.c:120
+#: ../Xconfigurator_consts.pm_.c:112
msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
msgstr "Flerfrekvens som kan klare 1280x1024 ved 74 Hz"
-#: ../Xconfigurator_consts.pm_.c:121
+#: ../Xconfigurator_consts.pm_.c:113
msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
msgstr "Flerfrekvens som kan klare 1280x1024 ved 76 Hz"
-#: ../Xconfigurator_consts.pm_.c:122
+#: ../Xconfigurator_consts.pm_.c:114
msgid "Monitor that can do 1600x1200 at 70 Hz"
msgstr "Monitor som kan klare 1600x1200 ved 70 Hz"
-#: ../Xconfigurator_consts.pm_.c:123
+#: ../Xconfigurator_consts.pm_.c:115
msgid "Monitor that can do 1600x1200 at 76 Hz"
msgstr "Monitor som kan klare 1600x1200 ved 76 Hz"
@@ -746,9 +746,8 @@ msgstr "endrer størrelse"
msgid "Choose the new size"
msgstr "Velg den nye størrelsen"
-#: ../diskdrake.pm_.c:491 ../install_steps_graphical.pm_.c:287
-#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:287
-#: ../install_steps_gtk.pm_.c:334
+#: ../diskdrake.pm_.c:491 ../install_steps_gtk.pm_.c:287
+#: ../install_steps_gtk.pm_.c:334 ../unused/install_steps_graphical.pm_.c:314
msgid "MB"
msgstr "MB"
@@ -844,21 +843,21 @@ msgstr "montering mislykket: "
msgid "error unmounting %s: %s"
msgstr "feil ved demontering av %s: %s"
-#: ../fsedit.pm_.c:186
+#: ../fsedit.pm_.c:185
msgid "Mount points must begin with a leading /"
msgstr "Monteringspunkter må begynne med /"
-#: ../fsedit.pm_.c:189
+#: ../fsedit.pm_.c:188
#, c-format
msgid "There is already a partition with mount point %s"
msgstr "Det finnes allerede en partisjon med monteringspunkt %s"
-#: ../fsedit.pm_.c:273
+#: ../fsedit.pm_.c:272
#, c-format
msgid "Error opening %s for writing: %s"
msgstr "Feil ved åpning av %s for skriving: %s"
-#: ../fsedit.pm_.c:345
+#: ../fsedit.pm_.c:344
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"
@@ -866,7 +865,7 @@ msgstr ""
"En feil har oppstått - ingen gyldige enheter ble funnet for å opprette nye "
"filsystemer. Vennligst sjekk maskinvaren din for årsaken til dette problemet"
-#: ../fsedit.pm_.c:360
+#: ../fsedit.pm_.c:359
msgid "You don't have any partitions!"
msgstr "Du har ingen partisjoner!"
@@ -1726,11 +1725,11 @@ msgstr "ekspert"
msgid "server"
msgstr "tjener"
-#: ../install2.pm_.c:310
+#: ../install2.pm_.c:311
msgid "Partitioning failed: no root filesystem"
msgstr "Partisjonering feilet: intet root-filsystem"
-#: ../install2.pm_.c:324
+#: ../install2.pm_.c:325
msgid "Not enough swap to fulfill installation, please add some"
msgstr ""
"Ikke nok vekslingsplass til å fullføre installasjonen, du må legge til mer"
@@ -1773,11 +1772,11 @@ msgstr "Ingen root-partisjon funnet"
msgid "Can't use broadcast with no NIS domain"
msgstr "Kan ikke bruke broadcast uten NIS domene"
-#: ../install_any.pm_.c:422
+#: ../install_any.pm_.c:425
msgid "Error reading file $f"
msgstr "Feil ved lesing av fil $f"
-#: ../install_any.pm_.c:428
+#: ../install_any.pm_.c:431
#, c-format
msgid "Bad kickstart file %s (failed %s)"
msgstr "Dårlig kickstart-fil %s (mislykket %s)"
@@ -1805,11 +1804,11 @@ msgstr "Ingen diskettstasjon tilgjengelig"
msgid "Entering step `%s'\n"
msgstr "Entrer trinn `%s'\n"
-#: ../install_steps_graphical.pm_.c:259 ../install_steps_gtk.pm_.c:259
+#: ../install_steps_gtk.pm_.c:259 ../unused/install_steps_graphical.pm_.c:255
msgid "You must have a swap partition"
msgstr "Du må ha en vekslingspartisjon"
-#: ../install_steps_graphical.pm_.c:261 ../install_steps_gtk.pm_.c:261
+#: ../install_steps_gtk.pm_.c:261 ../unused/install_steps_graphical.pm_.c:258
msgid ""
"You don't have a swap partition\n"
"\n"
@@ -1819,76 +1818,72 @@ msgstr ""
"\n"
"Fortsette alikevel?"
-#: ../install_steps_graphical.pm_.c:287 ../install_steps_gtk.pm_.c:287
+#: ../install_steps_gtk.pm_.c:287
msgid "Choose the size you want to install"
msgstr "Velg størrelsen du ønsker å installere"
-#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:334
+#: ../install_steps_gtk.pm_.c:334 ../unused/install_steps_graphical.pm_.c:314
msgid "Total size: "
msgstr "Total størrelse: "
-#: ../install_steps_graphical.pm_.c:346 ../install_steps_gtk.pm_.c:346
+#: ../install_steps_gtk.pm_.c:346 ../unused/install_steps_graphical.pm_.c:284
#, c-format
msgid "Version: %s\n"
msgstr "Versjon: %s\n"
-#: ../install_steps_graphical.pm_.c:347 ../install_steps_gtk.pm_.c:347
+#: ../install_steps_gtk.pm_.c:347 ../unused/install_steps_graphical.pm_.c:285
#, c-format
msgid "Size: %d KB\n"
msgstr "Størrelse: %d KB\n"
-#: ../install_steps_graphical.pm_.c:462 ../install_steps_gtk.pm_.c:462
+#: ../install_steps_gtk.pm_.c:462 ../unused/install_steps_graphical.pm_.c:421
msgid "Choose the packages you want to install"
msgstr "Velg pakkene du ønsker å installere"
-#: ../install_steps_graphical.pm_.c:465 ../install_steps_gtk.pm_.c:465
+#: ../install_steps_gtk.pm_.c:465 ../unused/install_steps_graphical.pm_.c:424
msgid "Info"
msgstr "Info"
-#: ../install_steps_graphical.pm_.c:473 ../install_steps_gtk.pm_.c:473
-#: ../install_steps_interactive.pm_.c:87
+#: ../install_steps_gtk.pm_.c:473 ../install_steps_interactive.pm_.c:87
+#: ../unused/install_steps_graphical.pm_.c:432
msgid "Install"
msgstr "Installer"
-#: ../install_steps_graphical.pm_.c:492 ../install_steps_gtk.pm_.c:492
-#: ../install_steps_interactive.pm_.c:251
+#: ../install_steps_gtk.pm_.c:492 ../install_steps_interactive.pm_.c:251
+#: ../unused/install_steps_graphical.pm_.c:451
msgid "Installing"
msgstr "Installerer"
-#: ../install_steps_graphical.pm_.c:499 ../install_steps_gtk.pm_.c:499
+#: ../install_steps_gtk.pm_.c:499 ../unused/install_steps_graphical.pm_.c:457
msgid "Please wait, "
msgstr "Vennligst vent, "
-#: ../install_steps_graphical.pm_.c:501 ../install_steps_gtk.pm_.c:501
+#: ../install_steps_gtk.pm_.c:501 ../unused/install_steps_graphical.pm_.c:459
msgid "Time remaining "
msgstr "Tid som gjenstår "
-#: ../install_steps_graphical.pm_.c:502 ../install_steps_gtk.pm_.c:502
+#: ../install_steps_gtk.pm_.c:502 ../unused/install_steps_graphical.pm_.c:460
msgid "Total time "
msgstr "Total tid "
-#: ../install_steps_graphical.pm_.c:507 ../install_steps_gtk.pm_.c:507
-#: ../install_steps_interactive.pm_.c:251
+#: ../install_steps_gtk.pm_.c:507 ../install_steps_interactive.pm_.c:251
+#: ../unused/install_steps_graphical.pm_.c:465
msgid "Preparing installation"
msgstr "Forbereder installasjon"
-#: ../install_steps_graphical.pm_.c:528 ../install_steps_gtk.pm_.c:522
+#: ../install_steps_gtk.pm_.c:522 ../unused/install_steps_graphical.pm_.c:486
#, c-format
msgid "Installing package %s"
msgstr "Installerer pakke %s"
-#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:547
+#: ../install_steps_gtk.pm_.c:547 ../unused/install_steps_graphical.pm_.c:511
msgid "Go on anyway?"
msgstr "Fortsette uansett?"
-#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:547
+#: ../install_steps_gtk.pm_.c:547 ../unused/install_steps_graphical.pm_.c:511
msgid "There was an error ordering packages:"
msgstr "Det var en feil ved endring av pakkenes rekkefølge:"
-#: ../install_steps_graphical.pm_.c:577 ../install_steps_interactive.pm_.c:916
-msgid "Use existing configuration for X11?"
-msgstr "Bruke eksisterende konfigurasjon for X11?"
-
#: ../install_steps_interactive.pm_.c:43
msgid "An error occurred"
msgstr "En feil oppsto"
@@ -2379,7 +2374,7 @@ msgid "Yes, print both test pages"
msgstr ""
#: ../install_steps_interactive.pm_.c:531
-#: ../install_steps_interactive.pm_.c:1041 ../interactive.pm_.c:52
+#: ../install_steps_interactive.pm_.c:1043 ../interactive.pm_.c:52
#: ../my_gtk.pm_.c:437
msgid "No"
msgstr "Nei"
@@ -2431,9 +2426,9 @@ msgstr "Intet passord"
#: ../install_steps_interactive.pm_.c:614
#: ../install_steps_interactive.pm_.c:824 ../interactive.pm_.c:47
#: ../interactive.pm_.c:57 ../interactive.pm_.c:136
-#: ../interactive_newt.pm_.c:46 ../interactive_newt.pm_.c:91
+#: ../interactive_newt.pm_.c:46 ../interactive_newt.pm_.c:90
#: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:200 ../my_gtk.pm_.c:438
-#: ../my_gtk.pm_.c:535
+#: ../my_gtk.pm_.c:535 ../unused/install_steps_graphical.pm_.c:608
msgid "Ok"
msgstr "Ok"
@@ -2816,6 +2811,11 @@ msgstr "(kan forårsake diskproblemer)"
msgid "Give the ram size in Mb"
msgstr ""
+#: ../install_steps_interactive.pm_.c:916
+#: ../unused/install_steps_graphical.pm_.c:535
+msgid "Use existing configuration for X11?"
+msgstr "Bruke eksisterende konfigurasjon for X11?"
+
#: ../install_steps_interactive.pm_.c:940
msgid ""
"Some steps are not completed.\n"
@@ -2826,7 +2826,7 @@ msgstr ""
"\n"
"Ønsker du virkelig å slutte nå?"
-#: ../install_steps_interactive.pm_.c:945
+#: ../install_steps_interactive.pm_.c:947
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -2848,22 +2848,22 @@ msgstr ""
"Informasjon om konfigurering av systemet ditt finnes i post\n"
"install-kapittelet i Official Linux Mandrake User's Guide."
-#: ../install_steps_interactive.pm_.c:966
+#: ../install_steps_interactive.pm_.c:968
#, c-format
msgid "Installing driver for %s card %s"
msgstr "Installerer driver for %s kort %s"
-#: ../install_steps_interactive.pm_.c:967
+#: ../install_steps_interactive.pm_.c:969
#, c-format
msgid "(module %s)"
msgstr "(modul %s)"
-#: ../install_steps_interactive.pm_.c:977
+#: ../install_steps_interactive.pm_.c:979
#, c-format
msgid "Which %s driver should I try?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:984
+#: ../install_steps_interactive.pm_.c:986
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -2883,20 +2883,20 @@ msgstr ""
"forårsake\n"
"forårsake noen skade."
-#: ../install_steps_interactive.pm_.c:989
+#: ../install_steps_interactive.pm_.c:991
msgid "Autoprobe"
msgstr "Automatisk sondering"
-#: ../install_steps_interactive.pm_.c:989
+#: ../install_steps_interactive.pm_.c:991
msgid "Specify options"
msgstr "Spesifiser opsjoner"
-#: ../install_steps_interactive.pm_.c:993
+#: ../install_steps_interactive.pm_.c:995
#, c-format
msgid "You may now provide its options to module %s."
msgstr "Du kan nå gi dens opsjoner til modul %s."
-#: ../install_steps_interactive.pm_.c:999
+#: ../install_steps_interactive.pm_.c:1001
#, c-format
msgid ""
"You may now provide its options to module %s.\n"
@@ -2907,11 +2907,11 @@ msgstr ""
"Opsjonene er i format ``name=value name2=value2 ...''.\n"
"F.eks., ``io=0x300 irq=7''"
-#: ../install_steps_interactive.pm_.c:1002
+#: ../install_steps_interactive.pm_.c:1004
msgid "Module options:"
msgstr "Modulopsjoner:"
-#: ../install_steps_interactive.pm_.c:1012
+#: ../install_steps_interactive.pm_.c:1014
#, c-format
msgid ""
"Loading module %s failed.\n"
@@ -2920,43 +2920,43 @@ msgstr ""
"Lasting av modul %s feilet.\n"
"Ønsker du å prøve igjen med andre parametere?"
-#: ../install_steps_interactive.pm_.c:1025
+#: ../install_steps_interactive.pm_.c:1027
#, c-format
msgid "Skip %s PCMCIA probing"
msgstr "Dropp %s PCMCIA-sondering"
-#: ../install_steps_interactive.pm_.c:1026
+#: ../install_steps_interactive.pm_.c:1028
msgid "Configuring PCMCIA cards..."
msgstr "Konfigurerer PCMCIA-kort..."
-#: ../install_steps_interactive.pm_.c:1026
+#: ../install_steps_interactive.pm_.c:1028
msgid "PCMCIA"
msgstr "PCMCIA"
-#: ../install_steps_interactive.pm_.c:1033
+#: ../install_steps_interactive.pm_.c:1035
msgid "Try to find PCI devices?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1037
+#: ../install_steps_interactive.pm_.c:1039
#, c-format
msgid "Found %s %s interfaces"
msgstr "Fant %s %s grensesnitt"
-#: ../install_steps_interactive.pm_.c:1038
+#: ../install_steps_interactive.pm_.c:1040
msgid "Do you have another one?"
msgstr "Har du enda ett?"
-#: ../install_steps_interactive.pm_.c:1039
+#: ../install_steps_interactive.pm_.c:1041
#, fuzzy, c-format
msgid "Do you have any %s interface?"
msgstr "Har du et %s grensesnitt?"
-#: ../install_steps_interactive.pm_.c:1041 ../interactive.pm_.c:52
+#: ../install_steps_interactive.pm_.c:1043 ../interactive.pm_.c:52
#: ../my_gtk.pm_.c:437
msgid "Yes"
msgstr "Ja"
-#: ../install_steps_interactive.pm_.c:1042
+#: ../install_steps_interactive.pm_.c:1044
msgid "See hardware info"
msgstr "Se maskinvareinfo"
@@ -2971,7 +2971,7 @@ msgid ""
msgstr ""
#: ../interactive.pm_.c:57 ../interactive.pm_.c:135
-#: ../interactive_newt.pm_.c:46 ../interactive_newt.pm_.c:91
+#: ../interactive_newt.pm_.c:46 ../interactive_newt.pm_.c:90
#: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:201 ../my_gtk.pm_.c:438
msgid "Cancel"
msgstr "Avbryt"
@@ -3132,128 +3132,128 @@ msgstr ""
"sekunder for standard oppstart.\n"
"\n"
-#: ../mouse.pm_.c:20
+#: ../mouse.pm_.c:21
msgid "No Mouse"
msgstr "Ingen mus"
-#: ../mouse.pm_.c:21
+#: ../mouse.pm_.c:22
msgid "Microsoft Rev 2.1A or higher (serial)"
msgstr "Microsoft Rev 2.1A eller høyere (seriell)"
-#: ../mouse.pm_.c:22
+#: ../mouse.pm_.c:23
msgid "Logitech CC Series (serial)"
msgstr "Logitech CC-seriene (seriell)"
-#: ../mouse.pm_.c:23
+#: ../mouse.pm_.c:24
msgid "Logitech MouseMan+/FirstMouse+ (serial)"
msgstr "Logitech MouseMan+/FirstMouse+ (seriell)"
-#: ../mouse.pm_.c:24
+#: ../mouse.pm_.c:25
msgid "ASCII MieMouse (serial)"
msgstr "ASCII MieMouse (seriell)"
-#: ../mouse.pm_.c:25
+#: ../mouse.pm_.c:26
msgid "Genius NetMouse (serial)"
msgstr "Genius NetMouse (seriell)"
-#: ../mouse.pm_.c:26
+#: ../mouse.pm_.c:27
msgid "Microsoft IntelliMouse (serial)"
msgstr "Microsoft IntelliMouse (seriell)"
-#: ../mouse.pm_.c:27
+#: ../mouse.pm_.c:28
msgid "MM Series (serial)"
msgstr "MM-seriene (seriell)"
-#: ../mouse.pm_.c:28
+#: ../mouse.pm_.c:29
msgid "MM HitTablet (serial)"
msgstr "MM HitTablet (seriell)"
-#: ../mouse.pm_.c:29
+#: ../mouse.pm_.c:30
msgid "Logitech Mouse (serial, old C7 type)"
msgstr "Logitech Mouse (seriell, gammel C7 type)"
-#: ../mouse.pm_.c:30
+#: ../mouse.pm_.c:31
msgid "Logitech MouseMan/FirstMouse (serial)"
msgstr "Logitech MouseMan/FirstMouse (seriell)"
-#: ../mouse.pm_.c:31
+#: ../mouse.pm_.c:32
msgid "Generic Mouse (serial)"
msgstr "Generic Mouse (seriell)"
-#: ../mouse.pm_.c:32
+#: ../mouse.pm_.c:33
msgid "Microsoft compatible (serial)"
msgstr "Microsoft-kompatibel (seriell)"
-#: ../mouse.pm_.c:33
+#: ../mouse.pm_.c:34
msgid "Generic 3 Button Mouse (serial)"
msgstr "Generic 3-knappers mus (seriell)"
-#: ../mouse.pm_.c:34
+#: ../mouse.pm_.c:35
msgid "Mouse Systems (serial)"
msgstr "Mouse Systems (seriell)"
-#: ../mouse.pm_.c:35
+#: ../mouse.pm_.c:36
msgid "Generic Mouse (PS/2)"
msgstr "Generic mus (PS/2)"
-#: ../mouse.pm_.c:36
+#: ../mouse.pm_.c:37
msgid "Logitech MouseMan/FirstMouse (ps/2)"
msgstr "Logitech MouseMan/FirstMouse (ps/2)"
-#: ../mouse.pm_.c:37
+#: ../mouse.pm_.c:38
msgid "Generic 3 Button Mouse (PS/2)"
msgstr "Generic 3-knappers mus (PS/2)"
-#: ../mouse.pm_.c:38
+#: ../mouse.pm_.c:39
msgid "ALPS GlidePoint (PS/2)"
msgstr "ALPS GlidePoint (PS/2)"
-#: ../mouse.pm_.c:39
+#: ../mouse.pm_.c:40
msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
-#: ../mouse.pm_.c:40
+#: ../mouse.pm_.c:41
msgid "Kensington Thinking Mouse (PS/2)"
msgstr "Kensington Thinking Mouse (PS/2)"
-#: ../mouse.pm_.c:41
+#: ../mouse.pm_.c:42
msgid "ASCII MieMouse (PS/2)"
msgstr "ASCII MieMouse (PS/2)"
-#: ../mouse.pm_.c:42
+#: ../mouse.pm_.c:43
msgid "Genius NetMouse (PS/2)"
msgstr "Genius NetMouse (PS/2)"
-#: ../mouse.pm_.c:43
+#: ../mouse.pm_.c:44
msgid "Genius NetMouse Pro (PS/2)"
msgstr "Genius NetMouse Pro (PS/2)"
-#: ../mouse.pm_.c:44
+#: ../mouse.pm_.c:45
msgid "Genius NetScroll (PS/2)"
msgstr "Genius NetScroll (PS/2)"
-#: ../mouse.pm_.c:45
+#: ../mouse.pm_.c:46
msgid "Microsoft IntelliMouse (PS/2)"
msgstr "Microsoft IntelliMouse (PS/2)"
-#: ../mouse.pm_.c:46
+#: ../mouse.pm_.c:47
msgid "ATI Bus Mouse"
msgstr "ATI Bus Mouse"
-#: ../mouse.pm_.c:47
+#: ../mouse.pm_.c:48
msgid "Microsoft Bus Mouse"
msgstr "Microsoft Bus Mouse"
-#: ../mouse.pm_.c:48
+#: ../mouse.pm_.c:49
msgid "Logitech Bus Mouse"
msgstr "Logitech Bus Mouse"
-#: ../mouse.pm_.c:49
+#: ../mouse.pm_.c:50
#, fuzzy
msgid "USB Mouse"
msgstr "Ingen mus"
-#: ../mouse.pm_.c:50
+#: ../mouse.pm_.c:51
msgid "USB Mouse (3 buttons or more)"
msgstr ""
@@ -3316,6 +3316,19 @@ msgstr ""
msgid "Not enough partitions for RAID level %d\n"
msgstr ""
+#: ../t.pm_.c:8
+#, fuzzy
+msgid "installation_cd"
+msgstr "LILO-installasjon"
+
+#: ../unused/install_steps_graphical.pm_.c:433
+msgid "Show less"
+msgstr "Vis færre"
+
+#: ../unused/install_steps_graphical.pm_.c:434
+msgid "Show more"
+msgstr "Vis flere"
+
#~ msgid "Mount_point"
#~ msgstr "Monteringspunkt"
@@ -3810,12 +3823,6 @@ msgstr ""
#~ "\n"
#~ "Velg ønsket språk for installering og systembruk."
-#~ msgid "Show more"
-#~ msgstr "Vis flere"
-
-#~ msgid "Show less"
-#~ msgstr "Vis færre"
-
#~ msgid "What %s card do you have?"
#~ msgstr "Hvilket %s kort har du?"