summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-02-10 14:24:40 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-02-10 14:24:40 +0000
commit4327e33bb80a908720fb98590be060ba358b931e (patch)
tree452f92e03ac3b5ca3b77f4f6d8c274fc81090175
parent191ec06b38ee710f661e94e9fcf6542910c548d3 (diff)
downloaddrakx-4327e33bb80a908720fb98590be060ba358b931e.tar
drakx-4327e33bb80a908720fb98590be060ba358b931e.tar.gz
drakx-4327e33bb80a908720fb98590be060ba358b931e.tar.bz2
drakx-4327e33bb80a908720fb98590be060ba358b931e.tar.xz
drakx-4327e33bb80a908720fb98590be060ba358b931e.zip
Tell that card reader is USB storage in the HPLIP help text only if the device is actually connected via USB.
-rw-r--r--perl-install/printer/printerdrake.pm10
1 files changed, 4 insertions, 6 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index ec4019c5a..150f09055 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -3700,14 +3700,12 @@ sub hplip_help {
$text .= N("Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share your scanner on the network.\n\n");
}
- if ($hplipentry->{card} == 1) {
- $text .= N("The memory card readers in your printer can be accessed using HP's Printer Toolbox (Menu: System/Monitoring/HP Printer Toolbox) clicking the \"Access Photo Cards...\" button on the \"Functions\" tab. ");
- $text .= N("Note that this is very slow, reading the pictures from the camera or a USB card reader is usually faster.\n\n");
- }
-
- if ($hplipentry->{card} == 2) {
+ if (($hplipentry->{card} == 2) && ($deviceuri =~ m!/usb/!i)) {
$text .= N("The memory card readers in your printer can be accessed like a usual USB mass storage device. ");
$text .= N("After inserting a card a hard disk icon to access the card should appear on your desktop.\n\n");
+ } elsif ($hplipentry->{card} > 0) {
+ $text .= N("The memory card readers in your printer can be accessed using HP's Printer Toolbox (Menu: System/Monitoring/HP Printer Toolbox) clicking the \"Access Photo Cards...\" button on the \"Functions\" tab. ");
+ $text .= N("Note that this is very slow, reading the pictures from the camera or a USB card reader is usually faster.\n\n");
}
$text .= N("HP's Printer Toolbox (Menu: System/Monitoring/HP Printer Toolbox) offers a lot of status monitoring and maintenance functions for your %s:\n\n", $makemodel);