switch from MandrakeSoft to Mandriva

9 files changed, 12 insertions, 12 deletions

diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 58ad9f2bf..abd178f31 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -92,7 +92,7 @@ my $desktop_combo = Gtk2::ComboBox->new_with_strings(\@sessions, if_(member($aut
 
 my %themes = 	('path' => '/usr/share/bootsplash/themes/',
    	        'sysconfig' => '/etc/sysconfig/bootsplash',
-                'default' => 'Mandrakelinux',
+                'default' => 'Mandrivalinux',
                 'def_thmb' => '/usr/share/libDrakX/pixmaps/nosplash_thumb.png',
                 'lilo' => {'file' => '/lilo/message',
                            'thumb' => '/lilo/thumb.png' },
diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug
index 6aaa333e2..69dd95f24 100755
--- a/perl-install/standalone/drakbug
+++ b/perl-install/standalone/drakbug
@@ -38,17 +38,17 @@ foreach (@ARGV) {
     /^--incident$/ && shift @ARGV and do { $incident = 1; $prog = shift @ARGV };
 }
 
-my $window = ugtk2->new(N("Mandrakelinux Bug Report Tool"), center => 1);
+my $window = ugtk2->new(N("Mandrivalinux Bug Report Tool"), center => 1);
 $window->{rwindow}->set_border_width(5);
 $window->{window}->signal_connect("delete_event", sub { ugtk2->exit(0) });
 
 my $mdk_app = { 
-	       N("Mandrakelinux Control Center") => 'drakconf',
+	       N("Mandrivalinux Control Center") => 'drakconf',
 	       N("First Time Wizard") => 'drakfw',
 	       N("Synchronization tool") => 'draksync',  
 	       N("Standalone Tools") => ['adduserdrake', 'diskdrake', 'drakautoinst', 'drakbackup', 'drakboot', 'DrakBug', 'DrakClock', 'DrakConnect', 'drakfloppy', 'drakfirewall', 'drakfont', 'drakgw', 'DrakSec', 'draksplash', 'drakvpn', 'drakxservices', 'drakxtools', 'drakxtv', 'keyboardrake', 'logdrake', 'mousedrake', 'net_monitor', 'printerdrake', 'scannerdrake', 'XFdrake'],
 	       N("HardDrake") => 'harddrake2',
-	       N("Mandrakeonline") => 'mdkonline',
+	       N("Mandriva Online") => 'mdkonline',
 	       N("Menudrake") => 'menudrake',
 	       N("Msec") => 'msec',
 	       N("Remote Control") => 'rfbdrake',
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index e7b1a0599..2a2337733 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -951,7 +951,7 @@ Configure them first by clicking on 'Configure'")));
                                               update();
                                           });
 	} else {
-	    $widget_temp = N("This interface has not been configured yet.\nRun the \"Add an interface\" assistant from the Mandrakelinux Control Center");
+	    $widget_temp = N("This interface has not been configured yet.\nRun the \"Add an interface\" assistant from the Mandrivalinux Control Center");
 	}
 	$vbox_local->pack_start(gtkpack__(Gtk2::HBox->new(0,0),
 					  $widget_temp
@@ -1007,7 +1007,7 @@ sub configure_net {
                     N("Warning"),
                     #-PO: here "Add Connection" should be translated the same was as in control-center
                     N("You do not have any configured Internet connection.
-Run the \"%s\" assistant from the Mandrakelinux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)")));
+Run the \"%s\" assistant from the Mandrivalinux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)")));
         $in->exit;
     }
     my $cnx = {};
diff --git a/perl-install/standalone/drakedm b/perl-install/standalone/drakedm
index 65c0efee1..5ba4894c7 100644
--- a/perl-install/standalone/drakedm
+++ b/perl-install/standalone/drakedm
@@ -33,7 +33,7 @@ my $cfg_file = '/etc/sysconfig/desktop';
 
 my %dm = ('GNOME' => [ N("GDM (GNOME Display Manager)"), '/usr/bin/gdm', 'gdm' ],
           'KDM'   => [ N("KDM (KDE Display Manager)"), '/usr/bin/kdm', 'kdebase-kdm' ],
-          'KDE'   => [ N("MdkKDM (Mandrakelinux Display Manager)"), '/usr/bin/mdkkdm', 'mdkkdm' ],
+          'KDE'   => [ N("MdkKDM (Mandrivalinux Display Manager)"), '/usr/bin/mdkkdm', 'mdkkdm' ],
           'XDM'   => [ N("XDM (X Display Manager)"), '/usr/bin/X11/xdm', 'xorg-x11' ],
           );
 
diff --git a/perl-install/standalone/drakhelp b/perl-install/standalone/drakhelp
index d7b6ff6ed..303c06d9a 100644
--- a/perl-install/standalone/drakhelp
+++ b/perl-install/standalone/drakhelp
@@ -33,6 +33,6 @@ my $in = interactive->vnew;
 my ($instpath, $ancpath, $package) = ctxhelp::path2help($opt, $idlabel);
 
 -e $instpath or system("/usr/sbin/drakhelp_inst $package");
--e $instpath or $in->ask_warn(N("Mandrakelinux Help Center"), N("%s cannot be displayed \n. No Help entry of this type\n", $instpath));
+-e $instpath or $in->ask_warn(N("Mandrivalinux Help Center"), N("%s cannot be displayed \n. No Help entry of this type\n", $instpath));
 
 system("/usr/bin/www-browser $ancpath &") if -e $instpath;
diff --git a/perl-install/standalone/finish-install.xsetup b/perl-install/standalone/finish-install.xsetup
index f08bc02d1..cbe08788d 100755
--- a/perl-install/standalone/finish-install.xsetup
+++ b/perl-install/standalone/finish-install.xsetup
@@ -1,5 +1,5 @@
 #!/bin/sh
-# (c) 2004 Mandrakesoft SA
+# (c) 2004 Mandriva SA
 
 # to be sourced
 if [ -f /etc/sysconfig/finish-install -a -x /usr/sbin/finish-install ]; then
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index 7db12b26c..339509723 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -47,7 +47,7 @@ $| = 1 if $isTail;
 my $h = chomp_(`hostname -s`);
 
 $ugtk2::wm_icon = "logdrake";
-my $explain_title = N("Mandrakelinux Tools Logs");
+my $explain_title = N("Mandrivalinux Tools Logs");
 my $my_win = ugtk2->new($isExplain ? $explain_title : N("Logdrake"));
 
 unless ($::isEmbedded) {
diff --git a/perl-install/standalone/net_applet b/perl-install/standalone/net_applet
index 316f2cf86..c7e5d581a 100644
--- a/perl-install/standalone/net_applet
+++ b/perl-install/standalone/net_applet
@@ -59,7 +59,7 @@ my %appletstate = (
 			  menu => [ 'confNetwork', 'refresh', 'help' ],
 			  tt => [
                                  N_("You do not have any configured Internet connection.
-Run the \"%s\" assistant from the Mandrakelinux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)"))
+Run the \"%s\" assistant from the Mandrivalinux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)"))
                                 ]
 			  }
 	    );
diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor
index 608223375..78e7eab4f 100755
--- a/perl-install/standalone/net_monitor
+++ b/perl-install/standalone/net_monitor
@@ -233,7 +233,7 @@ sub connection() {
 									  N("Disconnection from Internet complete.")) :
 						     ($isconnected ?
 						       N("Connection complete.") :
-						       N("Connection failed.\nVerify your configuration in the Mandrakelinux Control Center."))
+						       N("Connection failed.\nVerify your configuration in the Mandrivalinux Control Center."))
 						    );
  				            # remove the connection time timer if connection is down or failed
  				            $isconnected or Glib::Source->remove($ct_tag);