summaryrefslogtreecommitdiffstats
path: root/perl-install/printer.pm
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2001-08-09 23:25:30 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2001-08-09 23:25:30 +0000
commit93f6bf74e5a1c9ef0d714532aedea49876748e25 (patch)
treeabb7e2aeb70b0e7949d52a410cb961beda67413b /perl-install/printer.pm
parent3ebc35acecf616da1ebd9150cc90dfa3d21eb73d (diff)
downloaddrakx-93f6bf74e5a1c9ef0d714532aedea49876748e25.tar
drakx-93f6bf74e5a1c9ef0d714532aedea49876748e25.tar.gz
drakx-93f6bf74e5a1c9ef0d714532aedea49876748e25.tar.bz2
drakx-93f6bf74e5a1c9ef0d714532aedea49876748e25.tar.xz
drakx-93f6bf74e5a1c9ef0d714532aedea49876748e25.zip
New structure for queue modification, general structure clean-up
Diffstat (limited to 'perl-install/printer.pm')
-rw-r--r--perl-install/printer.pm31
1 files changed, 16 insertions, 15 deletions
diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index e916ce6df..7425885a9 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -20,24 +20,24 @@ my $FOOMATICCONFDIR = "/etc/foomatic";
my $FOOMATIC_DEFAULT_SPOOLER = "$FOOMATICCONFDIR/defaultspooler";
%spooler = (
- __("CUPS - Common Unix Printing System") => "cups",
- __("LPRng - LPR New Generation") => "lprng",
- __("LPD - Line Printer Daemon") => "lpd",
- __("PDQ - Print, Don't Queue") => "pdq"
-# __("PDQ - Marcia, click here!") => "pdq"
+ _("CUPS - Common Unix Printing System") => "cups",
+ _("LPRng - LPR New Generation") => "lprng",
+ _("LPD - Line Printer Daemon") => "lpd",
+ _("PDQ - Print, Don't Queue") => "pdq"
+# _("PDQ - Marcia, click here!") => "pdq"
);
%spooler_inv = reverse %spooler;
%printer_type = (
- __("Local printer") => "LOCAL",
- __("Remote printer") => "REMOTE",
- __("Remote CUPS server") => "CUPS",
- __("Remote lpd server") => "LPD",
- __("Network printer (socket)") => "SOCKET",
- __("SMB/Windows 95/98/NT") => "SMB",
- __("NetWare") => "NCP",
- __("Printer Device URI") => "URI",
- __("Pipe into command") => "POSTPIPE"
+ _("Local printer") => "LOCAL",
+ _("Remote printer") => "REMOTE",
+ _("Printer on remote CUPS server") => "CUPS",
+ _("Printer on remote lpd server") => "LPD",
+ _("Network printer (socket)") => "SOCKET",
+ _("Printer on SMB/Windows 95/98/NT server") => "SMB",
+ _("Printer on NetWare server") => "NCP",
+ _("Enter a printer device URI") => "URI",
+ _("Pipe job into a command") => "POSTPIPE"
);
%printer_type_inv = reverse %printer_type;
@@ -124,6 +124,7 @@ sub resetinfo($) {
my ($printer) = @_;
$printer->{QUEUE} = "";
$printer->{OLD_QUEUE} = "";
+ $printer->{OLD_CHOICE} = "";
$printer->{ARGS} = "";
$printer->{DBENTRY} = "";
@{$printer->{OPTIONS}} = ();
@@ -181,7 +182,7 @@ sub read_configured_queues($) {
$printer->{OLD_QUEUE} = "";
}
$printer->{configured}{$QUEUES[$i]->{'queuedata'}{'queue'}}{make} ||= "";
- $printer->{configured}{$QUEUES[$i]->{'queuedata'}{'queue'}}{model} ||= __("Unknown model");
+ $printer->{configured}{$QUEUES[$i]->{'queuedata'}{'queue'}}{model} ||= _("Unknown model");
}
}
}