diff options
Diffstat (limited to 'perl-install/printer')
| -rw-r--r-- | perl-install/printer/data.pm | 2 | ||||
| -rw-r--r-- | perl-install/printer/main.pm | 14 | ||||
| -rw-r--r-- | perl-install/printer/printerdrake.pm | 18 |
3 files changed, 17 insertions, 17 deletions
diff --git a/perl-install/printer/data.pm b/perl-install/printer/data.pm index 75616daf5..6e1dc4041 100644 --- a/perl-install/printer/data.pm +++ b/perl-install/printer/data.pm @@ -37,7 +37,7 @@ our %spoolers = ('pdq' => { 'help' => "/usr/bin/pdq -h -P %s 2>&1 |", 'print_command' => 'lpr-pdq', 'print_gui' => 'xpdq', - 'long_name' => N("PDQ - Print, Don't Queue"), + 'long_name' => N("PDQ - Print, Do not Queue"), 'short_name' => N("PDQ"), 'local_queues' => 1, 'packages2add' => [ [ 'pdq' ], [qw(/usr/bin/pdq /usr/X11R6/bin/xpdq)] ], diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm index 102d42100..28ee79cb5 100644 --- a/perl-install/printer/main.pm +++ b/perl-install/printer/main.pm @@ -462,7 +462,7 @@ sub read_printer_db { # No local queues available in daemon-less CUPS mode return 1 if $spooler eq "rcups"; - my $DBPATH; #- don't have to do close ... and don't modify globals at least + my $DBPATH; #- do not have to do close ... and do not modify globals at least # Generate the Foomatic printer/driver overview, read it from the # appropriate file when it is already generated open($DBPATH, ($::testing ? $::prefix : "chroot $::prefix/ ") . #-# @@ -1688,7 +1688,7 @@ sub poll_ppd_base { #- to make sure the file /etc/cups/ppds.dat is no more modified. #- If cups continue to modify it (because it reads the ppd files #- available), the poll_ppd_base program simply cores :-) - # else cups will not be happy! and ifup lo don't run ? + # else cups will not be happy! and ifup lo do not run ? run_program::rooted($::prefix, 'ifconfig', 'lo', '127.0.0.1'); printer::services::start_not_running_service("cups"); my $driversthere = scalar(keys %thedb); @@ -2520,7 +2520,7 @@ init.version=2 "# to delete and re-configure this device.\n"; if ($bus eq "par") { print $CONFIG - "# Comment out if you don't care what model is really connected to this\n" . + "# Comment out if you do not care what model is really connected to this\n" . "# parallel port.\n"; } } @@ -2551,7 +2551,7 @@ init.version=2 "# Standard options passed to ptal-mlcd:\n" . "init.mlcd.append+="; if ($bus eq "usb") { - # Important: don't put more quotes around /dev/usb/lp[0-9]*, + # Important: do not put more quotes around /dev/usb/lp[0-9]*, # because ptal-mlcd currently does no globbing: print $CONFIG "-device /dev/usb/lp0 /dev/usb/lp1 /dev/usb/lp2 /dev/usb/lp3 /dev/usb/lp4 /dev/usb/lp5 /dev/usb/lp6 /dev/usb/lp7 /dev/usb/lp8 /dev/usb/lp9 /dev/usb/lp10 /dev/usb/lp11 /dev/usb/lp12 /dev/usb/lp13 /dev/usb/lp14 /dev/usb/lp15"; } elsif ($bus eq "par") { @@ -2577,7 +2577,7 @@ init.version=2 } else { print $CONFIG "\n" . - "# By default ptal-printd isn't started for hpjd: devices.\n" . + "# By default ptal-printd is not started for hpjd: devices.\n" . "# If for some reason you want to start it for this device, then\n" . "# uncomment the following line:\n" . "init.printd.start=1\n"; @@ -2665,7 +2665,7 @@ sub config_sane() { return if (! -f "$::prefix/etc/sane.d/dll.conf"); return if member("hpoj", chomp_(cat_("$::prefix/etc/sane.d/dll.conf"))); eval { append_to_file("$::prefix/etc/sane.d/dll.conf", "hpoj\n") } or - die "can't write SANE config in /etc/sane.d/dll.conf: $!"; + die "can not write SANE config in /etc/sane.d/dll.conf: $!"; } sub config_photocard() { @@ -2689,7 +2689,7 @@ EOF # modify the existing one my $mtoolsfmconf; if (-f "$::prefix/etc/mtoolsfm.conf") { - $mtoolsfmconf = cat_("$::prefix/etc/mtoolsfm.conf") or die "can't read MToolsFM config in $::prefix/etc/mtoolsfm.conf: $!"; + $mtoolsfmconf = cat_("$::prefix/etc/mtoolsfm.conf") or die "can not read MToolsFM config in $::prefix/etc/mtoolsfm.conf: $!"; my $alloweddrives = lc($1) if $mtoolsfmconf =~ m/^\s*DRIVES\s*=\s*"([A-Za-z ]*)"/m; foreach my $letter ("p", "q", "r", "s") { $alloweddrives .= $letter if $alloweddrives !~ /$letter/; diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm index 80183e877..2c850833c 100644 --- a/perl-install/printer/printerdrake.pm +++ b/perl-install/printer/printerdrake.pm @@ -686,7 +686,7 @@ sub first_time_dialog { # Do we have a local network? - # If networking is configured, start it, but don't ask the user to + # If networking is configured, start it, but do not ask the user to # configure networking. my $havelocalnetworks = check_network($printer, $in, $upNetwork, 1) && @@ -906,7 +906,7 @@ sub wizard_welcome { my $autodetectlocal = 0; my $autodetectnetwork = 0; my $autodetectsmb = 0; - # If networking is configured, start it, but don't ask the user to + # If networking is configured, start it, but do not ask the user to # configure networking. my $havelocalnetworks; if ($printer->{expert}) { @@ -950,7 +950,7 @@ This wizard will help you to install your printer(s) connected to this computer, Please plug in and turn on all printers connected to this machine so that it/they can be auto-detected. Also your network printer(s) and your Windows machines must be connected and turned on. -Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network and/or Windows-hosted printers when you don't need it. +Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network and/or Windows-hosted printers when you do not need it. Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now.") : N(" Welcome to the Printer Setup Wizard @@ -967,7 +967,7 @@ This wizard will help you to install your printer(s) connected to this computer If you have printer(s) connected to this machine, Please plug it/them in on this computer and turn it/them on so that it/they can be auto-detected. Also your network printer(s) must be connected and turned on. -Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network printers when you don't need it. +Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network printers when you do not need it. Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now.") : N(" Welcome to the Printer Setup Wizard @@ -1976,7 +1976,7 @@ sub setup_common { my $isHPOJ = 0; my $w; if ($device =~ m!^/dev/! || $device =~ m!^socket://!) { - # Ask user whether he has a multi-function device when he didn't + # Ask user whether he has a multi-function device when he did not # do auto-detection or when auto-detection failed my $searchunknown = N("Unknown model"); if (!$do_auto_detect || @@ -2032,7 +2032,7 @@ sub setup_common { if ($ptaldevice) { # HPOJ has determined the device name, make use of it if we - # didn't know it before + # did not know it before if (!$do_auto_detect || !$makemodel || $makemodel eq $searchunknown || @@ -2316,7 +2316,7 @@ sub setup_common { } else { $dbmakemodel = $entry; } - # Don't try to match if the database entry does not provide + # Do not try to match if the database entry does not provide # make and model next unless $dbmakemodel; # If make and model match exactly, we have found the correct @@ -2758,7 +2758,7 @@ sub get_printer_info { ($printer->{configured}{$queue}{queuedata}{foomatic} || $printer->{configured}{$queue}{queuedata}{ppd})) { if (!$newdriver) { - # The user didn't change the printer/driver + # The user did not change the printer/driver $printer->{ARGS} = $printer->{configured}{$queue}{args}; } elsif ($printer->{currentqueue}{foomatic}) { # The queue was already configured with Foomatic ... @@ -4271,7 +4271,7 @@ sub mainwindow_interactive { while (1) { my ($queue, $newcursorpos) = ('', 0); - # If networking is configured, start it, but don't ask the + # If networking is configured, start it, but do not ask the # user to configure networking. We want to know whether we # have a local network to suppress some buttons when there is # no network |