Synthesized commit during git-svn import combining previous Mandriva history with Mageia.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r401 | dmorgan | 2011-02-03 18:11:59 +0000 (Thu, 03 Feb 2011) | 1 line

Import cleaned drakpxelinux
------------------------------------------------------------------------

In addition to the above commits, the following cleaning work has been recorded:

- License is GPLv2+ according to the Copyright header in drakpxelinux.pl
- Some visible, to the users, occurances of "Mandriva" have been replaced by "Mageia"

1 files changed, 6 insertions, 6 deletions

diff --git a/drakpxelinux.pl b/drakpxelinux.pl
index 42b1081..9dd1a9b 100644..100755
--- a/drakpxelinux.pl
+++ b/drakpxelinux.pl
@@ -71,7 +71,7 @@ N("Kernel: memdisk or vmlinuz") . "\n" .
 N("Initrd: network boot image (network.img) or all.rdz") . "\n" .
 N("Interface: network interface used for the installation process") . "\n" .
 N("Network: DHCP or an IP address") . "\n" .
-N("Directory: full path to Mandriva Linux install server directory") . "\n" .
+N("Directory: full path to Mageia Linux install server directory") . "\n" .
 N("Installation method: NFS or HTTP") . "\n" .
 N("Ramsize: ramsize parameter on boot image") . "\n" .
 N("Display: export display to another computer (e.g.: 10.0.1.33:0)") . "\n" .
@@ -86,7 +86,7 @@ my %help = (
 	    'interface' => N("network interface used for the installation process"),
 	    'info' => N("Information displayed in PXE help (F1 key)"),
 	    'network' => N("DHCP or an IP address"),
-	    'directory' => N("full path to Mandriva Linux install server directory"),
+	    'directory' => N("full path to Mageia Linux install server directory"),
 	    'automatic' => N("installation method: choose NFS or HTTP"),
 	    'ramsize' => N("ramsize parameter on boot image"),
 	    'display' => N("export display on another computer (e.g.: 10.0.1.33:0)"),
@@ -293,8 +293,8 @@ sub wizard_add_entry {
   undef $::WizardWindow;
   $::isWizard = 1;
   use wizards;
-  my $WPXENAME = "Mandriva";
-  my $WINFO = "install Mandriva";
+  my $WPXENAME = "Mageia";
+  my $WINFO = "install Mageia";
   my $WALLRDZ = "/mnt/nfs/isolinux/alt0/all.rdz";
 #  my $WALLRDZ = "/tmp/all.rdz";
   my $WVMLINUZ = "/mnt/nfs/isolinux/alt0/vmlinuz";
@@ -313,7 +313,7 @@ sub wizard_add_entry {
 					   { label => N("PXE label:"), val => \$WPXENAME,
 					     help => N("name displayed in PXE menu (please provide an ASCII word or a number, without spaces)") },
 					   { label => N("PXE information:"), val => \$WINFO,
-					     help => N("The PXE information is used to explain the role of the boot image,\ne.g.:\nMandriva Linux 10 rescue disk\nMandriva Linux cooker install via http") },
+					     help => N("The PXE information is used to explain the role of the boot image,\ne.g.:\nMageai Linux 10 rescue disk\nMageia Linux cauldron install via http") },
 					   { label => N("Full path to all.rdz image source:"), type => 'file', val => \$WALLRDZ,
 					     help => N("Provide the full path to all.rdz image location") },
 					   { label => N("Full path to vmlinuz source:"), type => 'file', val => \$WVMLINUZ,
@@ -644,7 +644,7 @@ sub edit_box_item {
 			       ),
 		      ),
 
-	     0, gtkadd(Gtk2::Frame->new(N("Mandriva Linux installer options")),
+	     0, gtkadd(Gtk2::Frame->new(N("Mageia Linux installer options")),
 		       gtkpack_(gtkset_border_width(Gtk2::VBox->new, 5),
 				0, $label_and_widgets->(N("Ramdisk size"), $ramdisk_size, ""),
 				0, $label_and_widgets->(N("Custom options"), $others, ""),