- stop using Mandriva URLs and replace them by www.mageia.org (mga#1590)

- replace Mandriva strings by Mageia in gnome-mandrakeonline.desktop
- replace MIME Type application/x-mdv-exec by application/x-mga-exec
- extend $MGA_YEARS in mgaupdate to 2012
- delete MANDRIVA_VERSION variable as not used

1 files changed, 4 insertions, 4 deletions

diff --git a/mgaapplet-add-media-helper b/mgaapplet-add-media-helper
index cd6e747b..7c25e174 100755
--- a/mgaapplet-add-media-helper
+++ b/mgaapplet-add-media-helper
@@ -40,7 +40,7 @@ use utf8;
 # restricted media for each product.
 my %product = (
     powerpack => { 
-	info_url => 'https://my.mandriva.com/powerpack/',
+	info_url => 'https://www.mageia.org/',
 	has_rights => sub {
 	    my $profile = shift @_;
 	    $profile->{data}{'can-access-restricted-repositories'} eq 'YES';
@@ -50,7 +50,7 @@ my %product = (
 	    
     },
     server => { 
-	info_url => 'http://www2.mandriva.com/linux/server/',
+	info_url => 'http://www.mageia.org/',
 	has_rights => sub {
 	    my $profile = shift @_;
 	    $profile->{data}{groups}{'es5-prod'} or
@@ -60,7 +60,7 @@ my %product = (
         add_medium => \&mgaonline::add_medium_enterprise
     },
     extended => {
-        info_url => 'https://my.mandriva.com/',
+        info_url => 'https://www.mageia.org/',
         has_rights => sub {
             my ($profile, $version) = @_;
             return ! ref $profile->{data}{groups}{'ext-maint-' . $version};
@@ -170,7 +170,7 @@ sub run_authentication_dialog {
                             N("You can subscribe <b>right now</b> to get extended maintenance:"),
                        ),
                        @common),
-                new_link_button('http://www2.mandriva.com/support/lifecycle/', 
+                new_link_button('http://www.mageia.org/', 
                                 N("Lifetime policy")),
                 new_link_button($url, N("Online subscription"))
               ];