summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-10-17 22:31:38 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-10-17 22:31:38 +0000
commit50bb149d89d484a5cb67e31506f37d799119819b (patch)
treef3f5a708d72f242045736676301c69be8c8bc802
parent1bd0d70a43bc734b826ae3f181b057aa22c977d7 (diff)
downloaddrakx-backup-do-not-use-50bb149d89d484a5cb67e31506f37d799119819b.tar
drakx-backup-do-not-use-50bb149d89d484a5cb67e31506f37d799119819b.tar.gz
drakx-backup-do-not-use-50bb149d89d484a5cb67e31506f37d799119819b.tar.bz2
drakx-backup-do-not-use-50bb149d89d484a5cb67e31506f37d799119819b.tar.xz
drakx-backup-do-not-use-50bb149d89d484a5cb67e31506f37d799119819b.zip
no_comment
-rw-r--r--docs/TODO12
-rw-r--r--perl-install/Xconfigurator_consts.pm2
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/install_steps_interactive.pm4
-rw-r--r--perl-install/share/po/DrakX.pot352
-rw-r--r--perl-install/share/po/no.po352
6 files changed, 360 insertions, 364 deletions
diff --git a/docs/TODO b/docs/TODO
index 065d6436d..3c3717bf5 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -5,6 +5,10 @@ warn the user if not enough ram to fulfill install
c::XSetInputFocus is done only on map_event. so pb with setuprootpassword (eg)
+using setxkb, enable the testing of the keyboard
+
+enable the testing of the mouse type (under X) (wheel)
+
blank alt-f1 screen on exit
keyboard shortcuts for the setstep stuff
@@ -19,14 +23,10 @@ propose fb in XFdrake
update the list of modules (in update_kernel)
-look at the pcmcia case
-
merge the install(1) of redhat
lilo-deinstallation in case of lilo auto-installation for beginners
-in package choosing, the group (on the left) is no more `selected' (gtk focus) when clicking on a package (on the right)
-
verify the free space is big enough.
loadFont sucks
@@ -43,10 +43,6 @@ ask for more than the memory size detected
ask for the VGA mode for lilo or vidmode
ask the security level
-lilo (ask the timeout, prompt or not)
-
-add a log != tty3 (like /tmp/...)
-
remove the gray line surrounding the logo
pb with dependencies ``missing'': icewm do not require XFree86 and so you can have icewm but no X server
diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm
index da996ea8c..f7c174f22 100644
--- a/perl-install/Xconfigurator_consts.pm
+++ b/perl-install/Xconfigurator_consts.pm
@@ -107,7 +107,7 @@ $resolution_wanted = "1024x768";
%lines = (
- 'Cirrus Logic|GD 5446' => [ ' Option "no_bitblt"' ],
+#- 'Cirrus Logic|GD 5446' => [ ' Option "no_bitblt"' ],
);
%xkb_options = (
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 4ade27e62..2a388a5d0 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -47,7 +47,7 @@ my @installSteps = (
choosePackages => [ __("Choose packages to install"), 1, 1, "selectInstallClass" ],
doInstallStep => [ __("Install system"), 1, -1, ["formatPartitions", "selectPath"] ],
configureNetwork => [ __("Configure networking"), 1, 1, "formatPartitions" ],
- configureTimezone => [ __("Configure timezone"), 1, 1 ],
+ configureTimezone => [ __("Configure timezone"), 1, 1, "doInstallStep" ],
#- configureServices => [ __("Configure services"), 0, 0 ],
configurePrinter => [ __("Configure printer"), 1, 0, "doInstallStep" ],
setRootPassword => [ __("Set root password"), 1, 1, "formatPartitions" ],
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index cf051fa1c..22ab2a0c9 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -57,8 +57,8 @@ sub selectLanguage($) {
install_steps::selectLanguage($o);
$o->{useless_thing_accepted} = $o->ask_from_list_('',
-"Wanring no wrranty, be carfull it's gonna explose ytou romcpature",
- [ _("Accept"), _("Refuse") ], _("Accept")) eq _("Accept") or exit(1) unless $o->{useless_thing_accepted};
+"Warning no warranty",
+ [ __("Accept"), __("Refuse") ], "Accept") eq "Accept" or exit(1) unless $o->{useless_thing_accepted};
}
#------------------------------------------------------------------------------
sub selectKeyboard($) {
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index d6dc58efb..128f5be13 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-10-13 16:46+0200\n"
+"POT-Creation-Date: 1999-10-18 00:22+0200\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"
@@ -106,8 +106,8 @@ msgid ""
"You can switch if off if you want, you'll hear a beep when it's over"
msgstr ""
-#: ../Xconfigurator.pm_.c:380 ../install_steps_interactive.pm_.c:450
-#: ../install_steps_interactive.pm_.c:451
+#: ../Xconfigurator.pm_.c:380 ../install_steps_interactive.pm_.c:449
+#: ../install_steps_interactive.pm_.c:450
msgid "Resolution"
msgstr ""
@@ -390,8 +390,8 @@ msgstr ""
msgid "Save on floppy"
msgstr ""
-#: ../diskdrake.pm_.c:39 ../install_steps_interactive.pm_.c:533
-#: ../install_steps_interactive.pm_.c:642
+#: ../diskdrake.pm_.c:39 ../install_steps_interactive.pm_.c:532
+#: ../install_steps_interactive.pm_.c:641
msgid "Done"
msgstr ""
@@ -729,27 +729,27 @@ msgstr ""
msgid "error unmounting %s: %s"
msgstr ""
-#: ../fsedit.pm_.c:165
+#: ../fsedit.pm_.c:162
msgid "Mount points must begin with a leading /"
msgstr ""
-#: ../fsedit.pm_.c:168
+#: ../fsedit.pm_.c:165
#, c-format
msgid "There is already a partition with mount point %s"
msgstr ""
-#: ../fsedit.pm_.c:297
+#: ../fsedit.pm_.c:294
#, c-format
msgid "Error opening %s for writing: %s"
msgstr ""
-#: ../fsedit.pm_.c:366
+#: ../fsedit.pm_.c:363
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:381
+#: ../fsedit.pm_.c:378
msgid "You don't have any partitions!"
msgstr ""
@@ -1089,8 +1089,8 @@ msgstr ""
msgid "Configure printer"
msgstr ""
-#: ../install2.pm_.c:53 ../install_steps_interactive.pm_.c:508
-#: ../install_steps_interactive.pm_.c:509
+#: ../install2.pm_.c:53 ../install_steps_interactive.pm_.c:507
+#: ../install_steps_interactive.pm_.c:508
msgid "Set root password"
msgstr ""
@@ -1134,11 +1134,11 @@ msgstr ""
msgid "Partitioning failed: no root filesystem"
msgstr ""
-#: ../install2.pm_.c:457
+#: ../install2.pm_.c:460
msgid "Error reading file $f"
msgstr ""
-#: ../install2.pm_.c:462
+#: ../install2.pm_.c:465
#, c-format
msgid "Bad kickstart file %s (failed %s)"
msgstr ""
@@ -1179,7 +1179,7 @@ msgstr ""
msgid "Duplicate mount point %s"
msgstr ""
-#: ../install_steps.pm_.c:316
+#: ../install_steps.pm_.c:327
msgid "No floppy drive available"
msgstr ""
@@ -1279,7 +1279,7 @@ msgstr ""
msgid "Use existing configuration for X11?"
msgstr ""
-#: ../install_steps_graphical.pm_.c:622 ../interactive.pm_.c:47
+#: ../install_steps_graphical.pm_.c:623 ../interactive.pm_.c:47
#: ../interactive.pm_.c:57 ../my_gtk.pm_.c:194 ../my_gtk.pm_.c:348
#: ../my_gtk.pm_.c:438
msgid "Ok"
@@ -1301,155 +1301,155 @@ msgstr ""
msgid "Refuse"
msgstr ""
-#: ../install_steps_interactive.pm_.c:69
+#: ../install_steps_interactive.pm_.c:68
msgid "What is your keyboard layout?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:78
msgid "Install/Upgrade"
msgstr ""
-#: ../install_steps_interactive.pm_.c:80
+#: ../install_steps_interactive.pm_.c:79
msgid "Is this an install or an upgrade?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:81
+#: ../install_steps_interactive.pm_.c:80
msgid "Install"
msgstr ""
-#: ../install_steps_interactive.pm_.c:81
+#: ../install_steps_interactive.pm_.c:80
msgid "Upgrade"
msgstr ""
-#: ../install_steps_interactive.pm_.c:89
+#: ../install_steps_interactive.pm_.c:88
msgid "Root Partition"
msgstr ""
-#: ../install_steps_interactive.pm_.c:90
+#: ../install_steps_interactive.pm_.c:89
msgid "What is the root partition (/) of your system?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:99
+#: ../install_steps_interactive.pm_.c:98
msgid "Install Class"
msgstr ""
-#: ../install_steps_interactive.pm_.c:100
+#: ../install_steps_interactive.pm_.c:99
msgid "What installation class do you want?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:112
+#: ../install_steps_interactive.pm_.c:111
msgid "What is the type of your mouse?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:116
+#: ../install_steps_interactive.pm_.c:115
msgid "Emulate third button?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:119
+#: ../install_steps_interactive.pm_.c:118
msgid "Mouse Port"
msgstr ""
-#: ../install_steps_interactive.pm_.c:120
+#: ../install_steps_interactive.pm_.c:119
msgid "Which serial port is your mouse connected to?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:133
+#: ../install_steps_interactive.pm_.c:132
msgid "no available partitions"
msgstr ""
-#: ../install_steps_interactive.pm_.c:135
+#: ../install_steps_interactive.pm_.c:134
#, c-format
msgid "(%dMb)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:142
+#: ../install_steps_interactive.pm_.c:141
msgid "Which partition do you want to use as your root partition"
msgstr ""
-#: ../install_steps_interactive.pm_.c:149
+#: ../install_steps_interactive.pm_.c:148
msgid "Choose the mount points"
msgstr ""
-#: ../install_steps_interactive.pm_.c:161
+#: ../install_steps_interactive.pm_.c:160
msgid "You need to reboot for the partition table modifications to take place"
msgstr ""
-#: ../install_steps_interactive.pm_.c:177
+#: ../install_steps_interactive.pm_.c:176
msgid "Choose the partitions you want to format"
msgstr ""
-#: ../install_steps_interactive.pm_.c:187
+#: ../install_steps_interactive.pm_.c:186
#, c-format
msgid "Formatting partition %s"
msgstr ""
-#: ../install_steps_interactive.pm_.c:195
+#: ../install_steps_interactive.pm_.c:194
msgid "Looking for available packages"
msgstr ""
-#: ../install_steps_interactive.pm_.c:201
+#: ../install_steps_interactive.pm_.c:200
msgid "Finding packages to upgrade"
msgstr ""
-#: ../install_steps_interactive.pm_.c:211
+#: ../install_steps_interactive.pm_.c:210
msgid "Keep the current IP configuration"
msgstr ""
-#: ../install_steps_interactive.pm_.c:212
+#: ../install_steps_interactive.pm_.c:211
msgid "Reconfigure network now"
msgstr ""
-#: ../install_steps_interactive.pm_.c:213
+#: ../install_steps_interactive.pm_.c:212
msgid "Do not set up networking"
msgstr ""
-#: ../install_steps_interactive.pm_.c:215
-#: ../install_steps_interactive.pm_.c:221
+#: ../install_steps_interactive.pm_.c:214
+#: ../install_steps_interactive.pm_.c:220
msgid "Network Configuration"
msgstr ""
-#: ../install_steps_interactive.pm_.c:216
+#: ../install_steps_interactive.pm_.c:215
msgid "Local networking has already been configured. Do you want to:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:222
+#: ../install_steps_interactive.pm_.c:221
msgid "Do you want to configure LAN (not dialup) networking for your system?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:229
+#: ../install_steps_interactive.pm_.c:228
msgid "no network card found"
msgstr ""
-#: ../install_steps_interactive.pm_.c:256
+#: ../install_steps_interactive.pm_.c:255
#, c-format
msgid "Configuring network device %s"
msgstr ""
-#: ../install_steps_interactive.pm_.c:257
+#: ../install_steps_interactive.pm_.c:256
msgid ""
"Please enter the IP configuration for this machine.\n"
"Each item should be entered as an IP address in dotted-decimal\n"
"notation (for example, 1.2.3.4)."
msgstr ""
-#: ../install_steps_interactive.pm_.c:260
+#: ../install_steps_interactive.pm_.c:259
msgid "IP address:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:260
+#: ../install_steps_interactive.pm_.c:259
msgid "Netmask:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:265
-#: ../install_steps_interactive.pm_.c:404
+#: ../install_steps_interactive.pm_.c:264
+#: ../install_steps_interactive.pm_.c:403
msgid "IP address should be in format 1.2.3.4"
msgstr ""
-#: ../install_steps_interactive.pm_.c:283
+#: ../install_steps_interactive.pm_.c:282
msgid "Configuring network"
msgstr ""
-#: ../install_steps_interactive.pm_.c:284
+#: ../install_steps_interactive.pm_.c:283
msgid ""
"Please enter your host name.\n"
"Your host name should be a fully-qualified host name,\n"
@@ -1457,116 +1457,116 @@ msgid ""
"You may also enter the IP address of the gateway if you have one"
msgstr ""
-#: ../install_steps_interactive.pm_.c:288
+#: ../install_steps_interactive.pm_.c:287
msgid "DNS server:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:288
+#: ../install_steps_interactive.pm_.c:287
msgid "Gateway device:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:288
+#: ../install_steps_interactive.pm_.c:287
msgid "Gateway:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:288
+#: ../install_steps_interactive.pm_.c:287
msgid "Host name:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:298
+#: ../install_steps_interactive.pm_.c:297
msgid "Is your hardware clock set to GMT?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:300
+#: ../install_steps_interactive.pm_.c:299
msgid "Which is your timezone?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:310
+#: ../install_steps_interactive.pm_.c:309
msgid "Printer"
msgstr ""
-#: ../install_steps_interactive.pm_.c:311
+#: ../install_steps_interactive.pm_.c:310
msgid "Would you like to configure a printer?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:327
+#: ../install_steps_interactive.pm_.c:326
msgid "Local Printer Options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:328
+#: ../install_steps_interactive.pm_.c:327
msgid ""
"Every print queue (which print jobs are directed to) needs a\n"
"name (often lp) and a spool directory associated with it. What\n"
"name and directory should be used for this queue?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:331
+#: ../install_steps_interactive.pm_.c:330
msgid "Name of queue:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:331
+#: ../install_steps_interactive.pm_.c:330
msgid "Spool directory:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:342
+#: ../install_steps_interactive.pm_.c:341
msgid "Select Printer Connection"
msgstr ""
-#: ../install_steps_interactive.pm_.c:343
+#: ../install_steps_interactive.pm_.c:342
msgid "How is the printer connected?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:351
+#: ../install_steps_interactive.pm_.c:350
msgid "Detecting devices..."
msgstr ""
-#: ../install_steps_interactive.pm_.c:351
+#: ../install_steps_interactive.pm_.c:350
msgid "Test ports"
msgstr ""
-#: ../install_steps_interactive.pm_.c:364
+#: ../install_steps_interactive.pm_.c:363
#, c-format
msgid "A printer, model \"%s\", has been detected on "
msgstr ""
-#: ../install_steps_interactive.pm_.c:371
+#: ../install_steps_interactive.pm_.c:370
msgid "Local Printer Device"
msgstr ""
-#: ../install_steps_interactive.pm_.c:372
+#: ../install_steps_interactive.pm_.c:371
msgid ""
"What device is your printer connected to \n"
"(note that /dev/lp0 is equivalent to LPT1:)?\n"
msgstr ""
-#: ../install_steps_interactive.pm_.c:373
+#: ../install_steps_interactive.pm_.c:372
msgid "Printer Device:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:379
+#: ../install_steps_interactive.pm_.c:378
msgid "Remote lpd Printer Options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:380
+#: ../install_steps_interactive.pm_.c:379
msgid ""
"To use a remote lpd print queue, you need to supply\n"
"the hostname of the printer server and the queue name\n"
"on that server which jobs should be placed in."
msgstr ""
-#: ../install_steps_interactive.pm_.c:383
+#: ../install_steps_interactive.pm_.c:382
msgid "Remote hostname:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:383
+#: ../install_steps_interactive.pm_.c:382
msgid "Remote queue:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:389
+#: ../install_steps_interactive.pm_.c:388
msgid "SMB (Windows 9x/NT) Printer Options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:390
+#: ../install_steps_interactive.pm_.c:389
msgid ""
"To print to a SMB printer, you need to provide the\n"
"SMB host name (Note! It may be different from its\n"
@@ -1575,38 +1575,38 @@ msgid ""
"applicable user name, password, and workgroup information."
msgstr ""
-#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:394
msgid "SMB server IP:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:394
msgid "SMB server host:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:396
-#: ../install_steps_interactive.pm_.c:418
-#: ../install_steps_interactive.pm_.c:510
+#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:417
+#: ../install_steps_interactive.pm_.c:509
msgid "Password:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:396
+#: ../install_steps_interactive.pm_.c:395
msgid "Share name:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:396
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:417
msgid "User name:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:397
+#: ../install_steps_interactive.pm_.c:396
msgid "Workgroup:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:412
+#: ../install_steps_interactive.pm_.c:411
msgid "NetWare Printer Options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:413
+#: ../install_steps_interactive.pm_.c:412
msgid ""
"To print to a NetWare printer, you need to provide the\n"
"NetWare print server name (Note! it may be different from its\n"
@@ -1614,116 +1614,116 @@ msgid ""
"wish to access and any applicable user name and password."
msgstr ""
-#: ../install_steps_interactive.pm_.c:417
+#: ../install_steps_interactive.pm_.c:416
msgid "Print Queue Name:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:417
+#: ../install_steps_interactive.pm_.c:416
msgid "Printer Server:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:428
+#: ../install_steps_interactive.pm_.c:427
msgid "Configure Printer"
msgstr ""
-#: ../install_steps_interactive.pm_.c:429
+#: ../install_steps_interactive.pm_.c:428
msgid "What type of printer do you have?"
msgstr ""
+#: ../install_steps_interactive.pm_.c:439
#: ../install_steps_interactive.pm_.c:440
-#: ../install_steps_interactive.pm_.c:441
msgid "Paper Size"
msgstr ""
-#: ../install_steps_interactive.pm_.c:460
+#: ../install_steps_interactive.pm_.c:459
msgid "CRLF"
msgstr ""
-#: ../install_steps_interactive.pm_.c:461
+#: ../install_steps_interactive.pm_.c:460
msgid "Fix stair-stepping text?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:477
+#: ../install_steps_interactive.pm_.c:476
msgid "Configure Uniprint Driver"
msgstr ""
-#: ../install_steps_interactive.pm_.c:478
+#: ../install_steps_interactive.pm_.c:477
msgid "You may now set the Uniprint driver options for this printer."
msgstr ""
-#: ../install_steps_interactive.pm_.c:486
+#: ../install_steps_interactive.pm_.c:485
msgid "Configure Color Depth"
msgstr ""
-#: ../install_steps_interactive.pm_.c:487
+#: ../install_steps_interactive.pm_.c:486
msgid "You may now configure the color options for this printer."
msgstr ""
-#: ../install_steps_interactive.pm_.c:510
+#: ../install_steps_interactive.pm_.c:509
msgid "Password (again):"
msgstr ""
-#: ../install_steps_interactive.pm_.c:514
-#: ../install_steps_interactive.pm_.c:546
+#: ../install_steps_interactive.pm_.c:513
+#: ../install_steps_interactive.pm_.c:545
msgid "Please try again"
msgstr ""
-#: ../install_steps_interactive.pm_.c:514
-#: ../install_steps_interactive.pm_.c:546
+#: ../install_steps_interactive.pm_.c:513
+#: ../install_steps_interactive.pm_.c:545
msgid "The passwords do not match"
msgstr ""
-#: ../install_steps_interactive.pm_.c:515
+#: ../install_steps_interactive.pm_.c:514
msgid "This password is too simple"
msgstr ""
-#: ../install_steps_interactive.pm_.c:533
+#: ../install_steps_interactive.pm_.c:532
msgid "Add user"
msgstr ""
-#: ../install_steps_interactive.pm_.c:534
+#: ../install_steps_interactive.pm_.c:533
#, c-format
msgid "(already added %s)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:534
+#: ../install_steps_interactive.pm_.c:533
#, c-format
msgid ""
"Enter a user\n"
"%s"
msgstr ""
-#: ../install_steps_interactive.pm_.c:535
-#: ../install_steps_interactive.pm_.c:620
+#: ../install_steps_interactive.pm_.c:534
+#: ../install_steps_interactive.pm_.c:619
msgid "Password"
msgstr ""
-#: ../install_steps_interactive.pm_.c:535
+#: ../install_steps_interactive.pm_.c:534
msgid "Password (again)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:535
+#: ../install_steps_interactive.pm_.c:534
msgid "Real name"
msgstr ""
-#: ../install_steps_interactive.pm_.c:535
+#: ../install_steps_interactive.pm_.c:534
msgid "Shell"
msgstr ""
-#: ../install_steps_interactive.pm_.c:535
+#: ../install_steps_interactive.pm_.c:534
msgid "User name"
msgstr ""
-#: ../install_steps_interactive.pm_.c:548
+#: ../install_steps_interactive.pm_.c:547
msgid "Please give a user name"
msgstr ""
-#: ../install_steps_interactive.pm_.c:549
+#: ../install_steps_interactive.pm_.c:548
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr ""
-#: ../install_steps_interactive.pm_.c:569
+#: ../install_steps_interactive.pm_.c:568
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 "
@@ -1737,150 +1737,150 @@ msgid ""
"failures. Would you like to create a bootdisk for your system?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:577
+#: ../install_steps_interactive.pm_.c:576
msgid "Sorry, no floppy drive available"
msgstr ""
-#: ../install_steps_interactive.pm_.c:580
+#: ../install_steps_interactive.pm_.c:579
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr ""
-#: ../install_steps_interactive.pm_.c:585
+#: ../install_steps_interactive.pm_.c:584
#, c-format
msgid "Insert a floppy in drive %s"
msgstr ""
-#: ../install_steps_interactive.pm_.c:586
+#: ../install_steps_interactive.pm_.c:585
msgid "Creating bootdisk"
msgstr ""
-#: ../install_steps_interactive.pm_.c:593
+#: ../install_steps_interactive.pm_.c:592
msgid "Preparing bootloader"
msgstr ""
-#: ../install_steps_interactive.pm_.c:603
+#: ../install_steps_interactive.pm_.c:602
msgid "First sector of boot partition"
msgstr ""
-#: ../install_steps_interactive.pm_.c:603
+#: ../install_steps_interactive.pm_.c:602
msgid "First sector of drive (MBR)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:608
+#: ../install_steps_interactive.pm_.c:607
msgid "LILO Installation"
msgstr ""
-#: ../install_steps_interactive.pm_.c:609
+#: ../install_steps_interactive.pm_.c:608
msgid "Where do you want to install the bootloader?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:612
+#: ../install_steps_interactive.pm_.c:611
msgid "Do you want to use LILO?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:615
+#: ../install_steps_interactive.pm_.c:614
msgid "Boot device"
msgstr ""
-#: ../install_steps_interactive.pm_.c:616
+#: ../install_steps_interactive.pm_.c:615
msgid "Linear (needed for some SCSI drives)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:616
+#: ../install_steps_interactive.pm_.c:615
msgid "linear"
msgstr ""
-#: ../install_steps_interactive.pm_.c:617
+#: ../install_steps_interactive.pm_.c:616
msgid "Compact"
msgstr ""
-#: ../install_steps_interactive.pm_.c:617
+#: ../install_steps_interactive.pm_.c:616
msgid "compact"
msgstr ""
-#: ../install_steps_interactive.pm_.c:618
+#: ../install_steps_interactive.pm_.c:617
msgid "Delay before booting default image"
msgstr ""
-#: ../install_steps_interactive.pm_.c:619
+#: ../install_steps_interactive.pm_.c:618
msgid "Video mode"
msgstr ""
-#: ../install_steps_interactive.pm_.c:621
+#: ../install_steps_interactive.pm_.c:620
msgid "Restrict command line options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:621
+#: ../install_steps_interactive.pm_.c:620
msgid "restrict"
msgstr ""
-#: ../install_steps_interactive.pm_.c:627
+#: ../install_steps_interactive.pm_.c:626
msgid "LILO main options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:631
+#: ../install_steps_interactive.pm_.c:630
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr ""
-#: ../install_steps_interactive.pm_.c:640
+#: ../install_steps_interactive.pm_.c:639
msgid ""
"Here are the following entries in LILO.\n"
"You can add some more or change the existent ones."
msgstr ""
-#: ../install_steps_interactive.pm_.c:642
+#: ../install_steps_interactive.pm_.c:641
msgid "Add"
msgstr ""
-#: ../install_steps_interactive.pm_.c:660
+#: ../install_steps_interactive.pm_.c:659
msgid "Image"
msgstr ""
-#: ../install_steps_interactive.pm_.c:661
-#: ../install_steps_interactive.pm_.c:669
+#: ../install_steps_interactive.pm_.c:660
+#: ../install_steps_interactive.pm_.c:668
msgid "Root"
msgstr ""
-#: ../install_steps_interactive.pm_.c:662
+#: ../install_steps_interactive.pm_.c:661
msgid "Append"
msgstr ""
-#: ../install_steps_interactive.pm_.c:663
+#: ../install_steps_interactive.pm_.c:662
msgid "Initrd"
msgstr ""
-#: ../install_steps_interactive.pm_.c:664
+#: ../install_steps_interactive.pm_.c:663
msgid "Read-write"
msgstr ""
-#: ../install_steps_interactive.pm_.c:670
+#: ../install_steps_interactive.pm_.c:669
msgid "Table"
msgstr ""
-#: ../install_steps_interactive.pm_.c:671
+#: ../install_steps_interactive.pm_.c:670
msgid "Unsafe"
msgstr ""
-#: ../install_steps_interactive.pm_.c:676
+#: ../install_steps_interactive.pm_.c:675
msgid "Label"
msgstr ""
-#: ../install_steps_interactive.pm_.c:678
+#: ../install_steps_interactive.pm_.c:677
msgid "Default"
msgstr ""
-#: ../install_steps_interactive.pm_.c:697
+#: ../install_steps_interactive.pm_.c:696
msgid "Installation of LILO failed. The following error occured:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:708
+#: ../install_steps_interactive.pm_.c:707
msgid ""
"Some steps are not completed.\n"
"Do you really want to quit now?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:712
+#: ../install_steps_interactive.pm_.c:711
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -1891,22 +1891,22 @@ msgid ""
"install chapter of the Official Linux-Mandrake User's Guide."
msgstr ""
-#: ../install_steps_interactive.pm_.c:729
+#: ../install_steps_interactive.pm_.c:728
#, c-format
msgid "Installing driver for %s card %s"
msgstr ""
-#: ../install_steps_interactive.pm_.c:730
+#: ../install_steps_interactive.pm_.c:729
#, c-format
msgid "(module %s)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:740
+#: ../install_steps_interactive.pm_.c:739
#, c-format
msgid "What %s card do you have?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:747
+#: ../install_steps_interactive.pm_.c:746
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -1918,20 +1918,20 @@ msgid ""
"not cause any damage."
msgstr ""
-#: ../install_steps_interactive.pm_.c:752
+#: ../install_steps_interactive.pm_.c:751
msgid "Autoprobe"
msgstr ""
-#: ../install_steps_interactive.pm_.c:752
+#: ../install_steps_interactive.pm_.c:751
msgid "Specify options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:756
+#: ../install_steps_interactive.pm_.c:755
#, c-format
msgid "You may now provide its options to module %s."
msgstr ""
-#: ../install_steps_interactive.pm_.c:762
+#: ../install_steps_interactive.pm_.c:761
#, c-format
msgid ""
"You may now provide its options to module %s.\n"
@@ -1939,59 +1939,59 @@ msgid ""
"For instance, ``io=0x300 irq=7''"
msgstr ""
-#: ../install_steps_interactive.pm_.c:765
+#: ../install_steps_interactive.pm_.c:764
msgid "Module options:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:775
+#: ../install_steps_interactive.pm_.c:774
#, c-format
msgid ""
"Loading module %s failed.\n"
"Do you want to try again with other parameters?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:788
+#: ../install_steps_interactive.pm_.c:787
msgid "Skip PCMCIA probing"
msgstr ""
-#: ../install_steps_interactive.pm_.c:789
+#: ../install_steps_interactive.pm_.c:788
msgid "Configuring PCMCIA cards..."
msgstr ""
-#: ../install_steps_interactive.pm_.c:789
+#: ../install_steps_interactive.pm_.c:788
msgid "PCMCIA"
msgstr ""
-#: ../install_steps_interactive.pm_.c:796
+#: ../install_steps_interactive.pm_.c:795
#, c-format
msgid "Skip %s PCI probing"
msgstr ""
-#: ../install_steps_interactive.pm_.c:800
+#: ../install_steps_interactive.pm_.c:799
#, c-format
msgid "Found %s %s interfaces"
msgstr ""
-#: ../install_steps_interactive.pm_.c:801
+#: ../install_steps_interactive.pm_.c:800
msgid "Do you have another one?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:802
+#: ../install_steps_interactive.pm_.c:801
#, c-format
msgid "Do you have an %s interface?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:804 ../interactive.pm_.c:52
+#: ../install_steps_interactive.pm_.c:803 ../interactive.pm_.c:52
#: ../my_gtk.pm_.c:347
msgid "No"
msgstr ""
-#: ../install_steps_interactive.pm_.c:804 ../interactive.pm_.c:52
+#: ../install_steps_interactive.pm_.c:803 ../interactive.pm_.c:52
#: ../my_gtk.pm_.c:347
msgid "Yes"
msgstr ""
-#: ../install_steps_interactive.pm_.c:805
+#: ../install_steps_interactive.pm_.c:804
msgid "See hardware info"
msgstr ""
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 6bd53eb39..a80a49617 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-10-13 16:46+0200\n"
+"POT-Creation-Date: 1999-10-18 00:22+0200\n"
"PO-Revision-Date: 1999-08-25 11:07+0200\n"
"Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
"Language-Team: norwegian\n"
@@ -120,8 +120,8 @@ msgstr ""
"Skjermen din vil blinke...\n"
"Du kan slå det av hvis du vil, du vil høre et bipp når det er ferdig"
-#: ../Xconfigurator.pm_.c:380 ../install_steps_interactive.pm_.c:450
-#: ../install_steps_interactive.pm_.c:451
+#: ../Xconfigurator.pm_.c:380 ../install_steps_interactive.pm_.c:449
+#: ../install_steps_interactive.pm_.c:450
msgid "Resolution"
msgstr "Oppløsning"
@@ -418,8 +418,8 @@ msgstr "Gjenopprett fra diskett"
msgid "Save on floppy"
msgstr "Lagre på diskett"
-#: ../diskdrake.pm_.c:39 ../install_steps_interactive.pm_.c:533
-#: ../install_steps_interactive.pm_.c:642
+#: ../diskdrake.pm_.c:39 ../install_steps_interactive.pm_.c:532
+#: ../install_steps_interactive.pm_.c:641
msgid "Done"
msgstr "Ferdig"
@@ -775,21 +775,21 @@ msgstr "montering mislykket: "
msgid "error unmounting %s: %s"
msgstr "feil ved demontering av %s: %s"
-#: ../fsedit.pm_.c:165
+#: ../fsedit.pm_.c:162
msgid "Mount points must begin with a leading /"
msgstr "Monteringspunkter må begynne med /"
-#: ../fsedit.pm_.c:168
+#: ../fsedit.pm_.c:165
#, c-format
msgid "There is already a partition with mount point %s"
msgstr "Det finnes allerede en partisjon med monteringspunkt %s"
-#: ../fsedit.pm_.c:297
+#: ../fsedit.pm_.c:294
#, c-format
msgid "Error opening %s for writing: %s"
msgstr "Feil ved åpning av %s for skriving: %s"
-#: ../fsedit.pm_.c:366
+#: ../fsedit.pm_.c:363
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"
@@ -797,7 +797,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:381
+#: ../fsedit.pm_.c:378
msgid "You don't have any partitions!"
msgstr "Du har ingen partisjoner!"
@@ -1342,8 +1342,8 @@ msgstr "Konfigurer tidssone"
msgid "Configure printer"
msgstr "Konfigurer skriver"
-#: ../install2.pm_.c:53 ../install_steps_interactive.pm_.c:508
-#: ../install_steps_interactive.pm_.c:509
+#: ../install2.pm_.c:53 ../install_steps_interactive.pm_.c:507
+#: ../install_steps_interactive.pm_.c:508
msgid "Set root password"
msgstr "Sett root-passord"
@@ -1387,11 +1387,11 @@ msgstr "tjener"
msgid "Partitioning failed: no root filesystem"
msgstr "Partisjonering feilet: intet root-filsystem"
-#: ../install2.pm_.c:457
+#: ../install2.pm_.c:460
msgid "Error reading file $f"
msgstr "Feil ved lesing av fil $f"
-#: ../install2.pm_.c:462
+#: ../install2.pm_.c:465
#, c-format
msgid "Bad kickstart file %s (failed %s)"
msgstr "Dårlig kickstart-fil %s (mislykket %s)"
@@ -1439,7 +1439,7 @@ msgstr ""
msgid "Duplicate mount point %s"
msgstr "Dupliser monteringspunkt %s"
-#: ../install_steps.pm_.c:316
+#: ../install_steps.pm_.c:327
msgid "No floppy drive available"
msgstr "Ingen diskettstasjon tilgjengelig"
@@ -1543,7 +1543,7 @@ msgstr "Det var en feil ved bestilling av pakkene:"
msgid "Use existing configuration for X11?"
msgstr "Bruke eksisterende konfigurasjon for X11?"
-#: ../install_steps_graphical.pm_.c:622 ../interactive.pm_.c:47
+#: ../install_steps_graphical.pm_.c:623 ../interactive.pm_.c:47
#: ../interactive.pm_.c:57 ../my_gtk.pm_.c:194 ../my_gtk.pm_.c:348
#: ../my_gtk.pm_.c:438
msgid "Ok"
@@ -1565,133 +1565,133 @@ msgstr "Godta"
msgid "Refuse"
msgstr "Avslå"
-#: ../install_steps_interactive.pm_.c:69
+#: ../install_steps_interactive.pm_.c:68
msgid "What is your keyboard layout?"
msgstr "Hva er tastatur-oppsettet ditt?"
-#: ../install_steps_interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:78
msgid "Install/Upgrade"
msgstr "Installer/Oppgrader"
-#: ../install_steps_interactive.pm_.c:80
+#: ../install_steps_interactive.pm_.c:79
msgid "Is this an install or an upgrade?"
msgstr "Er dette en installasjon eller en oppgradering?"
-#: ../install_steps_interactive.pm_.c:81
+#: ../install_steps_interactive.pm_.c:80
msgid "Install"
msgstr "Installer"
-#: ../install_steps_interactive.pm_.c:81
+#: ../install_steps_interactive.pm_.c:80
msgid "Upgrade"
msgstr "Oppgrader"
-#: ../install_steps_interactive.pm_.c:89
+#: ../install_steps_interactive.pm_.c:88
msgid "Root Partition"
msgstr "Root-partisjon"
-#: ../install_steps_interactive.pm_.c:90
+#: ../install_steps_interactive.pm_.c:89
msgid "What is the root partition (/) of your system?"
msgstr "Hva er root-partisjonen (/) på systemet ditt?"
-#: ../install_steps_interactive.pm_.c:99
+#: ../install_steps_interactive.pm_.c:98
msgid "Install Class"
msgstr "Installeringsklasse"
-#: ../install_steps_interactive.pm_.c:100
+#: ../install_steps_interactive.pm_.c:99
msgid "What installation class do you want?"
msgstr "Hvilken installasjonsklasse ønsker du?"
-#: ../install_steps_interactive.pm_.c:112
+#: ../install_steps_interactive.pm_.c:111
msgid "What is the type of your mouse?"
msgstr "Hva slags type er musen din?"
-#: ../install_steps_interactive.pm_.c:116
+#: ../install_steps_interactive.pm_.c:115
msgid "Emulate third button?"
msgstr "Emulere tredje knapp?"
-#: ../install_steps_interactive.pm_.c:119
+#: ../install_steps_interactive.pm_.c:118
msgid "Mouse Port"
msgstr "Museport"
-#: ../install_steps_interactive.pm_.c:120
+#: ../install_steps_interactive.pm_.c:119
msgid "Which serial port is your mouse connected to?"
msgstr "Hvilken serieport er musen din koblet til?"
-#: ../install_steps_interactive.pm_.c:133
+#: ../install_steps_interactive.pm_.c:132
msgid "no available partitions"
msgstr "ingen tilgjengelige partisjoner"
-#: ../install_steps_interactive.pm_.c:135
+#: ../install_steps_interactive.pm_.c:134
#, c-format
msgid "(%dMb)"
msgstr "(%dMb)"
-#: ../install_steps_interactive.pm_.c:142
+#: ../install_steps_interactive.pm_.c:141
msgid "Which partition do you want to use as your root partition"
msgstr "Hvilken partisjon vil du bruke som din root-partisjon"
-#: ../install_steps_interactive.pm_.c:149
+#: ../install_steps_interactive.pm_.c:148
msgid "Choose the mount points"
msgstr "Velg monteringspunkter"
-#: ../install_steps_interactive.pm_.c:161
+#: ../install_steps_interactive.pm_.c:160
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:177
+#: ../install_steps_interactive.pm_.c:176
msgid "Choose the partitions you want to format"
msgstr "Velg de partisjonene du ønsker å formatere"
-#: ../install_steps_interactive.pm_.c:187
+#: ../install_steps_interactive.pm_.c:186
#, c-format
msgid "Formatting partition %s"
msgstr "Formaterer partisjon %s"
-#: ../install_steps_interactive.pm_.c:195
+#: ../install_steps_interactive.pm_.c:194
msgid "Looking for available packages"
msgstr "Ser etter tilgjengelige pakker"
-#: ../install_steps_interactive.pm_.c:201
+#: ../install_steps_interactive.pm_.c:200
msgid "Finding packages to upgrade"
msgstr "Finner pakker å oppgradere"
-#: ../install_steps_interactive.pm_.c:211
+#: ../install_steps_interactive.pm_.c:210
msgid "Keep the current IP configuration"
msgstr "Behold nåværende IP-konfigurasjon"
-#: ../install_steps_interactive.pm_.c:212
+#: ../install_steps_interactive.pm_.c:211
msgid "Reconfigure network now"
msgstr "Rekonfigurer nettverket nå"
-#: ../install_steps_interactive.pm_.c:213
+#: ../install_steps_interactive.pm_.c:212
msgid "Do not set up networking"
msgstr "Ikke sett opp nettverk"
-#: ../install_steps_interactive.pm_.c:215
-#: ../install_steps_interactive.pm_.c:221
+#: ../install_steps_interactive.pm_.c:214
+#: ../install_steps_interactive.pm_.c:220
msgid "Network Configuration"
msgstr "Nettverks-konfigurasjon"
-#: ../install_steps_interactive.pm_.c:216
+#: ../install_steps_interactive.pm_.c:215
msgid "Local networking has already been configured. Do you want to:"
msgstr "Lokalt nettverk har allerede blitt konfigurert. Vil du:"
-#: ../install_steps_interactive.pm_.c:222
+#: ../install_steps_interactive.pm_.c:221
msgid "Do you want to configure LAN (not dialup) networking for your system?"
msgstr "Vil du konfigurere LAN (ikke oppringt) nettverk for systemet ditt?"
-#: ../install_steps_interactive.pm_.c:229
+#: ../install_steps_interactive.pm_.c:228
msgid "no network card found"
msgstr "ingen nettverkskort funnet"
-#: ../install_steps_interactive.pm_.c:256
+#: ../install_steps_interactive.pm_.c:255
#, c-format
msgid "Configuring network device %s"
msgstr "Konfigurerer nettverks-enhet %s"
-#: ../install_steps_interactive.pm_.c:257
+#: ../install_steps_interactive.pm_.c:256
msgid ""
"Please enter the IP configuration for this machine.\n"
"Each item should be entered as an IP address in dotted-decimal\n"
@@ -1701,24 +1701,24 @@ msgstr ""
"Hvert element bør entres som en IP-adresse i punkt-desimal\n"
"notasjon (f.eks, 1.2.3.4)."
-#: ../install_steps_interactive.pm_.c:260
+#: ../install_steps_interactive.pm_.c:259
msgid "IP address:"
msgstr "IP-adresse:"
-#: ../install_steps_interactive.pm_.c:260
+#: ../install_steps_interactive.pm_.c:259
msgid "Netmask:"
msgstr "Nettmaske:"
-#: ../install_steps_interactive.pm_.c:265
-#: ../install_steps_interactive.pm_.c:404
+#: ../install_steps_interactive.pm_.c:264
+#: ../install_steps_interactive.pm_.c:403
msgid "IP address should be in format 1.2.3.4"
msgstr "IP-adresse bør være i format 1.2.3.4"
-#: ../install_steps_interactive.pm_.c:283
+#: ../install_steps_interactive.pm_.c:282
msgid "Configuring network"
msgstr "Konfigurerer nettverk"
-#: ../install_steps_interactive.pm_.c:284
+#: ../install_steps_interactive.pm_.c:283
msgid ""
"Please enter your host name.\n"
"Your host name should be a fully-qualified host name,\n"
@@ -1730,43 +1730,43 @@ msgstr ""
"så som ``minboks.mittlab.mittfirma.no''.\n"
"Du kan også entre IP-adressen til gateway'en hvis du har en"
-#: ../install_steps_interactive.pm_.c:288
+#: ../install_steps_interactive.pm_.c:287
msgid "DNS server:"
msgstr "DNS-tjener:"
-#: ../install_steps_interactive.pm_.c:288
+#: ../install_steps_interactive.pm_.c:287
msgid "Gateway device:"
msgstr "Gateway-enhet:"
-#: ../install_steps_interactive.pm_.c:288
+#: ../install_steps_interactive.pm_.c:287
msgid "Gateway:"
msgstr "Gateway:"
-#: ../install_steps_interactive.pm_.c:288
+#: ../install_steps_interactive.pm_.c:287
msgid "Host name:"
msgstr "Vertsnavn:"
-#: ../install_steps_interactive.pm_.c:298
+#: ../install_steps_interactive.pm_.c:297
msgid "Is your hardware clock set to GMT?"
msgstr "Er maskinvareklokken din satt til GMT?"
-#: ../install_steps_interactive.pm_.c:300
+#: ../install_steps_interactive.pm_.c:299
msgid "Which is your timezone?"
msgstr "Hvilken er tidsonen din?"
-#: ../install_steps_interactive.pm_.c:310
+#: ../install_steps_interactive.pm_.c:309
msgid "Printer"
msgstr "Skriver"
-#: ../install_steps_interactive.pm_.c:311
+#: ../install_steps_interactive.pm_.c:310
msgid "Would you like to configure a printer?"
msgstr "Ønsker du å konfigurere en skriver?"
-#: ../install_steps_interactive.pm_.c:327
+#: ../install_steps_interactive.pm_.c:326
msgid "Local Printer Options"
msgstr "Lokale skriveropsjoner"
-#: ../install_steps_interactive.pm_.c:328
+#: ../install_steps_interactive.pm_.c:327
msgid ""
"Every print queue (which print jobs are directed to) needs a\n"
"name (often lp) and a spool directory associated with it. What\n"
@@ -1776,40 +1776,40 @@ msgstr ""
"(ofte lp) og en spolingskatalog assosiert til denne. Hvilket\n"
"navn og katalog skal brukes for denne køen?"
-#: ../install_steps_interactive.pm_.c:331
+#: ../install_steps_interactive.pm_.c:330
msgid "Name of queue:"
msgstr "Køens navn:"
-#: ../install_steps_interactive.pm_.c:331
+#: ../install_steps_interactive.pm_.c:330
msgid "Spool directory:"
msgstr "Spolingskatalog:"
-#: ../install_steps_interactive.pm_.c:342
+#: ../install_steps_interactive.pm_.c:341
msgid "Select Printer Connection"
msgstr "Velg skrivertilkobling"
-#: ../install_steps_interactive.pm_.c:343
+#: ../install_steps_interactive.pm_.c:342
msgid "How is the printer connected?"
msgstr "Hvordan er skriveren tilkoblet?"
-#: ../install_steps_interactive.pm_.c:351
+#: ../install_steps_interactive.pm_.c:350
msgid "Detecting devices..."
msgstr "Finner enheter..."
-#: ../install_steps_interactive.pm_.c:351
+#: ../install_steps_interactive.pm_.c:350
msgid "Test ports"
msgstr "Test porter"
-#: ../install_steps_interactive.pm_.c:364
+#: ../install_steps_interactive.pm_.c:363
#, c-format
msgid "A printer, model \"%s\", has been detected on "
msgstr "En skriver, modell \"%s\", ble funnet på "
-#: ../install_steps_interactive.pm_.c:371
+#: ../install_steps_interactive.pm_.c:370
msgid "Local Printer Device"
msgstr "Lokal skriverenhet"
-#: ../install_steps_interactive.pm_.c:372
+#: ../install_steps_interactive.pm_.c:371
msgid ""
"What device is your printer connected to \n"
"(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -1817,15 +1817,15 @@ msgstr ""
"Hvilken enhet er skriveren din koblet til \n"
"(merk at /dev/lp0 er det samme som LPT1:)?\n"
-#: ../install_steps_interactive.pm_.c:373
+#: ../install_steps_interactive.pm_.c:372
msgid "Printer Device:"
msgstr "Skriverenhet:"
-#: ../install_steps_interactive.pm_.c:379
+#: ../install_steps_interactive.pm_.c:378
msgid "Remote lpd Printer Options"
msgstr "Fjern-lpd skriveropsjoner"
-#: ../install_steps_interactive.pm_.c:380
+#: ../install_steps_interactive.pm_.c:379
msgid ""
"To use a remote lpd print queue, you need to supply\n"
"the hostname of the printer server and the queue name\n"
@@ -1835,19 +1835,19 @@ msgstr ""
"til skrivertjeneren og kønavnet til den tjeneren\n"
"som jobbene skal plasseres i."
-#: ../install_steps_interactive.pm_.c:383
+#: ../install_steps_interactive.pm_.c:382
msgid "Remote hostname:"
msgstr "Fjern-brukernavn:"
-#: ../install_steps_interactive.pm_.c:383
+#: ../install_steps_interactive.pm_.c:382
msgid "Remote queue:"
msgstr "Fjern-kø:"
-#: ../install_steps_interactive.pm_.c:389
+#: ../install_steps_interactive.pm_.c:388
msgid "SMB (Windows 9x/NT) Printer Options"
msgstr "SMB (Windows 9x/NT) skriveropsjoner"
-#: ../install_steps_interactive.pm_.c:390
+#: ../install_steps_interactive.pm_.c:389
msgid ""
"To print to a SMB printer, you need to provide the\n"
"SMB host name (Note! It may be different from its\n"
@@ -1861,38 +1861,38 @@ msgstr ""
"navnet til skriveren du ønsker tilgang til og anvendelige brukernavn,\n"
"passord og arbeidsgruppeinformasjon."
-#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:394
msgid "SMB server IP:"
msgstr "SMB-tjener IP:"
-#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:394
msgid "SMB server host:"
msgstr "SMB-tjener vert:"
-#: ../install_steps_interactive.pm_.c:396
-#: ../install_steps_interactive.pm_.c:418
-#: ../install_steps_interactive.pm_.c:510
+#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:417
+#: ../install_steps_interactive.pm_.c:509
msgid "Password:"
msgstr "Passord:"
-#: ../install_steps_interactive.pm_.c:396
+#: ../install_steps_interactive.pm_.c:395
msgid "Share name:"
msgstr "Delt navn:"
-#: ../install_steps_interactive.pm_.c:396
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:417
msgid "User name:"
msgstr "Brukernavn:"
-#: ../install_steps_interactive.pm_.c:397
+#: ../install_steps_interactive.pm_.c:396
msgid "Workgroup:"
msgstr "Arbeidsgruppe:"
-#: ../install_steps_interactive.pm_.c:412
+#: ../install_steps_interactive.pm_.c:411
msgid "NetWare Printer Options"
msgstr "NetWare skriveropsjoner"
-#: ../install_steps_interactive.pm_.c:413
+#: ../install_steps_interactive.pm_.c:412
msgid ""
"To print to a NetWare printer, you need to provide the\n"
"NetWare print server name (Note! it may be different from its\n"
@@ -1904,79 +1904,79 @@ msgstr ""
"vertsnavn!) så vel som navnet på skriverkøen til skriveren du ønsker\n"
"adgang til og anvendelige brukernavn og passord."
-#: ../install_steps_interactive.pm_.c:417
+#: ../install_steps_interactive.pm_.c:416
msgid "Print Queue Name:"
msgstr "Skriverkø-navn:"
-#: ../install_steps_interactive.pm_.c:417
+#: ../install_steps_interactive.pm_.c:416
msgid "Printer Server:"
msgstr "Skrivertjener:"
-#: ../install_steps_interactive.pm_.c:428
+#: ../install_steps_interactive.pm_.c:427
msgid "Configure Printer"
msgstr "Konfigurer skriver"
-#: ../install_steps_interactive.pm_.c:429
+#: ../install_steps_interactive.pm_.c:428
msgid "What type of printer do you have?"
msgstr "Hva slags type skriver har du?"
+#: ../install_steps_interactive.pm_.c:439
#: ../install_steps_interactive.pm_.c:440
-#: ../install_steps_interactive.pm_.c:441
msgid "Paper Size"
msgstr "Papirstørrelse"
-#: ../install_steps_interactive.pm_.c:460
+#: ../install_steps_interactive.pm_.c:459
msgid "CRLF"
msgstr "CRLF"
-#: ../install_steps_interactive.pm_.c:461
+#: ../install_steps_interactive.pm_.c:460
msgid "Fix stair-stepping text?"
msgstr "Fikse trappestegs-tekst?"
-#: ../install_steps_interactive.pm_.c:477
+#: ../install_steps_interactive.pm_.c:476
msgid "Configure Uniprint Driver"
msgstr "Konfigurer Uniprint-driver"
-#: ../install_steps_interactive.pm_.c:478
+#: ../install_steps_interactive.pm_.c:477
msgid "You may now set the Uniprint driver options for this printer."
msgstr "Du kan nå sette opp Uniprint-driver-opsjonene for denne skriveren."
-#: ../install_steps_interactive.pm_.c:486
+#: ../install_steps_interactive.pm_.c:485
msgid "Configure Color Depth"
msgstr "Konfigurer fargedybde"
-#: ../install_steps_interactive.pm_.c:487
+#: ../install_steps_interactive.pm_.c:486
msgid "You may now configure the color options for this printer."
msgstr "Du kan nå konfigurere fargeopsjonene for denne skriveren."
-#: ../install_steps_interactive.pm_.c:510
+#: ../install_steps_interactive.pm_.c:509
msgid "Password (again):"
msgstr "Passord (igjen):"
-#: ../install_steps_interactive.pm_.c:514
-#: ../install_steps_interactive.pm_.c:546
+#: ../install_steps_interactive.pm_.c:513
+#: ../install_steps_interactive.pm_.c:545
msgid "Please try again"
msgstr "Vennligst prøv igjen"
-#: ../install_steps_interactive.pm_.c:514
-#: ../install_steps_interactive.pm_.c:546
+#: ../install_steps_interactive.pm_.c:513
+#: ../install_steps_interactive.pm_.c:545
msgid "The passwords do not match"
msgstr "Passordet stemmer ikke"
-#: ../install_steps_interactive.pm_.c:515
+#: ../install_steps_interactive.pm_.c:514
msgid "This password is too simple"
msgstr "Dette passordet er for enkelt"
-#: ../install_steps_interactive.pm_.c:533
+#: ../install_steps_interactive.pm_.c:532
msgid "Add user"
msgstr "Legg til bruker"
-#: ../install_steps_interactive.pm_.c:534
+#: ../install_steps_interactive.pm_.c:533
#, c-format
msgid "(already added %s)"
msgstr "(allerede lagt til %s)"
-#: ../install_steps_interactive.pm_.c:534
+#: ../install_steps_interactive.pm_.c:533
#, c-format
msgid ""
"Enter a user\n"
@@ -1985,37 +1985,37 @@ msgstr ""
"Entre en bruker\n"
"%s"
-#: ../install_steps_interactive.pm_.c:535
-#: ../install_steps_interactive.pm_.c:620
+#: ../install_steps_interactive.pm_.c:534
+#: ../install_steps_interactive.pm_.c:619
msgid "Password"
msgstr "Passord"
-#: ../install_steps_interactive.pm_.c:535
+#: ../install_steps_interactive.pm_.c:534
msgid "Password (again)"
msgstr "Passord (igjen)"
-#: ../install_steps_interactive.pm_.c:535
+#: ../install_steps_interactive.pm_.c:534
msgid "Real name"
msgstr "Virkelig navn"
-#: ../install_steps_interactive.pm_.c:535
+#: ../install_steps_interactive.pm_.c:534
msgid "Shell"
msgstr "Skall"
-#: ../install_steps_interactive.pm_.c:535
+#: ../install_steps_interactive.pm_.c:534
msgid "User name"
msgstr "Brukernavn"
-#: ../install_steps_interactive.pm_.c:548
+#: ../install_steps_interactive.pm_.c:547
msgid "Please give a user name"
msgstr "Vennligst oppgi et brukernavn"
-#: ../install_steps_interactive.pm_.c:549
+#: ../install_steps_interactive.pm_.c:548
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr "Brukernavnet kan kun inneholde små bokstaver, tall, `-' og `_'"
-#: ../install_steps_interactive.pm_.c:569
+#: ../install_steps_interactive.pm_.c:568
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 "
@@ -2039,94 +2039,94 @@ msgstr ""
"systemsvikt.\n"
"Ønsker du å opprette en oppstartsdiskett for systemet ditt?"
-#: ../install_steps_interactive.pm_.c:577
+#: ../install_steps_interactive.pm_.c:576
msgid "Sorry, no floppy drive available"
msgstr "Beklager, ingen diskettstasjon tilgjengelig"
-#: ../install_steps_interactive.pm_.c:580
+#: ../install_steps_interactive.pm_.c:579
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr "Velg diskettstasjonen du ønsker å bruke for å lage oppstartsdisketten"
-#: ../install_steps_interactive.pm_.c:585
+#: ../install_steps_interactive.pm_.c:584
#, c-format
msgid "Insert a floppy in drive %s"
msgstr "Sett inn en diskett i stasjon %s"
-#: ../install_steps_interactive.pm_.c:586
+#: ../install_steps_interactive.pm_.c:585
msgid "Creating bootdisk"
msgstr "Oppretter oppstartdiskett"
-#: ../install_steps_interactive.pm_.c:593
+#: ../install_steps_interactive.pm_.c:592
msgid "Preparing bootloader"
msgstr "Klargjør oppstartslaster"
-#: ../install_steps_interactive.pm_.c:603
+#: ../install_steps_interactive.pm_.c:602
msgid "First sector of boot partition"
msgstr "Første sektor av oppstartspartisjon"
-#: ../install_steps_interactive.pm_.c:603
+#: ../install_steps_interactive.pm_.c:602
msgid "First sector of drive (MBR)"
msgstr "Første sektor av disk (MBR)"
-#: ../install_steps_interactive.pm_.c:608
+#: ../install_steps_interactive.pm_.c:607
msgid "LILO Installation"
msgstr "LILO-installasjon"
-#: ../install_steps_interactive.pm_.c:609
+#: ../install_steps_interactive.pm_.c:608
msgid "Where do you want to install the bootloader?"
msgstr "Hvor vil du installere oppstartslasteren?"
-#: ../install_steps_interactive.pm_.c:612
+#: ../install_steps_interactive.pm_.c:611
msgid "Do you want to use LILO?"
msgstr "Ønsker du å bruke LILO?"
-#: ../install_steps_interactive.pm_.c:615
+#: ../install_steps_interactive.pm_.c:614
msgid "Boot device"
msgstr "Oppstartsenhet"
-#: ../install_steps_interactive.pm_.c:616
+#: ../install_steps_interactive.pm_.c:615
msgid "Linear (needed for some SCSI drives)"
msgstr "Lineær (behøves av noen SCSI-disker)"
-#: ../install_steps_interactive.pm_.c:616
+#: ../install_steps_interactive.pm_.c:615
msgid "linear"
msgstr "lineær"
-#: ../install_steps_interactive.pm_.c:617
+#: ../install_steps_interactive.pm_.c:616
msgid "Compact"
msgstr "Kompakt"
-#: ../install_steps_interactive.pm_.c:617
+#: ../install_steps_interactive.pm_.c:616
msgid "compact"
msgstr "kompakt"
-#: ../install_steps_interactive.pm_.c:618
+#: ../install_steps_interactive.pm_.c:617
msgid "Delay before booting default image"
msgstr "Forsinkelse før oppstart av standard bilde"
-#: ../install_steps_interactive.pm_.c:619
+#: ../install_steps_interactive.pm_.c:618
msgid "Video mode"
msgstr "Skjerm-modus"
-#: ../install_steps_interactive.pm_.c:621
+#: ../install_steps_interactive.pm_.c:620
msgid "Restrict command line options"
msgstr "Begrense kommandolinje-opsjoner"
-#: ../install_steps_interactive.pm_.c:621
+#: ../install_steps_interactive.pm_.c:620
msgid "restrict"
msgstr "begrense"
-#: ../install_steps_interactive.pm_.c:627
+#: ../install_steps_interactive.pm_.c:626
msgid "LILO main options"
msgstr "LILO hovedopsjoner"
-#: ../install_steps_interactive.pm_.c:631
+#: ../install_steps_interactive.pm_.c:630
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr ""
"Opsjon ``Begrense kommandolinje-opsjoner'' kan ikke brukes uten et passord"
-#: ../install_steps_interactive.pm_.c:640
+#: ../install_steps_interactive.pm_.c:639
msgid ""
"Here are the following entries in LILO.\n"
"You can add some more or change the existent ones."
@@ -2134,52 +2134,52 @@ msgstr ""
"Her er følgende oppføringer i LILO\n"
"Du kan legge til noen flere eller endre de eksisterende."
-#: ../install_steps_interactive.pm_.c:642
+#: ../install_steps_interactive.pm_.c:641
msgid "Add"
msgstr "Legg til"
-#: ../install_steps_interactive.pm_.c:660
+#: ../install_steps_interactive.pm_.c:659
msgid "Image"
msgstr "Bilde"
-#: ../install_steps_interactive.pm_.c:661
-#: ../install_steps_interactive.pm_.c:669
+#: ../install_steps_interactive.pm_.c:660
+#: ../install_steps_interactive.pm_.c:668
msgid "Root"
msgstr "Root"
-#: ../install_steps_interactive.pm_.c:662
+#: ../install_steps_interactive.pm_.c:661
msgid "Append"
msgstr "Tilføye"
-#: ../install_steps_interactive.pm_.c:663
+#: ../install_steps_interactive.pm_.c:662
msgid "Initrd"
msgstr "Initrd"
-#: ../install_steps_interactive.pm_.c:664
+#: ../install_steps_interactive.pm_.c:663
msgid "Read-write"
msgstr "Les-skriv"
-#: ../install_steps_interactive.pm_.c:670
+#: ../install_steps_interactive.pm_.c:669
msgid "Table"
msgstr "Tabell"
-#: ../install_steps_interactive.pm_.c:671
+#: ../install_steps_interactive.pm_.c:670
msgid "Unsafe"
msgstr "Usikker"
-#: ../install_steps_interactive.pm_.c:676
+#: ../install_steps_interactive.pm_.c:675
msgid "Label"
msgstr "Etikett"
-#: ../install_steps_interactive.pm_.c:678
+#: ../install_steps_interactive.pm_.c:677
msgid "Default"
msgstr "Standard"
-#: ../install_steps_interactive.pm_.c:697
+#: ../install_steps_interactive.pm_.c:696
msgid "Installation of LILO failed. The following error occured:"
msgstr "Installasjon av LILO feilet. Følgende feil oppsto:"
-#: ../install_steps_interactive.pm_.c:708
+#: ../install_steps_interactive.pm_.c:707
msgid ""
"Some steps are not completed.\n"
"Do you really want to quit now?"
@@ -2187,7 +2187,7 @@ msgstr ""
"Noen steg er ikke ferdige.\n"
"Ønsker du virkelig å slutte nå?"
-#: ../install_steps_interactive.pm_.c:712
+#: ../install_steps_interactive.pm_.c:711
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -2205,22 +2205,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:729
+#: ../install_steps_interactive.pm_.c:728
#, c-format
msgid "Installing driver for %s card %s"
msgstr "Installerer driver for %s kort %s"
-#: ../install_steps_interactive.pm_.c:730
+#: ../install_steps_interactive.pm_.c:729
#, c-format
msgid "(module %s)"
msgstr "(modul %s)"
-#: ../install_steps_interactive.pm_.c:740
+#: ../install_steps_interactive.pm_.c:739
#, c-format
msgid "What %s card do you have?"
msgstr "Hvilket %s kort har du?"
-#: ../install_steps_interactive.pm_.c:747
+#: ../install_steps_interactive.pm_.c:746
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -2238,20 +2238,20 @@ msgstr ""
"burde\n"
"ikke forårsake noen skade."
-#: ../install_steps_interactive.pm_.c:752
+#: ../install_steps_interactive.pm_.c:751
msgid "Autoprobe"
msgstr "Automatisk sondering"
-#: ../install_steps_interactive.pm_.c:752
+#: ../install_steps_interactive.pm_.c:751
msgid "Specify options"
msgstr "Spesifiser opsjoner"
-#: ../install_steps_interactive.pm_.c:756
+#: ../install_steps_interactive.pm_.c:755
#, 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:762
+#: ../install_steps_interactive.pm_.c:761
#, c-format
msgid ""
"You may now provide its options to module %s.\n"
@@ -2262,11 +2262,11 @@ msgstr ""
"Opsjonene er i format ``name=value name2=value2 ...''.\n"
"F.eks., ``io=0x300 irq=7''"
-#: ../install_steps_interactive.pm_.c:765
+#: ../install_steps_interactive.pm_.c:764
msgid "Module options:"
msgstr "Modulopsjoner:"
-#: ../install_steps_interactive.pm_.c:775
+#: ../install_steps_interactive.pm_.c:774
#, c-format
msgid ""
"Loading module %s failed.\n"
@@ -2275,48 +2275,48 @@ msgstr ""
"Lasting av modul %s feilet.\n"
"Ønsker du å prøve igjen med andre parametere?"
-#: ../install_steps_interactive.pm_.c:788
+#: ../install_steps_interactive.pm_.c:787
msgid "Skip PCMCIA probing"
msgstr "Dropp PCMCIA-søk"
-#: ../install_steps_interactive.pm_.c:789
+#: ../install_steps_interactive.pm_.c:788
msgid "Configuring PCMCIA cards..."
msgstr "Konfigurerer PCMCIA kort..."
-#: ../install_steps_interactive.pm_.c:789
+#: ../install_steps_interactive.pm_.c:788
msgid "PCMCIA"
msgstr "PCMCIA"
-#: ../install_steps_interactive.pm_.c:796
+#: ../install_steps_interactive.pm_.c:795
#, c-format
msgid "Skip %s PCI probing"
msgstr "Dropp %s PCI-søk"
-#: ../install_steps_interactive.pm_.c:800
+#: ../install_steps_interactive.pm_.c:799
#, c-format
msgid "Found %s %s interfaces"
msgstr "Fant %s %s grensesnitt"
-#: ../install_steps_interactive.pm_.c:801
+#: ../install_steps_interactive.pm_.c:800
msgid "Do you have another one?"
msgstr "Har du enda ett?"
-#: ../install_steps_interactive.pm_.c:802
+#: ../install_steps_interactive.pm_.c:801
#, c-format
msgid "Do you have an %s interface?"
msgstr "Har du et %s grensesnitt?"
-#: ../install_steps_interactive.pm_.c:804 ../interactive.pm_.c:52
+#: ../install_steps_interactive.pm_.c:803 ../interactive.pm_.c:52
#: ../my_gtk.pm_.c:347
msgid "No"
msgstr "Nei"
-#: ../install_steps_interactive.pm_.c:804 ../interactive.pm_.c:52
+#: ../install_steps_interactive.pm_.c:803 ../interactive.pm_.c:52
#: ../my_gtk.pm_.c:347
msgid "Yes"
msgstr "Ja"
-#: ../install_steps_interactive.pm_.c:805
+#: ../install_steps_interactive.pm_.c:804
msgid "See hardware info"
msgstr "Se maskinvareinfo"