Update

14 files changed, 35 insertions, 36 deletions

diff --git a/perl-install/share/advertising/01-thanks.pl b/perl-install/share/advertising/01-thanks.pl
index 72896389e..ee2c43610 100644
--- a/perl-install/share/advertising/01-thanks.pl
+++ b/perl-install/share/advertising/01-thanks.pl
@@ -6,9 +6,9 @@ $icon = 0;
 $icon_dx = 0;
 $icon_dy = 0;
 @data = (
-	 [ _("Thank you for choosing Mandrake Linux 9.0"), 0, 50, 400, 20, 1],
-	 [ _("Welcome to the Open Source world."), 0, 70, 400, 20, 0],
-	 [ _("The success of MandrakeSoft is based upon the principle of Free Software. Your new operating system is the result of collaborative work on the part of the worldwide Linux Community."), 0, 90, 400, 100, 0],
+	 [ _("Thank you for choosing Mandrake Linux 9.0"), 0, 80, 400, 0, 1],
+	 [ _("Welcome to the Open Source world."), 0, 110, 400, 0, 0],
+	 [ _("The success of MandrakeSoft is based upon the principle of Free Software. Your new operating system is the result of collaborative work on the part of the worldwide Linux Community."), 0, 140, 400, 0, 0],
 
 
 #	 [ 'text', $x, $y, $area_width, $area_height, $bold ],
diff --git a/perl-install/share/advertising/02-community.pl b/perl-install/share/advertising/02-community.pl
index e3c80fad0..c2fe55d56 100644
--- a/perl-install/share/advertising/02-community.pl
+++ b/perl-install/share/advertising/02-community.pl
@@ -6,9 +6,9 @@ $icon = 0;
 $icon_dx = 0;
 $icon_dy = 0;
 @data = (
-	 [ _("Get involved in the Free Software world."), 0, 50, 400, 20, 1],
-	 [ _("Want to know more about the Open Source community?"), 0, 70, 400, 20, 0],
-	 [ _("To share your own knowledge and help build Linux tools, join the discussions forum you'll find on our \"Community\" webpages."), 0, 90, 400, 100, 0],
+	 [ _("Get involved in the Free Software world."), 0, 30, 400, 0, 1],
+	 [ _("Want to know more about the Open Source community?"), 0, 90, 400, 20, 0],
+	 [ _("To share your own knowledge and help build Linux tools, join the discussions forum you'll find on our \"Community\" webpages."), 0, 150, 400, 0, 0],
 
 
 #	 [ 'text', $x, $y, $area_width, $area_height, $bold ],
diff --git a/perl-install/share/advertising/03-internet.pl b/perl-install/share/advertising/03-internet.pl
index ebc8b3b0c..e865eea95 100644
--- a/perl-install/share/advertising/03-internet.pl
+++ b/perl-install/share/advertising/03-internet.pl
@@ -7,6 +7,6 @@ $icon_dx = 0;
 $icon_dy = 0;
 @data = (
 	 [ _("Get the most from the Internet"), 0, 0, 400, 20, 1],
-	 [ _("Mandrake Linux 9.0 has selected the best softwares for you. Surf the Web and view animations with Mozilla and Konqueror, or read your mail and handle your personal information with Evolution and Kmail."), 0, 20, 400, 60, 0],
+	 [ _("Mandrake Linux 9.0 has selected the best softwares for you. Surf the Web and view animations with Mozilla and Konqueror, or read your mail and handle your personal information with Evolution and Kmail."), 0, 30, 400, 60, 0],
 #	 [ 'text', $x, $y, $area_width, $area_height ],
 	);
diff --git a/perl-install/share/advertising/04-multimedia.pl b/perl-install/share/advertising/04-multimedia.pl
index 8086197b2..8fdf10201 100644
--- a/perl-install/share/advertising/04-multimedia.pl
+++ b/perl-install/share/advertising/04-multimedia.pl
@@ -7,7 +7,7 @@ $icon_dx = 0;
 $icon_dy = 0;
 @data = (
 	 [ _("Discover the most up-to-date graphical and multimedia tools!"), 0, 0, 400, 20, 1],
-	 [ _("Push multimedia at its limits!"), 0, 20, 400, 60, 0],
-	 [ _("Mandrake Linux 9.0 enables you to use the very latest software to play audio files, edit and handle your images or photos, and plays videos."), 0, 20, 400, 60, 0],
+	 [ _("Push multimedia at its limits!"), 0, 20, 400, 20, 0],
+	 [ _("Mandrake Linux 9.0 enables you to use the very latest software to play audio files, edit and handle your images or photos, and plays videos."), 0, 50, 400, 20, 0],
 #	 [ 'text', $x, $y, $area_width, $area_height ],
 	);
diff --git a/perl-install/share/advertising/05-games.pl b/perl-install/share/advertising/05-games.pl
index 504821834..799e6ccab 100644
--- a/perl-install/share/advertising/05-games.pl
+++ b/perl-install/share/advertising/05-games.pl
@@ -7,6 +7,6 @@ $icon_dx = 0;
 $icon_dy = 0;
 @data = (
 	 [ _("Games"), 0, 0, 400, 20, 1],
-	 [ _("Mandrake Linux 9.0 provides the best Open Source games - arcade, action, cards, sports, strategy, ..."), 0, 20, 400, 40, 0],
+	 [ _("Mandrake Linux 9.0 provides the best Open Source games - arcade, action, cards, sports, strategy, ..."), 0, 30, 400, 0, 0],
 #	 [ 'text', $x, $y, $area_width, $area_height ],
 	);
diff --git a/perl-install/share/advertising/07-desktop.pl b/perl-install/share/advertising/07-desktop.pl
index 12b927b79..219bfd188 100644
--- a/perl-install/share/advertising/07-desktop.pl
+++ b/perl-install/share/advertising/07-desktop.pl
@@ -2,11 +2,11 @@
 
 $width = 400;
 $height = 270;
-$icon = 1;
-$icon_dx = 34;
-$icon_dy = 27;
+$icon = 0;
+$icon_dx = 0;
+$icon_dy = 0;
 @data = (
-	 [ _("User interfaces"), 0, 0, 400, 20, 1],
-	 [ _("Mandrake Linux 9.0 provides 11 user interfaces which can be fully modified: KDE 3, Gnome 2, WindowMaker..."), 0, 20, 400, 60, 0],
+	 [ _("User interfaces"), 0, 0, 400, 0, 1],
+	 [ _("Mandrake Linux 9.0 provides 11 user interfaces which can be fully modified: KDE 3, Gnome 2, WindowMaker..."), 0, 40, 400, 0, 0],
 #	 [ 'text', $x, $y, $area_width, $area_height ],
 	);
diff --git a/perl-install/share/advertising/08-development.pl b/perl-install/share/advertising/08-development.pl
index 1893b8ce9..12f21049e 100644
--- a/perl-install/share/advertising/08-development.pl
+++ b/perl-install/share/advertising/08-development.pl
@@ -6,8 +6,8 @@ $icon = 0;
 $icon_dx = 0;
 $icon_dy = 0;
 @data = (
-	 [ _("Development simplified"), 0, 0, 400, 20, 1],
-	 [ _("Mandrake Linux 9.0 is the ultimate development platform."), 0, 20, 400, 60, 0],
-	 [ _("Use the full power of the GNU gcc 3 compiler as well as the best Open Source development environments."), 0, 40, 400, 60, 0],
+	 [ _("Development simplified"), 0, 0, 400, 0, 1],
+	 [ _("Mandrake Linux 9.0 is the ultimate development platform."), 0, 20, 400, 0, 0],
+	 [ _("Use the full power of the GNU gcc 3 compiler as well as the best Open Source development environments."), 0, 50, 400, 0, 0],
 #	 [ 'text', $x, $y, $area_width, $area_height ],
 	);
diff --git a/perl-install/share/advertising/09-server.pl b/perl-install/share/advertising/09-server.pl
index 2b27bbaac..bb58ce029 100644
--- a/perl-install/share/advertising/09-server.pl
+++ b/perl-install/share/advertising/09-server.pl
@@ -6,7 +6,7 @@ $icon = 0;
 $icon_dx = 0;
 $icon_dy = 0;
 @data = (
-	 [ _("Turn your machine into a reliable server."), 0, 0, 400, 20, 1],
-	 [ _("Transform your machine into a powerful server in a few clicks of your mouse: Web server, mail, firewall, router, file and print server, ..."), 0, 20, 400, 60, 0],
+	 [ _("Turn your machine into a reliable server."), 0, 10, 400, 20, 1],
+	 [ _("Transform your machine into a powerful server in a few clicks of your mouse: Web server, mail, firewall, router, file and print server, ..."), 0, 50, 400, 60, 0],
 #	 [ 'text', $x, $y, $area_width, $area_height ],
 	);
diff --git a/perl-install/share/advertising/10-mnf.pl b/perl-install/share/advertising/10-mnf.pl
index 59144ba2b..2663f611f 100644
--- a/perl-install/share/advertising/10-mnf.pl
+++ b/perl-install/share/advertising/10-mnf.pl
@@ -6,10 +6,10 @@ $icon = 0;
 $icon_dx = 0;
 $icon_dy = 0;
 @data = (
-	 [ _("Optimize your security"), 0, 50, 400, 20, 1],
-	 [ _("The MandrakeSecurity range includes the Multi Network Firewall product (M.N.F.)."), 0, 70, 400, 20, 0],
-	 [ _("This firewall product includes network features which allow you to fulfill all your security needs"), 0, 50, 400, 100, 0],
-	 [ _("This product is available on MandrakeStore website"), 0, 70, 400, 100, 0],
+	 [ _("Optimize your security"), 0, 0, 400, 0, 1],
+	 [ _("The MandrakeSecurity range includes the Multi Network Firewall product (M.N.F.)."), 0, 20, 400, 0, 0],
+	 [ _("This firewall product includes network features which allow you to fulfill all your security needs"), 0, 40, 400, 80, 0],
+	 [ _("This product is available on MandrakeStore website"), 0, 60, 400, 100, 0],
 
 
 #	 [ 'text', $x, $y, $area_width, $area_height, $bold ],
diff --git a/perl-install/share/advertising/11-mdkstore.pl b/perl-install/share/advertising/11-mdkstore.pl
index 2fa723bee..5bd870063 100644
--- a/perl-install/share/advertising/11-mdkstore.pl
+++ b/perl-install/share/advertising/11-mdkstore.pl
@@ -7,6 +7,6 @@ $icon_dx = 0;
 $icon_dy = 0;
 @data = (
 	 [ _("The official MandrakeSoft store"), 0, 0, 400, 20, 1],
-	 [ _("Our full range of Linux solutions, as well as special offers on products and 'goodies', are available online at our e-store."), 0, 20, 400, 50 ],
+	 [ _("Our full range of Linux solutions, as well as special offers on products and 'goodies', are available online at our e-store."), 0, 40, 400, 50 ],
 #	 [ 'text', $x, $y, $area_width, $area_height ],
 	);
diff --git a/perl-install/share/advertising/12-mdkstore.pl b/perl-install/share/advertising/12-mdkstore.pl
index de28ef4be..59fc93c56 100644
--- a/perl-install/share/advertising/12-mdkstore.pl
+++ b/perl-install/share/advertising/12-mdkstore.pl
@@ -7,7 +7,7 @@ $icon_dx = 0;
 $icon_dy = 0;
 @data = (
 	 [ _("Strategic partners"), 0, 0, 400, 20, 1],
-	 [ _("MandrakeSoft works alongside a selection of companies offering professional solutions compatible with Mandrake Linux. A list of these partners is available on the MandrakeStore."), 0, 20, 400, 50, 0 ],
-	 [ "www.mandrakestore.com/license", 0, 0, 400, 80, 0 ],
+	 [ _("MandrakeSoft works alongside a selection of companies offering professional solutions compatible with Mandrake Linux. A list of these partners is available on the MandrakeStore."), 0, 30, 400, 50, 0 ],
+	 [ _("www.mandrakestore.com/license"), 0, 60, 400, 80, 0 ],
 #	 [ 'text', $x, $y, $area_width, $area_height ],
 	);
diff --git a/perl-install/share/advertising/13-mdkcampus.pl b/perl-install/share/advertising/13-mdkcampus.pl
index 1f4da95a8..06ee9b218 100644
--- a/perl-install/share/advertising/13-mdkcampus.pl
+++ b/perl-install/share/advertising/13-mdkcampus.pl
@@ -7,8 +7,8 @@ $icon_dx = 0;
 $icon_dy = 0;
 @data = (
 	 [ _("Discover MandrakeSoft's training catalogue Linux-Campus"), 0, 0, 400, 20, 1 ],
-	 [ _("The training program has been create to respond to the needs of both users and experts (Network and System administrations)"), 0, 20, 400, 50, 0 ],
-	 [ _("Certify yourself on Linux."), 0, 20, 400, 70, 0 ],
-	 [ _("Whether you choose to teach yourself online or via our netwirk of training partners, the Linux-Campus catalogue prepares you for the acknowledged LPI certification program (worldwide professional technical certification)."), 0."
+	 [ _("The training program has been create to respond to the needs of both users and experts (Network and System administrations)"), 0, 40, 400, 20, 0 ],
+	 [ _("Certify yourself on Linux."), 0, 80, 400, 40, 0 ],
+	 [ _("Whether you choose to teach yourself online or via our netwirk of training partners, the Linux-Campus catalogue prepares you for the acknowledged LPI certification program (worldwide professional technical certification)."), 0, 120, 400, 20, 0 ],
 #	 [ 'text', $x, $y, $area_width, $area_height ],
 	);
diff --git a/perl-install/share/advertising/14-mdkexpert.pl b/perl-install/share/advertising/14-mdkexpert.pl
index 403f58c84..06d2d255b 100644
--- a/perl-install/share/advertising/14-mdkexpert.pl
+++ b/perl-install/share/advertising/14-mdkexpert.pl
@@ -7,8 +7,7 @@ $icon_dx = 0;
 $icon_dy = 0;
 @data = (
 	 [ _("Become a MandrakeExpert"), 0, 0, 400, 20, 1],
-	 [ _("Find the solutions of your problems via MandrakeSoft's online support platform."), 0, 20, 400, 60 ],
-	 [ _("Join the MandrakeSoft support teams and the Linux Community online th share your knowledge and help your others by becoming a recognized Expert on the online tehnial support website:"), 0, 20, 400, 90 ],
-	 [ "www.mandrakeexpert.com", 0, 20, 400, 120],
+	 [ _("Find the solutions of your problems via MandrakeSoft's online support platform."), 0, 30, 400, 0, 0 ],
+	 [ _("Join the MandrakeSoft support teams and the Linux Community online th share your knowledge and help your others by becoming a recognized Expert on the online tehnial support website:"), 0, 70, 400, 0, 0 ],
 #	 [ 'text', $x, $y, $area_width, $area_height ],
 	);
diff --git a/perl-install/share/advertising/15-mdkexpert-corporate.pl b/perl-install/share/advertising/15-mdkexpert-corporate.pl
index 6ee4bf703..e37ecc15b 100644
--- a/perl-install/share/advertising/15-mdkexpert-corporate.pl
+++ b/perl-install/share/advertising/15-mdkexpert-corporate.pl
@@ -7,8 +7,8 @@ $icon_dx = 0;
 $icon_dy = 0;
 @data = (
 	 [ _("MandrakeExpert Corporate"), 0, 0, 400, 20, 1],
-	 [ _("An online platform to respond to company's specific support needs."), 0, 20, 400, 60 ],
-	 [ _("All incidents will be followed up by a single qualified MandrakeSoft technical expert."), 0, 20, 400, 90 ],
-	 [ "corporate.mandrakeexpert.com", 0, 20, 400, 120],
+	 [ _("An online platform to respond to company's specific support needs."), 0, 50, 400, 0, 0 ],
+	 [ _("All incidents will be followed up by a single qualified MandrakeSoft technical expert."), 0, 100, 400, 0, 0 ],
+	 [ _("corporate.mandrakeexpert.com"), 0, 150, 400, 0, 1],
 #	 [ 'text', $x, $y, $area_width, $area_height ],
 	);