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

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r792 | dmorgan | 2011-04-01 08:37:48 +0100 (Fri, 01 Apr 2011) | 1 line

Add cleaned draklive-install
------------------------------------------------------------------------

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

- License is GPL according to the relevant rpm spec written by Mandriva
- Change one occurance of "Mandriva" to "Mageia" as its visible in the GUI, in
  draklive-install
- Rename mandriva-draklive-install.desktop to mageia-draklive-install.desktop
  and change the Comment inside it to say Mageia too
- Icons in ./data/icons will need to be replaced

1 files changed, 4 insertions, 4 deletions

diff --git a/draklive-install b/draklive-install
index 0947cb0..760756c 100755
--- a/draklive-install
+++ b/draklive-install
@@ -47,7 +47,7 @@ sub install_live() {
 
     $::isWizard = 1;
     $::Wizard_no_previous = 1;
-    $::Wizard_pix_up = "MandrivaOne-install-icon";
+    $::Wizard_pix_up = "MageiaLive-install-icon";
     any::set_wm_hints_if_needed($in);
 
     my $all_hds = {};
@@ -98,9 +98,9 @@ sub display_start_message() {
     require any;
     my $has_running_wm = to_bool(any::running_window_manager());
     local $::isStandalone = $has_running_wm; # center me if run in xsetup.d script
-    my $w = ugtk2->new(N("Mandriva Live"));
+    my $w = ugtk2->new(N("Mageia Live"));
     ugtk2::gtkadd($w->{window},
-                  ugtk2::gtkcreate_img("MandrivaOne-install"),
+                  ugtk2::gtkcreate_img("MageiaLive-install"),
                   ugtk2::gtknew('Label', height => 5),
                   N("This wizard will help you to install the live distribution."),
                   ugtk2::create_okcancel($w));
@@ -404,7 +404,7 @@ sub copying_message {
     my ($o, $title, $message, $b_temp) = @_;
 
     my $w = $o->wait_messageW($title, N("Copying in progress"), ugtk2::gtknew('VBox', padding => 5, children_tight => [
-        ugtk2::gtkcreate_img("MandrivaOne-advert"),
+        ugtk2::gtkcreate_img("MageiaLive-advert"),
         $message,
     ]));
     push @tempory::objects, $w if $b_temp;