switch from MandrakeSoft to Mandriva

4 files changed, 5 insertions, 5 deletions

diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index e521443b9..fc7d7d95e 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -379,7 +379,7 @@ METRIC=$metric
         $modules_conf->set_alias($_->[0], $_->[1]) foreach @{$modems{$adsl_device}{aliases}};
         $::isStandalone and $modules_conf->write;
     }
-    #- remove the "speedtch off" alias that was written by Mandrakelinux 10.0
+    #- remove the "speedtch off" alias that was written by Mandrivalinux 10.0
     $adsl_device eq 'speedtouch' and $modules_conf->remove_alias('speedtch');
 
     if ($adsl_type eq "capi") {
diff --git a/perl-install/network/drakfirewall.pm b/perl-install/network/drakfirewall.pm
index 7b36d4de0..6f5ec9183 100644
--- a/perl-install/network/drakfirewall.pm
+++ b/perl-install/network/drakfirewall.pm
@@ -157,7 +157,7 @@ sub get_conf {
     } else {
 	$in->ask_okcancel('', N("drakfirewall configurator
 
-This configures a personal firewall for this Mandrakelinux machine.
+This configures a personal firewall for this Mandrivalinux machine.
 For a powerful and dedicated firewall solution, please look to the
 specialized MandrakeSecurity Firewall distribution."), 1) or return;
 
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 0d353fd7d..a37db2e8a 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -1371,7 +1371,7 @@ It is not necessary on most networks."),
 
                    multiple_internet_cnx =>
                    {
-                    name => N("You have configured multiple ways to connect to the Internet.\nChoose the one you want to use.\n\n") . if_(!$::isStandalone, "You may want to configure some profiles after the installation, in the Mandrake Control Center"),
+                    name => N("You have configured multiple ways to connect to the Internet.\nChoose the one you want to use.\n\n") . if_(!$::isStandalone, "You may want to configure some profiles after the installation, in the Mandriva Control Center"),
                     data => sub {
                         [ { label => N("Internet connection"), val => \$netc->{internet_cnx_choice},
                             list => [ keys %{$netc->{internet_cnx}} ] } ];
diff --git a/perl-install/network/test.pm b/perl-install/network/test.pm
index cc043b19c..e442d61cb 100644
--- a/perl-install/network/test.pm
+++ b/perl-install/network/test.pm
@@ -111,7 +111,7 @@ sub update_status {
 
 =head2 Test synchronously
 
-#- resolve and get ping to hostname from command line if given, else to Mandrakesoft
+#- resolve and get ping to hostname from command line if given, else to Mandriva
 use lib qw(/usr/lib/libDrakX);
 use network::test;
 
@@ -131,7 +131,7 @@ ping to host: $ping
 
 =head2 Test asynchronously
 
-#- resolve and get ping to hostname from command line if given, else to Mandrakesoft
+#- resolve and get ping to hostname from command line if given, else to Mandriva
 #- prints a "." every 10 miliseconds during connection test
 use lib qw(/usr/lib/libDrakX);
 use network::test;