summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install2.pm5
-rw-r--r--perl-install/install_steps.pm26
-rw-r--r--perl-install/install_steps_interactive.pm61
-rw-r--r--perl-install/interactive_gtk.pm3
-rw-r--r--perl-install/my_gtk.pm30
-rw-r--r--perl-install/printer.pm32
-rw-r--r--perl-install/share/po/no.po352
7 files changed, 272 insertions, 237 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 3fb964b51..ce514710e 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -287,10 +287,11 @@ $o = $::o = {
GMT => 1,
},
printer => {
+ want => 1,
complete => 0,
str_type => $printer::printer_type[0],
QUEUE => "lp",
- SPOOLDIR => "/var/spool/lpd/lp/",
+ SPOOLDIR => "/var/spool/lpd/lp",
DBENTRY => "DeskJet670",
PAPERSIZE => "legal",
CRLF => 0,
@@ -473,7 +474,7 @@ sub configureNetwork {
sub configureTimezone {
my ($clicked) = $_[0];
my $f = "$o->{prefix}/etc/sysconfig/clock";
- return if ((-s $f) || 0) > 0 && $_[1] == 1 && !$clicked;
+ return if ((-s $f) || 0) > 0 && $_[1] == 1 && !$clicked && !$::testing;
$o->timeConfig($f);
}
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 9c5473c49..b9ffd80ee 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -24,18 +24,14 @@ use network;
use fs;
-my $o;
-
-1;
-
-
#-######################################################################################
-#- misc functions
+#- OO Stuff
#-######################################################################################
sub new($$) {
- my ($type, $o_) = @_;
-
- $o = bless $o_, ref $type || $type;
+ my ($type, $o) = @_;
+
+ bless $o, ref $type || $type;
+ return $o;
}
#-######################################################################################
@@ -84,11 +80,15 @@ sub errorInStep($$) {}
#-######################################################################################
#------------------------------------------------------------------------------
sub selectLanguage {
+ my ($o) = @_;
$o->{keyboard} ||= keyboard::lang2keyboard($o->{lang});
selectKeyboard($o);
}
#------------------------------------------------------------------------------
-sub selectKeyboard { keyboard::setup($o->{keyboard}) }
+sub selectKeyboard {
+ my ($o) = @_;
+ keyboard::setup($o->{keyboard})
+ }
#------------------------------------------------------------------------------
sub selectPath {}
#------------------------------------------------------------------------------
@@ -261,6 +261,7 @@ sub addUser($) {
#------------------------------------------------------------------------------
sub createBootdisk($) {
+ my ($o) = @_;
my $dev = $o->{mkbootdisk} or return;
my @l = detect_devices::floppies();
@@ -288,3 +289,8 @@ sub setupXfree {
#------------------------------------------------------------------------------
sub exitInstall {}
+
+#-######################################################################################
+#- Wonderful perl :(
+#-######################################################################################
+1; #
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 65206c569..15292eb39 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -228,7 +228,7 @@ name and directory should be used for this queue?"),
changed => sub
{
$o->{printer}{SPOOLDIR}
- = "$printer::spooldir$o->{printer}{QUEUE}" unless $_[0];
+ = "$printer::spooldir/$o->{printer}{QUEUE}" unless $_[0];
},
);
}
@@ -242,13 +242,17 @@ name and directory should be used for this queue?"),
$o->{printer}{TYPE} = $printer::printer_type{$o->{printer}{str_type}};
if ($o->{printer}{TYPE} eq "LOCAL") {
- eval { modules::load("lp"); };
+ {
+ my $w = $o->wait_message(_("Test ports"), _("Detecting devices..."));
+ eval { modules::load("lp"); };
+ }
my @port = ();
foreach ("lp0", "lp1", "lp2") {
local *LP;
push @port, "/dev/$_" if open LP, ">/dev/$_"
}
eval { modules::unload("lp") };
+
# @port =("lp0", "lp1", "lp2");
$o->{printer}{DEVICE} = $port[0] if $port[0];
@@ -350,33 +354,35 @@ wish to access and any applicable user name and password."),
#color_depth
- my @list_col = @{$db_entry{BITSPERPIXEL}};
- my @col = map { "$_->{DEPTH} $_->{DESCR}" } @list_col;
- my %col_to_depth = map { ("$_->{DEPTH} $_->{DESCR}", $_->{DEPTH}) } @list_col;
- my %depth_to_col = reverse %col_to_depth;
-
- if (@list_col) {
- my $is_uniprint = $db_entry{GSDRIVER} eq "uniprint";
- if ($is_uniprint) {
- $o->{printer}{BITSPERPIXEL} =
- $col_to_depth{$o->ask_from_list_
- (_("Configure Uniprint Driver"),
- _("You may now configure the uniprint options for this printer."),
- \@col,
- $depth_to_col{$o->{printer}{BITSPERPIXEL}},
- )};
+ if ($db_entry{BITSPERPIXEL}) {
+ my @list_col = @{$db_entry{BITSPERPIXEL}};
+ my @col = map { "$_->{DEPTH} $_->{DESCR}" } @list_col;
+ my %col_to_depth = map { ("$_->{DEPTH} $_->{DESCR}", $_->{DEPTH}) } @list_col;
+ my %depth_to_col = reverse %col_to_depth;
+
+ if (@list_col) {
+ my $is_uniprint = $db_entry{GSDRIVER} eq "uniprint";
+ if ($is_uniprint) {
+ $o->{printer}{BITSPERPIXEL} =
+ $col_to_depth{$o->ask_from_list_
+ (_("Configure Uniprint Driver"),
+ _("You may now configure the uniprint options for this printer."),
+ \@col,
+ $depth_to_col{$o->{printer}{BITSPERPIXEL}},
+ )};
+ } else {
+ $o->{printer}{BITSPERPIXEL} =
+ $col_to_depth{$o->ask_from_list_
+ (_("Configure Color Depth"),
+ _("You may now configure the color options for this printer."),
+ \@col,
+ $depth_to_col{$o->{printer}{BITSPERPIXEL}},
+ )};
+ }
} else {
- $o->{printer}{BITSPERPIXEL} =
- $col_to_depth{$o->ask_from_list_
- (_("Configure Color Depth"),
- _("You may now configure the color options for this printer."),
- \@col,
- $depth_to_col{$o->{printer}{BITSPERPIXEL}},
- )};
+ $o->{printer}{BITSPERPIXEL} = "Default";
}
- } else {
- $o->{printer}{BITSPERPIXEL} = "Default";
}
$o->{printer}{complete} = 1;
@@ -415,13 +421,12 @@ sub addUser($) {
my @fields = qw(name password password2 realname);
my @shells = install_any::shells($o);
- @shells = qw( /bin/bash /nide);
$o->ask_from_entries_ref(_("Add user"),
_("Enter a user"),
[_("User name"), _("Password"), _("Password (again)"), _("Real name"), _("Shell"),],
[(map { \$sup->{$_}} @fields),
- {val => \$sup->{shell}, list => \@shells},
+ {val => \$sup->{shell}, list => \@shells, not_edit => !$::expert},
],
complete => sub {
$sup->{password} eq $sup->{password2} or $o->ask_warn('', [ _("You must enter the same password"), _("Please try again") ]), return (1,2);
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index 457406acc..6a0b1d1d2 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -86,6 +86,7 @@ sub ask_from_entries_refW {
$depth_combo->set_use_arrows_always(1);
$depth_combo->entry->set_editable(!$_->{not_edit});
$depth_combo->set_popdown_strings(@{$_->{list}});
+ $depth_combo->disable_activate;
$depth_combo;
} else {
new Gtk::Entry;
@@ -126,7 +127,7 @@ sub ask_from_entries_refW {
comb_entry($entry,$val->[$i])->signal_connect(changed => $callback);
comb_entry($entry,$val->[$i])->signal_connect(activate => sub {
($ind == ($num_champs -1)) ?
- $w->{ok}->grab_focus() : comb_entry($entries[$ind+1],$val->[$ind+1])->grab_focus();
+ ($w->{ok}->grab_focus(), ) : (comb_entry($entries[$ind+1],$val->[$ind+1])->grab_focus(),$_[0]->signal_emit_stop("activate")) ;
});
comb_entry($entry,$val->[$i])->set_text(${$val->[$i]{val}}) if ${$val->[$i]{val}};
comb_entry($entry,$val->[$i])->set_visibility(0) if $l->[$i] =~ /password/i;
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index f0ccaa028..a6e594eba 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -334,7 +334,7 @@ sub _ask_from_entry($$@) {
}
sub _ask_from_list($$$$) {
my ($o, $messages, $l, $def) = @_;
- my $list = new Gtk::List;
+ my $list = new Gtk::List();
my ($first_time, $starting_word) = (1, '');
my (@widgets, $timeout);
$list->signal_connect(select_child => sub {
@@ -374,13 +374,35 @@ sub _ask_from_list($$$$) {
# push @::ask_from_list_widgets, $w; # hack!! to not get SIGSEGV
push @widgets, $w;
} @$l;
+# $scroll_win->set_policy("automatic","automatic");
+# my $scroll_win = @widgets > 15 ? gtkset_usize(createScrolledWindow($list), 200, 280) : $list;
gtkadd($list, @widgets);
+# $list->set_selection_mode("extended");
+ my $scroll_win = do {
+ if (@widgets > 15) {
+ my $win = createScrolledWindow($list);
+ gtkset_usize($win, 200, 280);
+ $list->set_focus_vadjustment($win->get_vadjustment);
+ $list->set_focus_hadjustment($win->get_hadjustment);
+# my $adj = create_adjustment(45,0,200);
+# $win->set_hadjustment($adj);
+# my $adj = $win->get_vadjustment;
+# $adj->set_value(45200);
+# $list->set_focus_vadjustment(new Gtk::Adjustment(45));
+# $widgets[$def]->visible(1);
+# $list->set_focus_child($widgets[$def]);
+# $list->select_item($def);
+# $widgets[$def]->toggle_focus_row();
+ $win;
+ } else {
+ $list;
+ }
+ };
gtkadd($o->{window},
gtkpack($o->create_box_with_title(@$messages),
- @widgets > 15 ?
- gtkset_usize(createScrolledWindow($list), 200, 280) :
- $list));
+ $scroll_win));
$widgets[$def]->grab_focus;
+
}
sub _ask_warn($@) {
diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index b02fe3a10..2ea70fe8e 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -255,7 +255,7 @@ my $PRINTER_FILTER_DIR = "/usr/lib/rhs/rhs-printfilters";
NCP => [qw(NCPHOST NCPQUEUE NCPUSER NCPPASSWD)],
);
@papersize_type = qw(letter legal ledger a3 a4);
-$spooldir = "/var/spool/lpd/";
+$spooldir = "/var/spool/lpd";
#-#####################################################################################
@@ -329,10 +329,12 @@ sub read_printer_db(;$) {
#------------------------------------------------------------------------------
sub create_spool_dir($) {
my ($queue_path) = @_;
- my $complete_path = "$prefix$queue_path";
-
- mkdir "$complete_path", 0755
- or die "An error has occurred - can't create $complete_path : $!";
+ my $complete_path = "$prefix/$queue_path";
+
+ unless (-d $complete_path) {
+ mkdir "$complete_path", 0755
+ or die "An error has occurred - can't create $complete_path : $!";
+ }
#-redhat want that "drwxr-xr-x root lp"
my $gid_lp = (getpwnam("lp"))[3];
@@ -348,7 +350,7 @@ sub create_spool_dir($) {
#------------------------------------------------------------------------------
sub create_config_file($$%) {
my ($inputfile, $outpufile, %toreplace) = @_;
- my ($in, $out) = ("$prefix$inputfile", "$prefix$outpufile");
+ my ($in, $out) = ("$prefix/$inputfile", "$prefix/$outpufile");
local *OUT;
local *IN;
@@ -356,20 +358,18 @@ sub create_config_file($$%) {
open IN , "<$in" or die "Can't open $in $!";
if ($::testing) {
- open OUT, ">$out" or die "Can't open $out $!";
- } else {
*OUT = *STDOUT
+ } else {
+ open OUT, ">$out" or die "Can't open $out $!";
}
while (<IN>) {
if (/@@@(.*)@@@/) {
- my $r = $toreplace{$1} or die "I can't replace $1";
+ my $r = $toreplace{$1};
s/@@@(.*)@@@/$r/g;
}
print OUT;
}
-
-
}
@@ -414,7 +414,7 @@ sub configure_queue($) {
my $get_name_file = sub {
my ($name) = @_;
- ("$PRINTER_FILTER_DIR/$name.in", "$entry->{SPOOLDIR}$name")
+ ("$PRINTER_FILTER_DIR/$name.in", "$entry->{SPOOLDIR}/$name")
};
my ($filein, $file);
my %fieldname = ();
@@ -484,9 +484,9 @@ sub configure_queue($) {
#-now the printcap file
local *PRINTCAP;
if ($::testing) {
- open PRINTCAP, ">$prefix/etc/printcap" or die "Can't open printcap file $!";
- } else {
*PRINTCAP = *STDOUT;
+ } else {
+ open PRINTCAP, ">$prefix/etc/printcap" or die "Can't open printcap file $!";
}
print PRINTCAP $intro_printcap_test;
@@ -513,11 +513,11 @@ sub configure_queue($) {
} else {
#- (pcentry->Type == (PRINTER_SMB | PRINTER_NCP))
print PRINTCAP "\t:lp=/dev/null:\\\n";
- print PRINTCAP "\t:af=$entry->{SPOOLDIR}acct\\\n";
+ print PRINTCAP "\t:af=$entry->{SPOOLDIR}/acct\\\n";
}
#- cheating to get the input filter!
- print PRINTCAP "\t:if=$entry->{SPOOLDIR}filter:\n";
+ print PRINTCAP "\t:if=$entry->{SPOOLDIR}/filter:\n";
}
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index b3a64d8b9..b2fbc6a6c 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: panoramix VERSION\n"
-"POT-Creation-Date: 1999-09-05 13:02+0200\n"
+"POT-Creation-Date: 1999-09-05 23:27+0200\n"
"PO-Revision-Date: 1999-08-25 11:07+0200\n"
"Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
"Language-Team: norwegian\n"
@@ -64,8 +64,8 @@ msgstr "En feil oppsto, prøv å endre noen parametere"
msgid "Automatic resolutions"
msgstr "Automatiske oppløsninger"
-#: ../Xconfigurator.pm_.c:333 ../install_steps_interactive.pm_.c:294
-#: ../install_steps_interactive.pm_.c:295
+#: ../Xconfigurator.pm_.c:333 ../install_steps_interactive.pm_.c:341
+#: ../install_steps_interactive.pm_.c:342
msgid "Resolution"
msgstr "Oppløsning"
@@ -515,7 +515,7 @@ msgstr "Les nøye!"
msgid "all data on this partition will be lost"
msgstr "alle data på denne partisjonen vil gå tapt"
-#: ../diskdrake.pm_.c:136 ../install2.pm_.c:404 ../install_steps.pm_.c:76
+#: ../diskdrake.pm_.c:136 ../install2.pm_.c:405 ../install_steps.pm_.c:69
#: ../install_steps_interactive.pm_.c:33
msgid "Error"
msgstr "Feil"
@@ -670,7 +670,7 @@ msgstr "Du må starte maskinen på nytt for at modifiseringene skal tre i kraft"
msgid "Computing fat filesystem bounds"
msgstr "Beregner fat filsystemgrense"
-#: ../diskdrake.pm_.c:425 ../diskdrake.pm_.c:461 ../interactive_gtk.pm_.c:169
+#: ../diskdrake.pm_.c:425 ../diskdrake.pm_.c:461 ../interactive_gtk.pm_.c:173
msgid "Resizing"
msgstr "Endrer størrelse"
@@ -1013,7 +1013,8 @@ msgstr "Konfigurer X"
msgid "Configure printer"
msgstr "Konfigurer X"
-#: ../install2.pm_.c:187 ../install_steps_graphical.pm_.c:447
+#: ../install2.pm_.c:187 ../install_steps_interactive.pm_.c:400
+#: ../install_steps_interactive.pm_.c:401
msgid "Set root password"
msgstr "Sett root passord"
@@ -1053,7 +1054,7 @@ msgstr "ekspert"
msgid "server"
msgstr "tjener"
-#: ../install2.pm_.c:414
+#: ../install2.pm_.c:415
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"
@@ -1061,157 +1062,71 @@ msgstr ""
"En feil har oppstått - ingen gyldige enheter ble funnet for å opprette nye "
"filsystemer. Vennligst sjekk maskinvaren din for årsaken til dette problemet"
-#: ../install2.pm_.c:429
+#: ../install2.pm_.c:430
msgid "partitioning failed: no root filesystem"
msgstr "partisjonering feilet: intet root filsystem"
-#: ../install_steps.pm_.c:274
+#: ../install_steps.pm_.c:269
msgid "no floppy available"
msgstr ""
-#: ../install_steps_graphical.pm_.c:209
+#: ../install_steps_graphical.pm_.c:225
msgid "Hide"
msgstr "Gjem"
-#: ../install_steps_graphical.pm_.c:209
+#: ../install_steps_graphical.pm_.c:225
msgid "Show All"
msgstr "Vis alle"
-#: ../install_steps_graphical.pm_.c:213
+#: ../install_steps_graphical.pm_.c:229
msgid "Select All"
msgstr "Velg alle"
-#: ../install_steps_graphical.pm_.c:213
+#: ../install_steps_graphical.pm_.c:229
msgid "Unselect All"
msgstr "Fjern alle"
-#: ../install_steps_graphical.pm_.c:280
+#: ../install_steps_graphical.pm_.c:296
msgid "Choose the packages you want to install"
msgstr "Velg pakker du ønsker å installere"
-#: ../install_steps_graphical.pm_.c:291
+#: ../install_steps_graphical.pm_.c:307
msgid " Mb"
msgstr "Mb"
-#: ../install_steps_graphical.pm_.c:291
+#: ../install_steps_graphical.pm_.c:307
msgid "Total size: "
msgstr "Total størrelse: "
-#: ../install_steps_graphical.pm_.c:292
+#: ../install_steps_graphical.pm_.c:308
msgid "Info"
msgstr ""
-#: ../install_steps_graphical.pm_.c:317
+#: ../install_steps_graphical.pm_.c:334
msgid "Installing"
msgstr "Installerer"
-#: ../install_steps_graphical.pm_.c:323
+#: ../install_steps_graphical.pm_.c:340
msgid "Please wait, "
msgstr "Vennligst vent, "
-#: ../install_steps_graphical.pm_.c:325
+#: ../install_steps_graphical.pm_.c:342
msgid "Time remaining "
msgstr "Tid som gjenstår "
-#: ../install_steps_graphical.pm_.c:326
+#: ../install_steps_graphical.pm_.c:343
msgid "Total time "
msgstr "Total tid "
-#: ../install_steps_graphical.pm_.c:331
+#: ../install_steps_graphical.pm_.c:348
msgid "preparing installation"
msgstr "forbereder installasjon"
-#: ../install_steps_graphical.pm_.c:352
+#: ../install_steps_graphical.pm_.c:369
#, c-format
msgid "installing package %s"
msgstr "installerer pakke %s"
-#: ../install_steps_graphical.pm_.c:383
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Konfigurerer nettverks-enhet %s"
-
-#: ../install_steps_graphical.pm_.c:391
-msgid "IP address:"
-msgstr "IP adresse:"
-
-#: ../install_steps_graphical.pm_.c:392
-msgid "Netmask:"
-msgstr "Nettmaske:"
-
-#: ../install_steps_graphical.pm_.c:401
-msgid "IP address should be in format 1.2.3.4"
-msgstr ""
-
-#: ../install_steps_graphical.pm_.c:414
-#, fuzzy
-msgid "Configuring network"
-msgstr "Konfigurer nettverk"
-
-#: ../install_steps_graphical.pm_.c:422
-#, fuzzy
-msgid "Host name:"
-msgstr "Brukernavn"
-
-#: ../install_steps_graphical.pm_.c:423
-#, fuzzy
-msgid "DNS server:"
-msgstr "tjener"
-
-#: ../install_steps_graphical.pm_.c:424
-msgid "Gateway:"
-msgstr ""
-
-#: ../install_steps_graphical.pm_.c:425
-msgid "Gateway device:"
-msgstr ""
-
-#: ../install_steps_graphical.pm_.c:450 ../install_steps_graphical.pm_.c:479
-msgid "Password"
-msgstr "Passord"
-
-#: ../install_steps_graphical.pm_.c:451 ../install_steps_graphical.pm_.c:480
-msgid "Password (again)"
-msgstr "Passord (igjen)"
-
-#: ../install_steps_graphical.pm_.c:460 ../install_steps_graphical.pm_.c:495
-msgid "Please try again"
-msgstr "Vennligst prøv igjen"
-
-#: ../install_steps_graphical.pm_.c:460 ../install_steps_graphical.pm_.c:495
-msgid "You must enter the same password"
-msgstr "Du må skrive inn det samme passordet"
-
-#: ../install_steps_graphical.pm_.c:461
-msgid "This password is too simple"
-msgstr "Dette passordet er for enkelt"
-
-#: ../install_steps_graphical.pm_.c:474
-msgid "Add user"
-msgstr "Legg til bruker"
-
-#: ../install_steps_graphical.pm_.c:478
-msgid "User name"
-msgstr "Brukernavn"
-
-#: ../install_steps_graphical.pm_.c:481
-msgid "Real name"
-msgstr "Virkelig navn"
-
-#: ../install_steps_graphical.pm_.c:482
-msgid "Shell"
-msgstr "Skall"
-
-#: ../install_steps_graphical.pm_.c:497
-msgid "Please give a user name"
-msgstr "Vennligst oppgi et brukernavn"
-
-#: ../install_steps_graphical.pm_.c:498
-#, fuzzy
-msgid ""
-"The user name must contain only lower cased letters, numbers, `-' and `_'"
-msgstr "Brukernavnet kan kun inneholde bokstaver, tall, `-' og `_'"
-
#: ../install_steps_interactive.pm_.c:33
msgid "An error occurred"
msgstr "En feil oppsto"
@@ -1256,109 +1171,117 @@ msgstr ""
"Du må starte maskinen på nytt for at modifiseringene av partisjonstabellen "
"skal tre i kraft"
-#: ../install_steps_interactive.pm_.c:98
+#: ../install_steps_interactive.pm_.c:97
msgid "Choose the partitions you want to format"
msgstr "Velg de partisjonene du ønsker å formatere"
-#: ../install_steps_interactive.pm_.c:109
+#: ../install_steps_interactive.pm_.c:108
#, c-format
msgid "Formatting partition %s"
msgstr "Formaterer partisjon %s"
-#: ../install_steps_interactive.pm_.c:122
+#: ../install_steps_interactive.pm_.c:125
msgid "Keep the current IP configuration"
msgstr "Behold nåværende IP-konfigurasjon"
-#: ../install_steps_interactive.pm_.c:123
+#: ../install_steps_interactive.pm_.c:126
msgid "Reconfigure network now"
msgstr "Rekonfigurer nettverket nå"
-#: ../install_steps_interactive.pm_.c:124
+#: ../install_steps_interactive.pm_.c:127
msgid "Don't set up networking"
msgstr "Ikke sett opp nettverk"
-#: ../install_steps_interactive.pm_.c:126
-#: ../install_steps_interactive.pm_.c:132
+#: ../install_steps_interactive.pm_.c:129
+#: ../install_steps_interactive.pm_.c:135
msgid "Network Configuration"
msgstr "Nettverks-konfigurasjon"
-#: ../install_steps_interactive.pm_.c:127
+#: ../install_steps_interactive.pm_.c:130
msgid "LAN networking has already been configured. Do you want to:"
msgstr "LAN nettverket har allerede blitt konfigurert. Vil du:"
-#: ../install_steps_interactive.pm_.c:133
+#: ../install_steps_interactive.pm_.c:136
msgid ""
"Do you want to configure LAN (not dialup) networking for your installed "
"system?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:179
+#: ../install_steps_interactive.pm_.c:222
msgid "Standard Printer Options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:180
+#: ../install_steps_interactive.pm_.c:223
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:183
+#: ../install_steps_interactive.pm_.c:226
msgid "Name of queue:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:183
+#: ../install_steps_interactive.pm_.c:226
msgid "Spool directory:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:194
+#: ../install_steps_interactive.pm_.c:237
msgid "Select Printer Connection"
msgstr ""
-#: ../install_steps_interactive.pm_.c:195
+#: ../install_steps_interactive.pm_.c:238
msgid "How is the printer connected?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:213
+#: ../install_steps_interactive.pm_.c:246
+msgid "Detecting devices..."
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:246
+msgid "Test ports"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:260
msgid "Local Printer Device"
msgstr ""
-#: ../install_steps_interactive.pm_.c:214
+#: ../install_steps_interactive.pm_.c:261
msgid ""
"What device is your printer connected to \n"
"(note that /dev/lp0 is equivalent to LPT1:)?\n"
msgstr ""
-#: ../install_steps_interactive.pm_.c:215
+#: ../install_steps_interactive.pm_.c:262
#, fuzzy
msgid "Printer Device:"
msgstr "Enhet: "
-#: ../install_steps_interactive.pm_.c:221
+#: ../install_steps_interactive.pm_.c:268
msgid "Remote lpd Printer Options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:222
+#: ../install_steps_interactive.pm_.c:269
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:225
+#: ../install_steps_interactive.pm_.c:272
#, fuzzy
msgid "Remote hostname:"
msgstr "Brukernavn"
-#: ../install_steps_interactive.pm_.c:225
+#: ../install_steps_interactive.pm_.c:272
msgid "Remote queue:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:230
+#: ../install_steps_interactive.pm_.c:277
msgid "SMB/Windows 95/NT Printer Options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:231
+#: ../install_steps_interactive.pm_.c:278
msgid ""
"To print to a SMB printer, you need to provide the \n"
"SMB host name (this is not always the same as the machines \n"
@@ -1367,42 +1290,42 @@ msgid ""
"applicable user name, password, and workgroup information."
msgstr ""
-#: ../install_steps_interactive.pm_.c:236
+#: ../install_steps_interactive.pm_.c:283
#, fuzzy
msgid "SMB server IP:"
msgstr "tjener"
-#: ../install_steps_interactive.pm_.c:236
+#: ../install_steps_interactive.pm_.c:283
#, fuzzy
msgid "SMB server host:"
msgstr "tjener"
-#: ../install_steps_interactive.pm_.c:237
-#: ../install_steps_interactive.pm_.c:251
+#: ../install_steps_interactive.pm_.c:284
+#: ../install_steps_interactive.pm_.c:298
#, fuzzy
msgid "Password:"
msgstr "Passord"
-#: ../install_steps_interactive.pm_.c:237
+#: ../install_steps_interactive.pm_.c:284
#, fuzzy
msgid "Share name:"
msgstr "Brukernavn"
-#: ../install_steps_interactive.pm_.c:237
-#: ../install_steps_interactive.pm_.c:251
+#: ../install_steps_interactive.pm_.c:284
+#: ../install_steps_interactive.pm_.c:298
#, fuzzy
msgid "User name:"
msgstr "Brukernavn"
-#: ../install_steps_interactive.pm_.c:238
+#: ../install_steps_interactive.pm_.c:285
msgid "Workgroup:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:245
+#: ../install_steps_interactive.pm_.c:292
msgid "NetWare Printer Options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:246
+#: ../install_steps_interactive.pm_.c:293
msgid ""
"To print to a NetWare printer, you need to provide the \n"
"NetWare print server name (this is not always the same as the machines \n"
@@ -1410,56 +1333,112 @@ msgid ""
"wish to access and any applicable user name and password."
msgstr ""
-#: ../install_steps_interactive.pm_.c:250
+#: ../install_steps_interactive.pm_.c:297
msgid "Print Queue Name:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:250
+#: ../install_steps_interactive.pm_.c:297
msgid "Printer Server:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:272
+#: ../install_steps_interactive.pm_.c:319
#, fuzzy
msgid "Configure Printer"
msgstr "Konfigurer X"
-#: ../install_steps_interactive.pm_.c:273
+#: ../install_steps_interactive.pm_.c:320
#, fuzzy
msgid "What type of printer do you have?"
msgstr "Hva slags brukertype vil du ha?"
-#: ../install_steps_interactive.pm_.c:284
-#: ../install_steps_interactive.pm_.c:285
+#: ../install_steps_interactive.pm_.c:331
+#: ../install_steps_interactive.pm_.c:332
msgid "Paper Size"
msgstr ""
-#: ../install_steps_interactive.pm_.c:304
+#: ../install_steps_interactive.pm_.c:351
msgid "CRLF"
msgstr ""
-#: ../install_steps_interactive.pm_.c:305
+#: ../install_steps_interactive.pm_.c:352
msgid "Fix stair-stepping of text?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:320
+#: ../install_steps_interactive.pm_.c:368
#, fuzzy
msgid "Configure Uniprint Driver"
msgstr "Konfigurer X"
-#: ../install_steps_interactive.pm_.c:321
+#: ../install_steps_interactive.pm_.c:369
msgid "You may now configure the uniprint options for this printer."
msgstr ""
-#: ../install_steps_interactive.pm_.c:329
+#: ../install_steps_interactive.pm_.c:377
#, fuzzy
msgid "Configure Color Depth"
msgstr "Konfigurer X"
-#: ../install_steps_interactive.pm_.c:330
+#: ../install_steps_interactive.pm_.c:378
msgid "You may now configure the color options for this printer."
msgstr ""
-#: ../install_steps_interactive.pm_.c:350
+#: ../install_steps_interactive.pm_.c:402
+#: ../install_steps_interactive.pm_.c:427
+msgid "Password"
+msgstr "Passord"
+
+#: ../install_steps_interactive.pm_.c:402
+#: ../install_steps_interactive.pm_.c:427
+msgid "Password (again)"
+msgstr "Passord (igjen)"
+
+#: ../install_steps_interactive.pm_.c:405
+#: ../install_steps_interactive.pm_.c:432
+msgid "Please try again"
+msgstr "Vennligst prøv igjen"
+
+#: ../install_steps_interactive.pm_.c:405
+#: ../install_steps_interactive.pm_.c:432
+msgid "You must enter the same password"
+msgstr "Du må skrive inn det samme passordet"
+
+#: ../install_steps_interactive.pm_.c:406
+#: ../install_steps_interactive.pm_.c:433
+msgid "This password is too simple"
+msgstr "Dette passordet er for enkelt"
+
+#: ../install_steps_interactive.pm_.c:425
+msgid "Add user"
+msgstr "Legg til bruker"
+
+#: ../install_steps_interactive.pm_.c:426
+#, fuzzy
+msgid "Enter a user"
+msgstr "Legg til en bruker"
+
+#: ../install_steps_interactive.pm_.c:427
+msgid "Real name"
+msgstr "Virkelig navn"
+
+#: ../install_steps_interactive.pm_.c:427
+msgid "Shell"
+msgstr "Skall"
+
+#: ../install_steps_interactive.pm_.c:427
+msgid "User name"
+msgstr "Brukernavn"
+
+#: ../install_steps_interactive.pm_.c:434
+msgid "Please give a user name"
+msgstr "Vennligst oppgi et brukernavn"
+
+#: ../install_steps_interactive.pm_.c:435
+#, fuzzy
+msgid ""
+"The user name must contain only lower cased letters, numbers, `-' and `_'"
+msgstr "Brukernavnet kan kun inneholde bokstaver, tall, `-' og `_'"
+
+#: ../install_steps_interactive.pm_.c:455
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 "
@@ -1473,44 +1452,44 @@ msgid ""
"failures. Would you like to create a bootdisk for your system?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:358
+#: ../install_steps_interactive.pm_.c:463
msgid "Sorry, no floppy drive available"
msgstr ""
-#: ../install_steps_interactive.pm_.c:361
+#: ../install_steps_interactive.pm_.c:466
#, fuzzy
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr "Velg de partisjonene du ønsker å formatere"
-#: ../install_steps_interactive.pm_.c:365
+#: ../install_steps_interactive.pm_.c:470
#, c-format
msgid "Insert a floppy in drive %s"
msgstr ""
-#: ../install_steps_interactive.pm_.c:366
+#: ../install_steps_interactive.pm_.c:471
#, fuzzy
msgid "Creating bootdisk"
msgstr "Opprett oppstartdiskett"
-#: ../install_steps_interactive.pm_.c:372
+#: ../install_steps_interactive.pm_.c:478
msgid "First sector of boot partition"
msgstr ""
-#: ../install_steps_interactive.pm_.c:372
+#: ../install_steps_interactive.pm_.c:478
msgid "First sector of drive"
msgstr ""
-#: ../install_steps_interactive.pm_.c:375
+#: ../install_steps_interactive.pm_.c:481
#, fuzzy
msgid "Lilo Installation"
msgstr "Installerer"
-#: ../install_steps_interactive.pm_.c:376
+#: ../install_steps_interactive.pm_.c:482
#, fuzzy
msgid "Where do you want to install the bootloader?"
msgstr "Hvor vil du montere %s enheten?"
-#: ../install_steps_interactive.pm_.c:386
+#: ../install_steps_interactive.pm_.c:493
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -1521,43 +1500,43 @@ msgid ""
"install chapter of the Official Linux Mandrake User's Guide."
msgstr ""
-#: ../install_steps_interactive.pm_.c:399
+#: ../install_steps_interactive.pm_.c:510
#, fuzzy, c-format
msgid "What %s card have you?"
msgstr "Hva slags scsi-kort har du?"
-#: ../install_steps_interactive.pm_.c:409
+#: ../install_steps_interactive.pm_.c:520
msgid "Autoprobe"
msgstr ""
-#: ../install_steps_interactive.pm_.c:409
+#: ../install_steps_interactive.pm_.c:520
msgid "Specify options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:416
+#: ../install_steps_interactive.pm_.c:527
msgid "Module options:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:434
+#: ../install_steps_interactive.pm_.c:546
#, fuzzy, c-format
msgid "Installing driver for %s card %s"
msgstr "Installerer driver for scsi-kort %s"
-#: ../install_steps_interactive.pm_.c:435
+#: ../install_steps_interactive.pm_.c:547
#, c-format
msgid "(module %s)"
msgstr "(modul %s)"
-#: ../install_steps_interactive.pm_.c:448
+#: ../install_steps_interactive.pm_.c:561
#, fuzzy, c-format
msgid "Found %s %s interfaces"
msgstr " scsi grensesnitt"
-#: ../install_steps_interactive.pm_.c:449
+#: ../install_steps_interactive.pm_.c:562
msgid "Do you have another one?"
msgstr "Har du enda ett?"
-#: ../install_steps_interactive.pm_.c:450
+#: ../install_steps_interactive.pm_.c:563
#, fuzzy, c-format
msgid "Do you have an %s interface?"
msgstr "Har du et scsi grensesnitt"
@@ -1568,7 +1547,7 @@ msgid "Starting step `%s'\n"
msgstr "Starter steg `%s'\n"
#: ../interactive.pm_.c:42 ../interactive.pm_.c:52 ../my_gtk.pm_.c:174
-#: ../my_gtk.pm_.c:316 ../my_gtk.pm_.c:390
+#: ../my_gtk.pm_.c:316 ../my_gtk.pm_.c:412
msgid "Ok"
msgstr "Ok"
@@ -1584,7 +1563,7 @@ msgstr "Ja"
msgid "Cancel"
msgstr "Avbryt"
-#: ../interactive.pm_.c:118
+#: ../interactive.pm_.c:125
msgid "Please wait"
msgstr "Vennligst vent"
@@ -1758,6 +1737,27 @@ msgstr "Dårlig backup-fil"
msgid "Error writing to file %s"
msgstr "Feil ved skriving til fil %s"
+#~ msgid "Configuring network device %s"
+#~ msgstr "Konfigurerer nettverks-enhet %s"
+
+#~ msgid "IP address:"
+#~ msgstr "IP adresse:"
+
+#~ msgid "Netmask:"
+#~ msgstr "Nettmaske:"
+
+#, fuzzy
+#~ msgid "Configuring network"
+#~ msgstr "Konfigurer nettverk"
+
+#, fuzzy
+#~ msgid "Host name:"
+#~ msgstr "Brukernavn"
+
+#, fuzzy
+#~ msgid "DNS server:"
+#~ msgstr "tjener"
+
#, fuzzy
#~ msgid "Printer"
#~ msgstr "Enhet: "
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-01 03:40:21 +0000