summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-20 02:42:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-20 02:42:12 +0000
commit94dd872cad528c27940c746ad75391fd099aa845 (patch)
treee66ce0a29f1fe3d2c2819aabf15e03e3dfda2049 /perl-install
parentd4507ac423186648d652acb76c2fe46091963774 (diff)
downloaddrakx-94dd872cad528c27940c746ad75391fd099aa845.tar
drakx-94dd872cad528c27940c746ad75391fd099aa845.tar.gz
drakx-94dd872cad528c27940c746ad75391fd099aa845.tar.bz2
drakx-94dd872cad528c27940c746ad75391fd099aa845.tar.xz
drakx-94dd872cad528c27940c746ad75391fd099aa845.zip
MandrakeSoft -> Mandrakesoft
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/diskdrake/diskdrake.html2
-rwxr-xr-xperl-install/install22
-rw-r--r--perl-install/install_messages.pm20
-rw-r--r--perl-install/mouse.pm2
-rwxr-xr-xperl-install/scanner.pm2
-rw-r--r--perl-install/share/advertising/dis-01.pl2
-rw-r--r--perl-install/share/advertising/dis-09.pl2
-rw-r--r--perl-install/share/advertising/dwd-01.pl2
-rw-r--r--perl-install/share/advertising/dwd-06.pl2
-rw-r--r--perl-install/share/advertising/ppp-01.pl2
-rw-r--r--perl-install/share/advertising/ppp-09.pl2
-rw-r--r--perl-install/share/advertising/pwp-01.pl2
-rw-r--r--perl-install/share/advertising/pwp-02.pl2
-rw-r--r--perl-install/share/advertising/pwp-08.pl2
-rw-r--r--perl-install/share/compssUsers.server2
-rw-r--r--perl-install/standalone.pm2
-rwxr-xr-xperl-install/standalone/XFdrake2
-rwxr-xr-xperl-install/standalone/diskdrake2
-rwxr-xr-xperl-install/standalone/drakTermServ2
-rwxr-xr-xperl-install/standalone/drakautoinst2
-rwxr-xr-xperl-install/standalone/drakbackup2
-rwxr-xr-xperl-install/standalone/drakboot2
-rwxr-xr-xperl-install/standalone/drakbug2
-rwxr-xr-xperl-install/standalone/drakconnect2
-rw-r--r--perl-install/standalone/drakedm2
-rwxr-xr-xperl-install/standalone/drakfirewall2
-rwxr-xr-xperl-install/standalone/drakfloppy2
-rwxr-xr-xperl-install/standalone/drakfont4
-rwxr-xr-xperl-install/standalone/drakgw2
-rw-r--r--perl-install/standalone/drakhelp2
-rwxr-xr-xperl-install/standalone/drakproxy2
-rwxr-xr-xperl-install/standalone/drakpxe2
-rwxr-xr-xperl-install/standalone/draksound2
-rwxr-xr-xperl-install/standalone/drakupdate_fstab2
-rw-r--r--perl-install/standalone/drakvpn2
-rwxr-xr-xperl-install/standalone/drakxtv2
-rwxr-xr-xperl-install/standalone/fileshareset2
-rwxr-xr-xperl-install/standalone/logdrake2
-rwxr-xr-xperl-install/standalone/net_monitor2
-rwxr-xr-xperl-install/standalone/printerdrake2
-rwxr-xr-xperl-install/standalone/scannerdrake2
41 files changed, 51 insertions, 51 deletions
diff --git a/perl-install/diskdrake/diskdrake.html b/perl-install/diskdrake/diskdrake.html
index 7e85c3cde..cba732084 100644
--- a/perl-install/diskdrake/diskdrake.html
+++ b/perl-install/diskdrake/diskdrake.html
@@ -25,7 +25,7 @@
It's written entirely in Perl and Perl/Gtk. It uses resize_fat which is
a perl rewrite of the work of Andrew Clausen (libresize).
<P>
- DiskDrake is a project from MandrakeSoft, the company behind the popular
+ DiskDrake is a project from Mandrakesoft, the company behind the popular
<a href="http://www.linux-mandrake.com">Linux-Mandrake</a>
operating-system.
<P>
diff --git a/perl-install/install2 b/perl-install/install2
index b26684f9f..ff857c579 100755
--- a/perl-install/install2
+++ b/perl-install/install2
@@ -2,7 +2,7 @@
#- PERL_INSTALL_DEBUG is used to launch stage2 in debug mode
#- Mandrake Graphic Install $Id$
-#- Copyright (C) 1999/2000 MandrakeSoft (pixel@mandrakesoft.com)
+#- Copyright (C) 1999/2000 Mandrakesoft (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/install_messages.pm b/perl-install/install_messages.pm
index e668c0ff5..e8f527043 100644
--- a/perl-install/install_messages.pm
+++ b/perl-install/install_messages.pm
@@ -17,7 +17,7 @@ system and the different components of the Mandrakelinux distribution.
1. License Agreement
Please read this document carefully. This document is a license agreement between you and
-MandrakeSoft S.A. which applies to the Software Products.
+Mandrakesoft S.A. which applies to the Software Products.
By installing, duplicating or using the Software Products in any manner, you explicitly
accept and fully agree to conform to the terms and conditions of this License.
If you disagree with any portion of the License, you are not allowed to install, duplicate or use
@@ -32,16 +32,16 @@ Software Products.
The Software Products and attached documentation are provided \"as is\", with no warranty, to the
extent permitted by law.
-MandrakeSoft S.A. will, in no circumstances and to the extent permitted by law, be liable for any special,
+Mandrakesoft S.A. will, in no circumstances and to the extent permitted by law, be liable for any special,
incidental, direct or indirect damages whatsoever (including without limitation damages for loss of
business, interruption of business, financial loss, legal fees and penalties resulting from a court
judgment, or any other consequential loss) arising out of the use or inability to use the Software
-Products, even if MandrakeSoft S.A. has been advised of the possibility or occurence of such
+Products, even if Mandrakesoft S.A. has been advised of the possibility or occurence of such
damages.
LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME COUNTRIES
-To the extent permitted by law, MandrakeSoft S.A. or its distributors will, in no circumstances, be
+To the extent permitted by law, Mandrakesoft S.A. or its distributors will, in no circumstances, be
liable for any special, incidental, direct or indirect damages whatsoever (including without
limitation damages for loss of business, interruption of business, financial loss, legal fees
and penalties resulting from a court judgment, or any other consequential loss) arising out
@@ -58,9 +58,9 @@ of these components are governed under the terms and conditions of the GNU Gener
Licence, hereafter called \"GPL\", or of similar licenses. Most of these licenses allow you to use,
duplicate, adapt or redistribute the components which they cover. Please read carefully the terms
and conditions of the license agreement for each component before using any component. Any question
-on a component license should be addressed to the component author and not to MandrakeSoft.
-The programs developed by MandrakeSoft S.A. are governed by the GPL License. Documentation written
-by MandrakeSoft S.A. is governed by a specific license. Please refer to the documentation for
+on a component license should be addressed to the component author and not to Mandrakesoft.
+The programs developed by Mandrakesoft S.A. are governed by the GPL License. Documentation written
+by Mandrakesoft S.A. is governed by a specific license. Please refer to the documentation for
further details.
@@ -68,9 +68,9 @@ further details.
All rights to the components of the Software Products belong to their respective authors and are
protected by intellectual property and copyright laws applicable to software programs.
-MandrakeSoft S.A. reserves its rights to modify or adapt the Software Products, as a whole or in
+Mandrakesoft S.A. reserves its rights to modify or adapt the Software Products, as a whole or in
parts, by all means and for all purposes.
-\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of MandrakeSoft S.A.
+\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of Mandrakesoft S.A.
5. Governing Laws
@@ -81,7 +81,7 @@ agreement.
The terms and conditions of this License are governed by the Laws of France.
All disputes on the terms of this license will preferably be settled out of court. As a last
resort, the dispute will be referred to the appropriate Courts of Law of Paris - France.
-For any question on this document, please contact MandrakeSoft S.A.
+For any question on this document, please contact Mandrakesoft S.A.
");
}
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 1cbdceb75..ec76d388c 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -576,7 +576,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 Mandrakesoft <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 819ae84e2..bfb745d77 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 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/share/advertising/dis-01.pl b/perl-install/share/advertising/dis-01.pl
index 522b9bf77..03b338983 100644
--- a/perl-install/share/advertising/dis-01.pl
+++ b/perl-install/share/advertising/dis-01.pl
@@ -14,6 +14,6 @@ $border = 10; #- for leftish text
' ',
N("Welcome to the Open Source world!"),
' ',
- N("Your new Mandrakelinux operating system and its many applications is the result of collaborative efforts between MandrakeSoft developers and Mandrakelinux contributors throughout the world."),
+ N("Your new Mandrakelinux operating system and its many applications is the result of collaborative efforts between Mandrakesoft developers and Mandrakelinux contributors throughout the world."),
' ',
N("We would like to thank everyone who participated in the development of this latest release."));
diff --git a/perl-install/share/advertising/dis-09.pl b/perl-install/share/advertising/dis-09.pl
index 3d258642b..30e4b19bb 100644
--- a/perl-install/share/advertising/dis-09.pl
+++ b/perl-install/share/advertising/dis-09.pl
@@ -12,6 +12,6 @@ $border = 10; #- for leftish text
@text = ([ N("<b>MandrakeStore</b>"), center => 1 ],
' ',
- N("Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our full service e-commerce platform."),
+ N("Find all Mandrakesoft products and services at <b>MandrakeStore</b> -- our full service e-commerce platform."),
' ',
N("Stop by today at <b>www.mandrakestore.com</b>"));
diff --git a/perl-install/share/advertising/dwd-01.pl b/perl-install/share/advertising/dwd-01.pl
index 2ac84ba95..7533d98f1 100644
--- a/perl-install/share/advertising/dwd-01.pl
+++ b/perl-install/share/advertising/dwd-01.pl
@@ -14,6 +14,6 @@ $border = 10; #- for leftish text
' ',
N("Welcome to the Open Source world!"),
' ',
- N("Mandrakelinux is committed to the Open Source Model and fully respects the General Public License. This new release is the result of collaboration between MandrakeSoft's team of developers and the worldwide community of Mandrakelinux contributors."),
+ N("Mandrakelinux is committed to the Open Source Model and fully respects the General Public License. This new release is the result of collaboration between Mandrakesoft's team of developers and the worldwide community of Mandrakelinux contributors."),
' ',
N("We would like to thank everyone who participated in the development of this latest release."));
diff --git a/perl-install/share/advertising/dwd-06.pl b/perl-install/share/advertising/dwd-06.pl
index 2b9dbcdf2..14e1ca4e8 100644
--- a/perl-install/share/advertising/dwd-06.pl
+++ b/perl-install/share/advertising/dwd-06.pl
@@ -12,7 +12,7 @@ $border = 10; #- for leftish text
@text = ([ N("<b>MandrakeStore</b>"), center => 1 ],
' ',
- N("Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-commerce platform."),
+ N("Find all Mandrakesoft products at <b>MandrakeStore</b> -- our full service e-commerce platform."),
' ',
N("Find out also support incidents if you have any problems, from standard to professional support, from 1 to 50 incidents, take the one which meets perfectly your needs!"),
' ',
diff --git a/perl-install/share/advertising/ppp-01.pl b/perl-install/share/advertising/ppp-01.pl
index d7f4cef1f..dbccc8084 100644
--- a/perl-install/share/advertising/ppp-01.pl
+++ b/perl-install/share/advertising/ppp-01.pl
@@ -14,6 +14,6 @@ $border = 10; #- for leftish text
' ',
N("Welcome to the Open Source world!"),
' ',
- N("Your new Mandrakelinux distribution and its many applications are the result of collaborative efforts between MandrakeSoft developers and Mandrakelinux contributors throughout the world."),
+ N("Your new Mandrakelinux distribution and its many applications are the result of collaborative efforts between Mandrakesoft developers and Mandrakelinux contributors throughout the world."),
' ',
N("We would like to thank everyone who participated in the development of this latest release."));
diff --git a/perl-install/share/advertising/ppp-09.pl b/perl-install/share/advertising/ppp-09.pl
index a509d1792..20a9002ef 100644
--- a/perl-install/share/advertising/ppp-09.pl
+++ b/perl-install/share/advertising/ppp-09.pl
@@ -12,6 +12,6 @@ $border = 10; #- for leftish text
@text = ([ N("<b>MandrakeStore</b>"), center => 1 ],
' ',
- N("Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our full service e-commerce platform."),
+ N("Find all Mandrakesoft products and services at <b>MandrakeStore</b> -- our full service e-commerce platform."),
' ',
N("Stop by today at <b>www.mandrakestore.com</b>"));
diff --git a/perl-install/share/advertising/pwp-01.pl b/perl-install/share/advertising/pwp-01.pl
index 1b00b2f38..935689b05 100644
--- a/perl-install/share/advertising/pwp-01.pl
+++ b/perl-install/share/advertising/pwp-01.pl
@@ -14,6 +14,6 @@ $border = 10; #- for leftish text
' ',
N("Welcome to the Open Source world!"),
' ',
- N("Your new Mandrakelinux distribution is the result of collaborative efforts between MandrakeSoft developers and Mandrakelinux contributors throughout the world."),
+ N("Your new Mandrakelinux distribution is the result of collaborative efforts between Mandrakesoft developers and Mandrakelinux contributors throughout the world."),
' ',
N("We would like to thank everyone who participated in the development of our latest release."));
diff --git a/perl-install/share/advertising/pwp-02.pl b/perl-install/share/advertising/pwp-02.pl
index 55a21b907..66fcbef19 100644
--- a/perl-install/share/advertising/pwp-02.pl
+++ b/perl-install/share/advertising/pwp-02.pl
@@ -12,4 +12,4 @@ $border = 10; #- for leftish text
@text = ([ N("<b>PowerPack</b>"), center => 1 ],
' ',
- N("PowerPack is MandrakeSoft's premier Linux desktop product. In addition to being the easiest and the most user-friendly Linux distribution, PowerPack includes thousands of applications - everything from the most popular to the most technical."));
+ N("PowerPack is Mandrakesoft's premier Linux desktop product. In addition to being the easiest and the most user-friendly Linux distribution, PowerPack includes thousands of applications - everything from the most popular to the most technical."));
diff --git a/perl-install/share/advertising/pwp-08.pl b/perl-install/share/advertising/pwp-08.pl
index 02043e533..abbc1c053 100644
--- a/perl-install/share/advertising/pwp-08.pl
+++ b/perl-install/share/advertising/pwp-08.pl
@@ -12,6 +12,6 @@ $border = 10; #- for leftish text
@text = ([ N("<b>MandrakeStore</b>"), center => 1 ],
' ',
- N("Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our full service e-commerce platform."),
+ N("Find all Mandrakesoft products and services at <b>MandrakeStore</b> -- our full service e-commerce platform."),
' ',
N("Stop by today at <b>www.mandrakestore.com</b>"));
diff --git a/perl-install/share/compssUsers.server b/perl-install/share/compssUsers.server
index c60f84080..4dfce0153 100644
--- a/perl-install/share/compssUsers.server
+++ b/perl-install/share/compssUsers.server
@@ -89,5 +89,5 @@ Network Utilities/Monitoring [icon=archiving] [path=Utilities] [selected=server]
MONITORING
NETWORKING_FILE
-MandrakeSoft Wizards [icon=archiving] [path=Utilities] [selected=server] [descr=Wizards to configure servers]
+Mandrakesoft Wizards [icon=archiving] [path=Utilities] [selected=server] [descr=Wizards to configure servers]
WIZARDS
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index f1b76061a..0681d2f2d 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -154,7 +154,7 @@ foreach (@ARGV) {
sub version {
print 'Drakxtools version 10
-Copyright (C) 1999-2004 MandrakeSoft by <install@mandrakesoft.com>
+Copyright (C) 1999-2004 Mandrakesoft by <install@mandrakesoft.com>
', $::license, "\n";
}
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index cbe4bc569..334f18972 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 Mandrakesoft (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/diskdrake b/perl-install/standalone/diskdrake
index a9966f804..f8fbda251 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 Mandrakesoft (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 4a52cefc0..c97193c03 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 Mandrakesoft (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 4512571ca..f54b47323 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 Mandrakesoft
#
# 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 6b6d458dc..67140d644 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 Mandrakesoft 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 75793f5d8..c9e5386f5 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 Mandrakesoft
# 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 7cce5ec9e..9db66a04f 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@mandrakesoft.com)
+# Copyright (C) 2002-2004 Mandrakesoft (daouda@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/drakconnect b/perl-install/standalone/drakconnect
index 40004552f..5922ca50e 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 Mandrakesoft
# 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 584ef4458..a4f44417b 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 Mandrakesoft (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 c93a02f73..8f0f0b3da 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 Mandrakesoft (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 b0962181d..d8f2e11b6 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 Mandrakesoft
# Yves Duret
# Thierry Vignaud
#
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 3b232919b..89c3c3bb5 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 Mandrakesoft
# DUPONT Sebastien
# Damien Chaumette <dchaumette@mandrakesoft.com>
#
@@ -509,7 +509,7 @@ sub interactive_mode() {
$list_all_font_path || $xlsfonts || $windows || @install || @uninstall ? backend_mod() : interactive_mode();
sub help() {
- ugtk2::create_dialog(N("Help"), formatAlaTeX(N("Copyright (C) 2001-2002 by MandrakeSoft
+ ugtk2::create_dialog(N("Help"), formatAlaTeX(N("Copyright (C) 2001-2002 by Mandrakesoft
DUPONT Sebastien (original version)
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index 731e06811..cd0fdc7e3 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 Mandrakesoft
#
# 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 7ff26e0a6..b6040a291 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 Mandrakesoft.
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 79d76386f..aa48ae272 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 Mandrakesoft (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 c564995cb..97b5a3e07 100755
--- a/perl-install/standalone/drakpxe
+++ b/perl-install/standalone/drakpxe
@@ -2,7 +2,7 @@
#
# François Pons <fpons@mandrakesoft.com>
#
-# Copyright 2003-2004 MandrakeSoft
+# Copyright 2003-2004 Mandrakesoft
#
# 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 3d5ff85e0..4a33c094c 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 Mandrakesoft (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 b645b7d56..77c07ef89 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 Mandrakesoft (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 645869b6a..fd6fb5c3f 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 Mandrakesoft
#
# 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 888815632..6646a3f37 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 Mandrakesoft (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 3b5523f26..0e3496506 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 Mandrakesoft (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/logdrake b/perl-install/standalone/logdrake
index edc84a591..fa6475bbc 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 Mandrakesoft
# 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 1f59d0024..16ec29988 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 Mandrakesoft
# Damien "Dam's" Krotkine
# Thierry Vignaud <tvignaud@mandrakesoft.com>
#
diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index aceb4940a..e9dde3564 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 Mandrakesoft
#
# Till Kamppeter <till@mandrakesoft.com>
# Daouda Lo <daouda@mandrakesoft.com>
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index 0bb42a5b4..78dac5207 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 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