diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2004-01-21 21:49:52 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2004-01-21 21:49:52 +0000 |
| commit | 8a9c32f86ccce9d42591a21df8bc9e2f453f615c (patch) | |
| tree | 4741b1b2ac5b8960e99396f4f99f71faccb2fbd7 /perl-install/standalone/scannerdrake | |
| parent | 15a7fc518df015b31f5721f0599b26c879a7df85 (diff) | |
| download | drakx-backup-do-not-use-8a9c32f86ccce9d42591a21df8bc9e2f453f615c.tar drakx-backup-do-not-use-8a9c32f86ccce9d42591a21df8bc9e2f453f615c.tar.gz drakx-backup-do-not-use-8a9c32f86ccce9d42591a21df8bc9e2f453f615c.tar.bz2 drakx-backup-do-not-use-8a9c32f86ccce9d42591a21df8bc9e2f453f615c.tar.xz drakx-backup-do-not-use-8a9c32f86ccce9d42591a21df8bc9e2f453f615c.zip | |
Removed occurences of "Mandrake" from translateable strings.
Diffstat (limited to 'perl-install/standalone/scannerdrake')
| -rwxr-xr-x | perl-install/standalone/scannerdrake | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake index cbcb38a73..9ae71f542 100755 --- a/perl-install/standalone/scannerdrake +++ b/perl-install/standalone/scannerdrake @@ -2,6 +2,7 @@ # scannerdrake $Id$ # Yves Duret <yduret at mandrakesoft.com> +# Till Kamppeter <till at mandrakesoft.com> # Copyright (C) 2001-2002 MandrakeSoft # # This program is free software; you can redistribute it and/or modify @@ -28,6 +29,11 @@ use scanner; use handle_configs; use services; +my $companyname = "MandrakeSoft"; +my $distroname = "Mandrake Linux"; +my $shortdistroname = "Mandrake"; +my $domainname = "mandrakesoft.com"; + foreach (@ARGV) { /^--update-usbtable$/ and do { scanner::updateScannerDBfromUsbtable(); exit() }; /^--update-sane=(.*)$/ and do { scanner::updateScannerDBfromSane($1); exit() }; @@ -85,7 +91,7 @@ sub auto() { my $name = $_->{val}{DESCRIPTION}; $name =~ s/\s$//; # some HP entries have a trailing space, i will correct usbtable asap if ($scanner::scannerDB->{$name}{flags}{unsupported}) { - $in->ask_warn('Scannerdrake', N("The %s is not supported by this version of Mandrake Linux.", removeverticalbar($name))); + $in->ask_warn('Scannerdrake', N("The %s is not supported by this version of %s.", removeverticalbar($name), $distroname)); next; } if ($in->ask_yesorno('Scannerdrake', N("%s found on %s, configure it automatically?", removeverticalbar($name), $_->{port}),1)) { @@ -126,7 +132,7 @@ sub manual { '') or return 0; return 0 if $s eq ' None'; if ($scanner::scannerDB->{$s}{flags}{unsupported}) { - $in->ask_warn('Scannerdrake', N("The %s is not supported by this version of Mandrake Linux.", removeverticalbar($s))); + $in->ask_warn('Scannerdrake', N("The %s is not supported by this version of %s.", removeverticalbar($s), $distroname)); return 0; } return tryConfScanner($s, $port, $vendor, $product); @@ -140,7 +146,7 @@ sub dynamic() { $name = $_->{val}{DESCRIPTION}; $name =~ s/\s$//; #some HP entry have a trailing space, i will correct usbtable asap if ($scanner::scannerDB->{$name}{flags}{unsupported}) { - $in->ask_warn('Scannerdrake', N("The %s is not supported by this version of Mandrake Linux.", removeverticalbar($name))); + $in->ask_warn('Scannerdrake', N("The %s is not supported by this version of %s.", removeverticalbar($name), $distroname)); next; } scanner::confScanner($name, $_->{port}, @@ -282,7 +288,7 @@ sub tryConfScanner { return 0; } if ($scanner::scannerDB->{$model}{server} =~ /(printerdrake|hpoj)/i) { - $in->ask_warn('Scannerdrake', N("The %s must be configured by printerdrake.\nYou can launch printerdrake from the Mandrake Control Center in Hardware section.", removeverticalbar($model))); + $in->ask_warn('Scannerdrake', N("The %s must be configured by printerdrake.\nYou can launch printerdrake from the %s Control Center in Hardware section.", removeverticalbar($model), $shortdistroname)); return 0; } if ($scanner::scannerDB->{$model}{ask} =~ /DEVICE/ || !$port) { |