Removed occurences of "Mandrake" from translateable strings.

5 files changed, 32 insertions, 15 deletions

diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index 2bc625ddf..f856902a2 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -49,10 +49,11 @@ sub spooler() {
 
     #return @spooler_inv{qw(cups lpd lprng pdq)};
 
-    # LPRng is not officially supported any more since Mandrake 9.0, so
-    # show it only in the spooler menu when it was manually installed.
+    # LPRng is not officially supported any more since version 9.0 of
+    # this distribution, so show it only in the spooler menu when it
+    # was manually installed.
 
-    # PDQ is not officially supported any more since Mandrake 9.1, so
+    # PDQ is not officially supported any more since version 9.1, so
     # show it only in the spooler menu when it was manually installed.
 
     return map { $spoolers{$_}{long_name} } qw(cups), 
@@ -2229,7 +2230,7 @@ sub configure_hpoj {
 	    # Preliminary workaround to make the user-mode USB devices
 	    # (LIDIL devices) installable as verification of the HPOJ
 	    # settings of these devices does not work yet. The workaround
-	    # will probably removed after Mandrake 9.2.
+	    # will probably removed after version 9.2 of this distribution.
 	    # Note: This workaround leaves out the checking for a photo
 	    # memory card reader, but to my knowledge there are no LIDIL
 	    # devices with card reader yet.
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 296c80f5d..31b1fc501 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -14,11 +14,16 @@ use printer::detect;
 use printer::default;
 use printer::data;
 
-1;
+my $companyname = "MandrakeSoft";
+my $distroname = "Mandrake Linux";
+my $shortdistroname = "Mandrake";
+my $domainname = "mandrakesoft.com";
 
 my $hp1000fwtext = N("The HP LaserJet 1000 needs its firmware to be uploaded after being turned on. Download the Windows driver package from the HP web site (the firmware on the printer's CD does not work) and extract the firmware file from it by uncompresing the self-extracting '.exe' file with the 'unzip' utility and searching for the 'sihp1000.img' file. Copy this file into the '/etc/printer' directory. There it will be found by the automatic uploader script and uploaded whenever the printer is connected and turned on.
 ");
 
+1;
+
 sub config_cups {
     my ($printer, $in, $upNetwork) = @_;
 
@@ -888,7 +893,7 @@ Congratulations, your printer is now installed and configured!
 
 You can print using the \"Print\" command of your application (usually in the \"File\" menu).
 
-If you want to add, remove, or rename a printer, or if you want to change the default option settings (paper input tray, printout quality, ...), select \"Printer\" in the \"Hardware\" section of the Mandrake Control Center."))
+If you want to add, remove, or rename a printer, or if you want to change the default option settings (paper input tray, printout quality, ...), select \"Printer\" in the \"Hardware\" section of the %s Control Center.", $shortdistroname))
     }
 }
 
@@ -3349,7 +3354,7 @@ sub check_network {
     if (!start_network($in, $upNetwork) && !$dontconfigure) {
 	$in->ask_warn(N("Configuration of a remote printer"), 
 ($::isInstall ?
-N("The network configuration done during the installation cannot be started now. Please check whether the network is accessable after booting your system and correct the configuration using the Mandrake Control Center, section \"Network & Internet\"/\"Connection\", and afterwards set up the printer, also using the Mandrake Control Center, section \"Hardware\"/\"Printer\"") :
+N("The network configuration done during the installation cannot be started now. Please check whether the network is accessable after booting your system and correct the configuration using the %s Control Center, section \"Network & Internet\"/\"Connection\", and afterwards set up the printer, also using the %s Control Center, section \"Hardware\"/\"Printer\"", $shortdistroname, $shortdistroname) :
 N("The network access was not running and could not be started. Please check your configuration and your hardware. Then try to configure your remote printer again.")));
 	return 0;
     }
diff --git a/perl-install/scanner.pm b/perl-install/scanner.pm
index 018ed3fb8..c73057d91 100755
--- a/perl-install/scanner.pm
+++ b/perl-install/scanner.pm
@@ -1,7 +1,8 @@
 package scanner;
 # scanner.pm $Id$
 # Yves Duret <yduret at mandrakesoft.com>
-# Copyright (C) 2001-2002 MandrakeSoft
+# Till Kamppeter <till at mandrakesoft.com>
+# Copyright (C) 2001-2004 MandrakeSoft
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index 2648e8d46..43fc52c7e 100755
--- a/perl-install/standalone/printerdrake
+++ b/perl-install/standalone/printerdrake
@@ -38,6 +38,10 @@ use Gtk2::Gdk::Keysyms;
 use modules;
 use c;
 
+my $companyname = "MandrakeSoft";
+my $distroname = "Mandrake Linux";
+my $domainname = "mandrakesoft.com";
+
 my $pixdir = '/usr/share/libDrakX/pixmaps/';
 
 local $_ = join '', @ARGV;
@@ -123,7 +127,7 @@ my $stringsearch = '';
 
 sub HelpSystem() { exec("drakhelp --id printerdrake") unless fork() };
 
-$us->{wnd} = ugtk2->new(N("Mandrake Linux Printer Management Tool") . " " . $us->{VERSION});
+$us->{wnd} = ugtk2->new(N("%s Printer Management Tool", $distroname) . " " . $us->{VERSION});
 gtkset_size_request($us->{wnd}{rwindow}, 660, 460);
 
 if (!$::isEmbedded) {
@@ -167,7 +171,7 @@ my ($menu, $factory) = create_factory_menu($::isEmbedded ? $::Plug : $us->{wnd}{
                                               }, undef, '<CheckItem>' ],
                                             [ N("/_Help"), undef, undef, undef, '<Branch>' ],
                                             [ N("/_Help").N("/_Help"), undef, sub { HelpSystem() }, undef, '<StockItem>', 'gtk-help' ],
-                                            [ N("/_Help").N("/_Report Bug"), undef, sub { system("$ENV{BROWSER} https://qa.mandrakesoft.com &") }, undef, '<StockItem>', 'gtk-stop' ],
+                                            [ N("/_Help").N("/_Report Bug"), undef, sub { system("$ENV{BROWSER} https://qa.$domainname &") }, undef, '<StockItem>', 'gtk-stop' ],
                                             [ N("/_Help").N("/_About..."), undef, \&About, undef, '<StockItem>', 'gtk-preferences' ]
 					   )
 					  );
@@ -515,7 +519,7 @@ sub About() {
     $list->can_focus(0);
     each_index { $list->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => $::i)) } 0..2;
     $list->set_headers_visible(0);
-    foreach my $row ([ N("Authors: "), '', '' ], [ '', 'Till Kamppeter', '<till@mandrakesoft.com>' ], ['', '', '']) {
+    foreach my $row ([ N("Authors: "), '', '' ], [ '', 'Till Kamppeter', "<till\@$domainname>" ], ['', '', '']) {
         $tree_model->append_set(undef, [ map_index { $::i => $_ } @$row ]);
     }
     $list->get_selection->set_mode('none');
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) {