switch from MandrakeSoft to Mandriva in copyright notices

30 files changed, 33 insertions, 33 deletions

diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 3662fd824..1de6f79dc 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -617,7 +617,7 @@ C<mouse> is a perl module used by mousedrake to detect and configure the mouse.
 
 =head1 COPYRIGHT
 
-Copyright (C) 2000-2002 Mandrakesoft <tvignaud@mandrakesoft.com>
+Copyright (C) 2000-2002 Mandriva <tvignaud@mandrakesoft.com>
 
 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/scanner.pm b/perl-install/scanner.pm
index 17b2eae75..c4ed66587 100755
--- a/perl-install/scanner.pm
+++ b/perl-install/scanner.pm
@@ -2,7 +2,7 @@ package scanner;
 # scanner.pm $Id$
 # Yves Duret <yduret at mandrakesoft.com>
 # Till Kamppeter <till at mandrakesoft.com>
-# Copyright (C) 2001-2004 Mandrakesoft
+# Copyright (C) 2001-2004 Mandriva
 #
 # 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.pm b/perl-install/standalone.pm
index 03babd9b2..64734b0d1 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -134,7 +134,7 @@ sub __exit {
 
 sub version() {
     print 'Drakxtools version 10
-Copyright (C) 1999-2004 Mandrakesoft by <install@mandrakesoft.com>
+Copyright (C) 1999-2004 Mandriva by <install@mandrakesoft.com>
 ',  $::license, "\n";
 }
 
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 65079bd7c..76034b427 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # XFdrake
-# Copyright (C) 1999-2004 Mandrakesoft (pixel@mandrakesoft.com)
+# Copyright (C) 1999-2004 Mandriva (pixel@mandrakesoft.com)
 #
 # 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/autosetupprintqueues b/perl-install/standalone/autosetupprintqueues
index 85a688af5..c5af80f6d 100755
--- a/perl-install/standalone/autosetupprintqueues
+++ b/perl-install/standalone/autosetupprintqueues
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2003-2004 Mandrakesoft
+# Copyright (C) 2003-2004 Mandriva
 #
 # Till Kamppeter <till@mandrakesoft.com>
 #
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index 8d9854a9f..6c4d11f46 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # DiskDrake
-# Copyright (C) 1999-2004 Mandrakesoft (pixel@mandrakesoft.com)
+# Copyright (C) 1999-2004 Mandriva (pixel@mandrakesoft.com)
 #
 # 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/drakTermServ b/perl-install/standalone/drakTermServ
index f344d5dbe..a6138fff6 100755
--- a/perl-install/standalone/drakTermServ
+++ b/perl-install/standalone/drakTermServ
@@ -1,6 +1,6 @@
 #!/usr/bin/perl 
 #
-# Copyright (C) 2002-2004 by Mandrakesoft (sbenedict@mandrakesoft.com)
+# Copyright (C) 2002-2004 by Mandriva (sbenedict@mandrakesoft.com)
 #
 # 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/drakautoinst b/perl-install/standalone/drakautoinst
index 4fa2450ad..db6f20a12 100755
--- a/perl-install/standalone/drakautoinst
+++ b/perl-install/standalone/drakautoinst
@@ -3,7 +3,7 @@
 #
 # Guillaume Cottenceau (gc@mandrakesoft.com)
 #
-# Copyright 2001-2004 Mandrakesoft
+# Copyright 2001-2004 Mandriva
 #
 # This software may be freely redistributed under the terms of the GNU
 # public license.
diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup
index 451e3727c..bacad4d64 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-#  Copyright (C) 2001-2004 Mandrakesoft by Sebastien DUPONT <dupont_s@epita.fr>
+#  Copyright (C) 2001-2004 Mandriva by Sebastien DUPONT <dupont_s@epita.fr>
 #  Updated 2002-2004 by Stew Benedict <sbenedict@mandrakesoft.com>
 #  Redistribution of this file is permitted under the terms of the GNU
 #  Public License (GPL)
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 02486a772..58ad9f2bf 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -2,7 +2,7 @@
 
 # DrakBoot
 # $Id$
-# Copyright (C) 2001-2004 Mandrakesoft
+# Copyright (C) 2001-2004 Mandriva
 # Yves Duret, Thierry Vignaud
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug
index 7bd4ac651..6aaa333e2 100755
--- a/perl-install/standalone/drakbug
+++ b/perl-install/standalone/drakbug
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # Drak Bug Report 
-# Copyright (C) 2002-2004 Mandrakesoft (daouda at mandrakesoft dot com)
+# Copyright (C) 2002-2004 Mandriva (daouda at mandrakesoft dot com)
 #                                       Stew Benedict (sbenedict at mandrakesoft dot com) 
 #
 # This program is free software; you can redistribute it and/or modify
@@ -78,7 +78,7 @@ $bugzilla = 'http://qa.mandrakesoft.com/enter_bug.cgi';
 $wizard_name = "Bugzilla";
 
 $table = create_packtable({ col_spacings => 5, row_spacings => 10 },
-		          [ Gtk2::Label->new(N("Select Mandrakesoft Tool:")), $comb_app = Gtk2::ComboBox->new_text ],
+		          [ Gtk2::Label->new(N("Select Mandriva Tool:")), $comb_app = Gtk2::ComboBox->new_text ],
                           [ Gtk2::Label->new(N("or Application Name\n(or Full Path):")), 
 			  gtkpack_(Gtk2::HBox->new(0,5),
 				   1, $com_app = gtkset_editable(Gtk2::Entry->new, 1), 
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 16558c6ae..e7b1a0599 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -2,7 +2,7 @@
 
 # DrakConnect $Id$
 
-# Copyright (C) 1999-2004 Mandrakesoft
+# Copyright (C) 1999-2004 Mandriva
 #                         Damien "Dam's" Krotkine
 #                         Damien "poulpy" Chaumette
 #                         Thierry Vignaud <tvignaud@mandrakesoft.com>
diff --git a/perl-install/standalone/drakedm b/perl-install/standalone/drakedm
index b5fb82ae4..65c0efee1 100644
--- a/perl-install/standalone/drakedm
+++ b/perl-install/standalone/drakedm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # DrakxDM -- Display Manager chooser
-# Copyright (C) 2003-2004 Mandrakesoft (tvignaud@mandrakesoft.com)
+# Copyright (C) 2003-2004 Mandriva (tvignaud@mandrakesoft.com)
 #
 # 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/drakfirewall b/perl-install/standalone/drakfirewall
index afd5abd13..fac2782c3 100755
--- a/perl-install/standalone/drakfirewall
+++ b/perl-install/standalone/drakfirewall
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 1999-2004 Mandrakesoft (pixel@mandrakesoft.com)
+# Copyright (C) 1999-2004 Mandriva (pixel@mandrakesoft.com)
 #
 # 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/drakfloppy b/perl-install/standalone/drakfloppy
index 16e86cad7..5f976cc7a 100755
--- a/perl-install/standalone/drakfloppy
+++ b/perl-install/standalone/drakfloppy
@@ -3,7 +3,7 @@
 # DrakFloppy
 # $Id$
 # 
-# Copyright (C) 2001-2004 Mandrakesoft
+# Copyright (C) 2001-2004 Mandriva
 # Yves Duret
 # Thierry Vignaud
 #
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 26c514bf0..9e8a93148 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -1,6 +1,6 @@
 #!/usr/bin/perl 
 #
-# Copyright (C) 2001-2004 by Mandrakesoft
+# Copyright (C) 2001-2004 by Mandriva
 #                            DUPONT Sebastien
 #                            Damien Chaumette <dchaumette@mandrakesoft.com>
 #
@@ -508,7 +508,7 @@ $list_all_font_path || $xlsfonts || $windows || @install || @uninstall ? backend
 sub help() {
     ugtk2::create_dialog(N("Help"), formatAlaTeX(
                                                  #-PO: keep the double empty lines between sections, this is formatted a la LaTeX
-                                                 N("Copyright (C) 2001-2002 by Mandrakesoft 
+                                                 N("Copyright (C) 2001-2002 by Mandriva 
 
 
        DUPONT Sebastien (original version)
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index 7f23e964c..16ada5a86 100755
--- a/perl-install/standalone/drakgw
+++ b/perl-install/standalone/drakgw
@@ -4,7 +4,7 @@
 # author Guillaume Cottenceau (gc@mandrakesoft.com)
 # modified by Florin Grad (florin@mandrakesoft.com)
 #
-# Copyright 2000-2004 Mandrakesoft
+# Copyright 2000-2004 Mandriva
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2, as
diff --git a/perl-install/standalone/drakhelp b/perl-install/standalone/drakhelp
index af03bc582..d7b6ff6ed 100644
--- a/perl-install/standalone/drakhelp
+++ b/perl-install/standalone/drakhelp
@@ -15,7 +15,7 @@ use log;
 
 sub usage() {
     print STDERR N(" drakhelp 0.1
-Copyright (C) 2003-2004 Mandrakesoft.
+Copyright (C) 2003-2004 Mandriva.
 This is free software and may be redistributed under the terms of the GNU GPL.
 
 Usage: 
diff --git a/perl-install/standalone/drakproxy b/perl-install/standalone/drakproxy
index 622c61859..7decd0792 100755
--- a/perl-install/standalone/drakproxy
+++ b/perl-install/standalone/drakproxy
@@ -2,7 +2,7 @@
 
 # DrakProxy
 
-# Copyright (C) 1999-2004 Mandrakesoft (damien@mandrakesoft.com)
+# Copyright (C) 1999-2004 Mandriva (damien@mandrakesoft.com)
 #
 # 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/drakpxe b/perl-install/standalone/drakpxe
index d6e37c1ed..0ef2ebc5c 100755
--- a/perl-install/standalone/drakpxe
+++ b/perl-install/standalone/drakpxe
@@ -2,7 +2,7 @@
 #
 # Fran,cois Pons <fpons@mandrakesoft.com>
 #
-# Copyright 2003-2004 Mandrakesoft
+# Copyright 2003-2004 Mandriva
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2, as
diff --git a/perl-install/standalone/draksound b/perl-install/standalone/draksound
index da018d17a..40c35d978 100755
--- a/perl-install/standalone/draksound
+++ b/perl-install/standalone/draksound
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # DrakxSound
-# Copyright (C) 2002-2004 Mandrakesoft (tvignaud@mandrakesoft.com)
+# Copyright (C) 2002-2004 Mandriva (tvignaud@mandrakesoft.com)
 #
 # 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/drakupdate_fstab b/perl-install/standalone/drakupdate_fstab
index 83951d46a..8082ba031 100755
--- a/perl-install/standalone/drakupdate_fstab
+++ b/perl-install/standalone/drakupdate_fstab
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # drakupdate_fstab
-# Copyright (C) 2002-2004 Mandrakesoft (pixel@mandrakesoft.com)
+# Copyright (C) 2002-2004 Mandriva (pixel@mandrakesoft.com)
 #
 # 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/drakvpn b/perl-install/standalone/drakvpn
index a43411055..3dc499836 100644
--- a/perl-install/standalone/drakvpn
+++ b/perl-install/standalone/drakvpn
@@ -3,7 +3,7 @@
 #
 # author Florin Grad (florin@mandrakesoft.com)
 #
-# Copyright 2004 Mandrakesoft
+# Copyright 2004 Mandriva
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2, as
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv
index 2a7b5a33c..20434ff35 100755
--- a/perl-install/standalone/drakxtv
+++ b/perl-install/standalone/drakxtv
@@ -2,7 +2,7 @@
 # DrakxTV
 # $Id$
 
-# Copyright (C) 2002-2004 Mandrakesoft (tvignaud@mandrakesoft.com)
+# Copyright (C) 2002-2004 Mandriva (tvignaud@mandrakesoft.com)
 #
 # 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/fileshareset b/perl-install/standalone/fileshareset
index 4ca41efac..0b55e1c30 100755
--- a/perl-install/standalone/fileshareset
+++ b/perl-install/standalone/fileshareset
@@ -12,7 +12,7 @@ my $authorisation_group = 'fileshare';
 
 ########################################
 # fileshare utility $Id$
-# Copyright (C) 2001-2004 Mandrakesoft (pixel@mandrakesoft.com)
+# Copyright (C) 2001-2004 Mandriva (pixel@mandrakesoft.com)
 #
 # 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/listsupportedprinters b/perl-install/standalone/listsupportedprinters
index efd334409..1902e7afa 100755
--- a/perl-install/standalone/listsupportedprinters
+++ b/perl-install/standalone/listsupportedprinters
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2003-2004 Mandrakesoft
+# Copyright (C) 2003-2004 Mandriva
 #
 # Till Kamppeter <till@mandrakesoft.com>
 #
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index fa39fae49..7db12b26c 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 # $Id$
 
-# Copyright (C) 2001-2004 Mandrakesoft
+# Copyright (C) 2001-2004 Mandriva
 # Yves Duret <yduret at mandrakesoft.com>
 # some code is Copyright: (C) 1999, Michael T. Babcock <mikebabcock@pobox.com>
 #
diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor
index aee34fc5e..608223375 100755
--- a/perl-install/standalone/net_monitor
+++ b/perl-install/standalone/net_monitor
@@ -2,7 +2,7 @@
 
 # NetMonitor
 
-# Copyright (C) 1999-2004 Mandrakesoft
+# Copyright (C) 1999-2004 Mandriva
 # Damien "Dam's" Krotkine
 # Thierry Vignaud <tvignaud@mandrakesoft.com>
 #
diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index 37a765f06..cb2f51789 100755
--- a/perl-install/standalone/printerdrake
+++ b/perl-install/standalone/printerdrake
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2003-2004 Mandrakesoft
+# Copyright (C) 2003-2004 Mandriva
 #
 # Till Kamppeter <till@mandrakesoft.com>
 # Daouda Lo <daouda@mandrakesoft.com>
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index 47fef59f8..7e6f9a125 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -3,7 +3,7 @@
 # scannerdrake $Id$
 # Yves Duret <yduret at mandrakesoft.com>
 # Till Kamppeter <till at mandrakesoft.com>
-# Copyright (C) 2001-2004 Mandrakesoft
+# Copyright (C) 2001-2004 Mandriva
 # 
 # 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
@@ -29,7 +29,7 @@ use scanner;
 use handle_configs;
 use services;
 
-my $companyname = "Mandrakesoft";
+my $companyname = "Mandriva";
 my $distroname = "Mandrakelinux";
 my $shortdistroname = "Mandrakelinux";
 my $domainname = "mandrakesoft.com";