Removed occurences of "Mandrake" from translateable strings.

2 files changed, 17 insertions, 7 deletions

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) {