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

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r487 | dmorgan | 2011-02-08 00:31:17 +0000 (Tue, 08 Feb 2011) | 1 line

Import cleaned drakmenustyle
------------------------------------------------------------------------

1 files changed, 4 insertions, 4 deletions

diff --git a/drakmenustyle b/drakmenustyle
index f1646bc..df8e7c2 100755
--- a/drakmenustyle
+++ b/drakmenustyle
@@ -35,15 +35,15 @@ my $in = 'interactive'->vnew;
 
 my %menu_styles = (
     if_($> != 0, use_system_settings => N("Use system administrator settings")),
-    mandriva => N("Mandriva menu"),
+    mageia => N("Mageia menu"),
     upstream => N("Original menu (default menu from KDE/GNOME, may not contain all applications)"),
 );
   
 my $cfg_file = $> ? "$ENV{HOME}/.menustyle" : '/etc/sysconfig/menustyle';
 my %h = getVarsFromSh($cfg_file);
 
-my $default = $> ? 'use_system_settings' : 'mandriva';
-my $value = $h{MDV_MENU_STYLE} || $default;
+my $default = $> ? 'use_system_settings' : 'mageia';
+my $value = $h{MGA_MENU_STYLE} || $default;
 my $old_value = $value;
 
 $in->ask_from_(
@@ -62,7 +62,7 @@ $in->ask_from_(
 if ($value eq 'use_system_settings') {
     rm_rf($cfg_file) if $> && -e $cfg_file;
 } else {
-    setVarsInSh($cfg_file, { MDV_MENU_STYLE => $value });
+    setVarsInSh($cfg_file, { MGA_MENU_STYLE => $value });
 }
 
 if ($old_value ne $value) {