summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-12-17 13:23:01 +0000
committerFrancois Pons <fpons@mandriva.com>1999-12-17 13:23:01 +0000
commit066052c2d8fc8c5e39d40696819f5cb56b304d01 (patch)
tree7bbfb5e5e913c9fa28bd403d92ea6b58d93e0b07
parentb3b22a31f8ed8be86caab15d544dd37b34fa1c35 (diff)
downloaddrakx-backup-do-not-use-066052c2d8fc8c5e39d40696819f5cb56b304d01.tar
drakx-backup-do-not-use-066052c2d8fc8c5e39d40696819f5cb56b304d01.tar.gz
drakx-backup-do-not-use-066052c2d8fc8c5e39d40696819f5cb56b304d01.tar.bz2
drakx-backup-do-not-use-066052c2d8fc8c5e39d40696819f5cb56b304d01.tar.xz
drakx-backup-do-not-use-066052c2d8fc8c5e39d40696819f5cb56b304d01.zip
*** empty log message ***
-rw-r--r--perl-install/install_steps_interactive.pm2
-rw-r--r--perl-install/printerdrake.pm12
2 files changed, 9 insertions, 5 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 8b859aaa8..4cf1dbfd9 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -264,7 +264,7 @@ sub installPackages {
sub afterInstallPackages($) {
my ($o) = @_;
- my $w = $o->wait_message('', _("Post install stuff"));
+ my $w = $o->wait_message('', _("Post install configuration"));
$o->SUPER::afterInstallPackages($o);
}
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index c41d1b0b0..c014440c1 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -233,7 +233,7 @@ _("Color depth options") => { val => \$printer->{BITSPERPIXEL}, type => 'list',
if $action eq "ps" || $action eq "both";
if (@testpages) {
- my $w = $in->wait_message('', _(@testpages > 1 ? "Printing tests pages..." : "Printing test page..."));
+ my $w = $in->wait_message('', _("Printing test page(s)..."));
#- restart lpd with blank spool queue.
foreach (("/var/spool/lpd/$printer->{QUEUE}/lock", "/var/spool/lpd/lpd.lock")) {
@@ -245,15 +245,19 @@ _("Color depth options") => { val => \$printer->{BITSPERPIXEL}, type => 'list',
run_program::rooted($prefix, "lpr", "-P$printer->{QUEUE}", $_) foreach @testpages;
- sleep 3; #- allow lpr to send pages.
+ sleep 5; #- allow lpr to send pages.
local *F; open F, "chroot $prefix/ /usr/bin/lpq -P$printer->{QUEUE} |";
my @lpq_output = grep { !/^no entries/ && !(/^Rank\s+Owner/ .. /^\s*$/) } <F>;
undef $w; #- erase wait message window.
if (@lpq_output) {
- $action = $in->ask_yesorno('', _("Is this correct? Printing status:\n%s", "@lpq_output"), 1) ? 'done' : 'change';
+ $action = $in->ask_yesorno('', _("Test page(s) have been sent to the printer daemon.
+This may take a little time before printer start.
+Does it work properly? Printing status:\n%s", "@lpq_output"), 1) ? 'done' : 'change';
} else {
- $action = $in->ask_yesorno('', _("Is this correct?"), 1) ? 'done' : 'change';
+ $action = $in->ask_yesorno('', _("Test page(s) have been sent to the printer daemon.
+This may take a little time before printer start.
+Does it work properly?"), 1) ? 'done' : 'change';
}
}
} while ($action ne 'done');