change a bit how strings are passed to advertising system

so that we don't specify absolute x,y positions for each
paragraph, ending with overwritten text in some localizations

13 files changed, 87 insertions, 115 deletions

diff --git a/perl-install/share/advertising/01-thanks.pl b/perl-install/share/advertising/01-thanks.pl
index 814a7f240..9fec70195 100644
--- a/perl-install/share/advertising/01-thanks.pl
+++ b/perl-install/share/advertising/01-thanks.pl
@@ -2,14 +2,11 @@
 
 $width = 556;
 $height = 303;
-$icon = 0;
-$icon_dx = 0;
-$icon_dy = 0;
-@data = (
-	 [ N("Thank you for choosing Mandrake Linux 9.1"), 0, 80, 400, 0, 1],
-	 [ N("Welcome to the Open Source world."), 0, 110, 400, 0, 0],
-	 [ N("The success of MandrakeSoft is based upon the principle of Free Software. Your new operating system is the result of collaborative work of the worldwide Linux Community."), 0, 140, 400, 0, 0],
 
+$y_start = 80;
 
-#	 [ 'text', $x, $y, $area_width, $area_height, $bold ],
-	);
+$title = N("Thank you for choosing Mandrake Linux 9.1");
+
+@text = (N("Welcome to the Open Source world."),
+         '',
+         N("The success of MandrakeSoft is based upon the principle of Free Software. Your new operating system is the result of collaborative work of the worldwide Linux Community."));
diff --git a/perl-install/share/advertising/02-community.pl b/perl-install/share/advertising/02-community.pl
index 86dfaefce..56e631461 100644
--- a/perl-install/share/advertising/02-community.pl
+++ b/perl-install/share/advertising/02-community.pl
@@ -2,12 +2,10 @@
 
 $width = 556;
 $height = 303;
-$icon = 0;
-$icon_dx = 0;
-$icon_dy = 0;
-@data = (
-	 [ N("Build the future of Linux!"), 0, 30, 400, 0, 1],
-	 [ N("Want to know more and to contribute to the Open Source community? Get involved in the Free Software world!"), 0, 90, 400, 20, 0],
-	 [ N("To share your own knowledge and help build Linux software, join our discussion forums on our \"Community\" webpages."), 0, 150, 400, 0, 0],
-#	 [ 'text', $x, $y, $area_width, $area_height, $bold ],
-	);
+
+$y_start = 30;
+
+$title = N("Build the future of Linux!");
+
+@text = (N("Want to know more and to contribute to the Open Source community? Get involved in the Free Software world!"),
+         N("To share your own knowledge and help build Linux software, join our discussion forums on our \"Community\" webpages."));
diff --git a/perl-install/share/advertising/03-software.pl b/perl-install/share/advertising/03-software.pl
index 975808a60..f813f74c9 100644
--- a/perl-install/share/advertising/03-software.pl
+++ b/perl-install/share/advertising/03-software.pl
@@ -2,12 +2,10 @@
 
 $width = 556;
 $height = 303;
-$icon = 0;
-$icon_dx = 0;
-$icon_dy = 0;
-@data = (
-	 [ N("MandrakeSoft has selected the best software for you"), 0, 0, 400, 00, 1],
-	 [ N("Surf the Web with Mozilla or Konqueror, read your mail with Evolution or Kmail, create your documents with OpenOffice.org."), 0, 20, 500, 00, 0],
-	 [ N("And, of course, push multimedia to its limits with the very latest software to play videos, audio files and to handle your images or photos."), 0, 60, 500, 0, 0 ],
-#	 [ 'text', $x, $y, $area_width, $area_height, $bold ],
-	);
+
+$y_start = 10;
+
+$title = N("MandrakeSoft has selected the best software for you");
+
+@text = (N("Surf the Web with Mozilla or Konqueror, read your mail with Evolution or Kmail, create your documents with OpenOffice.org."),
+         N("And, of course, push multimedia to its limits with the very latest software to play videos, audio files and to handle your images or photos."));
diff --git a/perl-install/share/advertising/04-configuration.pl b/perl-install/share/advertising/04-configuration.pl
index 4e43cb21c..e472a3ada 100644
--- a/perl-install/share/advertising/04-configuration.pl
+++ b/perl-install/share/advertising/04-configuration.pl
@@ -2,11 +2,9 @@
 
 $width = 556;
 $height = 303;
-$icon = 0;
-$icon_dx = 0;
-$icon_dy = 0;
-@data = (
-	 [ N("Mandrake's multipurpose configuration tool"), 0, 0, 400, 0, 1],
-	 [ N("Mandrake Linux 9.1 provides you with the Mandrake Control Center, a powerful tool to fully adapt your computer to the use you make of it. Configure and customize elements such as the security level, the peripherals (screen, mouse, keyboard...), the Internet connection and much more!"), 0, 30, 500, 0, 0],
-#	 [ 'text', $x, $y, $area_width, $area_height ],
-	);
+
+$y_start = 10;
+
+$title = N("Mandrake's multipurpose configuration tool");
+
+@text = (N("Mandrake Linux 9.1 provides you with the Mandrake Control Center, a powerful tool to fully adapt your computer to the use you make of it. Configure and customize elements such as the security level, the peripherals (screen, mouse, keyboard...), the Internet connection and much more!"));
diff --git a/perl-install/share/advertising/05-desktop.pl b/perl-install/share/advertising/05-desktop.pl
index 7a446de05..7649ee6d7 100644
--- a/perl-install/share/advertising/05-desktop.pl
+++ b/perl-install/share/advertising/05-desktop.pl
@@ -2,11 +2,9 @@
 
 $width = 556;
 $height = 303;
-$icon = 0;
-$icon_dx = 0;
-$icon_dy = 0;
-@data = (
-	 [ N("A customizable environment"), 0, 0, 400, 20, 1],
-	 [ N("Perfectly adapt your computer to your needs thanks to the 11 available Mandrake Linux user interfaces which can be fully modified: KDE 3.1, GNOME 2.2, Window Maker, ..."), 0, 30, 500, 0, 0],
-#	 [ 'text', $x, $y, $area_width, $area_height ],
-	);
+
+$y_start = 10;
+
+$title = N("A customizable environment");
+
+@text = (N("Perfectly adapt your computer to your needs thanks to the 11 available Mandrake Linux user interfaces which can be fully modified: KDE 3.1, GNOME 2.2, Window Maker, ..."));
diff --git a/perl-install/share/advertising/06-development.pl b/perl-install/share/advertising/06-development.pl
index 14789c6c8..e3fcb03b6 100644
--- a/perl-install/share/advertising/06-development.pl
+++ b/perl-install/share/advertising/06-development.pl
@@ -2,11 +2,9 @@
 
 $width = 556;
 $height = 303;
-$icon = 0;
-$icon_dx = 0;
-$icon_dy = 0;
-@data = (
-	 [ N("Mandrake Linux 9.1: the ultimate development platform"), 0, 0, 400, 20, 1],
-	 [ N("To modify and to create in different languages such as Perl, Python, C and C++ has never been so easy thanks to GNU gcc 3 and the best Open Source development environments."), 0, 30, 500, 0, 0],
-#	 [ 'text', $x, $y, $area_width, $area_height ],
-	);
+
+$y_start = 10;
+
+$title = N("Mandrake Linux 9.1: the ultimate development platform");
+
+@text = (N("To modify and to create in different languages such as Perl, Python, C and C++ has never been so easy thanks to GNU gcc 3 and the best Open Source development environments."));
diff --git a/perl-install/share/advertising/07-server.pl b/perl-install/share/advertising/07-server.pl
index a83d7037c..97101347b 100644
--- a/perl-install/share/advertising/07-server.pl
+++ b/perl-install/share/advertising/07-server.pl
@@ -2,11 +2,9 @@
 
 $width = 556;
 $height = 303;
-$icon = 0;
-$icon_dx = 0;
-$icon_dy = 0;
-@data = (
-	 [ N("Turn your computer into a reliable server"), 0, 0, 400, 0, 1],
-	 [ N("Transform your computer into a powerful Linux server: Web server, mail, firewall, router, file and print server (etc.) are just a few clicks away!"), 0, 30, 500, 0, 0],
-#	 [ 'text', $x, $y, $area_width, $area_height ],
-	);
+
+$y_start = 10;
+
+$title = N("Turn your computer into a reliable server");
+
+@text = (N("Transform your computer into a powerful Linux server: Web server, mail, firewall, router, file and print server (etc.) are just a few clicks away!"));
diff --git a/perl-install/share/advertising/08-store.pl b/perl-install/share/advertising/08-store.pl
index 89a69a875..df453c8e9 100644
--- a/perl-install/share/advertising/08-store.pl
+++ b/perl-install/share/advertising/08-store.pl
@@ -2,12 +2,10 @@
 
 $width = 556;
 $height = 303;
-$icon = 0;
-$icon_dx = 0;
-$icon_dy = 0;
-@data = (
-	 [ N("The official MandrakeSoft Store"), 0, 0, 400, 0, 1],
-	 [ N("Our full range of Linux solutions, as well as special offers on products and other \"goodies\", are available on our e-store:"), 0, 30, 500, 0, 0],
-	 [ ("www.mandrakestore.com"), 0, 70, 500, 0, 0],
-#	 [ 'text', $x, $y, $area_width, $area_height ],
-	);
+
+$y_start = 10;
+
+$title = N("The official MandrakeSoft Store");
+
+@text = (N("Our full range of Linux solutions, as well as special offers on products and other \"goodies\", are available on our e-store:"),
+         ("www.mandrakestore.com"));
diff --git a/perl-install/share/advertising/09-mdksecure.pl b/perl-install/share/advertising/09-mdksecure.pl
index 57863db5c..a37ec9d18 100644
--- a/perl-install/share/advertising/09-mdksecure.pl
+++ b/perl-install/share/advertising/09-mdksecure.pl
@@ -2,12 +2,10 @@
 
 $width = 556;
 $height = 303;
-$icon = 0;
-$icon_dx = 0;
-$icon_dy = 0;
-@data = (
-	 [ N("Get the best items with Mandrake Linux Strategic partners"), 0, 10, 400, 20, 1],
-	 [ N("Enhance your computer performance with the help of a selection of partners offering professional solutions compatible with Mandrake Linux"), 0, 40, 500, 0, 0],
-	 [ ("www.mandrakesecure.com/license"), 0, 80, 500, 0, 0],
-#	 [ 'text', $x, $y, $area_width, $area_height ],
-	);
+
+$y_start = 10;
+
+$title = N("Get the best items with Mandrake Linux Strategic partners");
+
+@text = (N("Enhance your computer performance with the help of a selection of partners offering professional solutions compatible with Mandrake Linux"),
+         ("www.mandrakesecure.com/license"));
diff --git a/perl-install/share/advertising/10-security.pl b/perl-install/share/advertising/10-security.pl
index a51ead546..5efbc1943 100644
--- a/perl-install/share/advertising/10-security.pl
+++ b/perl-install/share/advertising/10-security.pl
@@ -2,12 +2,9 @@
 
 $width = 556;
 $height = 303;
-$icon = 0;
-$icon_dx = 0;
-$icon_dy = 0;
-@data = (
-	 [ N("Optimize your security by using Mandrake Linux"), 0, 0, 400, 0, 1],
-	 [ N("MandrakeSoft has designed exclusive tools to create the most secured Linux version ever: Draksec, a system security management tool, and a strong firewall are teamed up together  in order to highly reduce hacking risks."), 0, 20, 500, 0, 0],
-
-#	 [ 'text', $x, $y, $area_width, $area_height, $bold ],
-	);
+
+$y_start = 10;
+
+$title = N("Optimize your security by using Mandrake Linux");
+
+@text = (N("MandrakeSoft has designed exclusive tools to create the most secured Linux version ever: Draksec, a system security management tool, and a strong firewall are teamed up together  in order to highly reduce hacking risks."));
diff --git a/perl-install/share/advertising/11-mnf.pl b/perl-install/share/advertising/11-mnf.pl
index 6452a089f..78a3432e9 100644
--- a/perl-install/share/advertising/11-mnf.pl
+++ b/perl-install/share/advertising/11-mnf.pl
@@ -2,12 +2,10 @@
 
 $width = 556;
 $height = 303;
-$icon = 0;
-$icon_dx = 0;
-$icon_dy = 0;
-@data = (
-	 [ N("Secure your networks with the Multi Network Firewall"), 0, 0, 400, 0, 1 ],
-	 [ N("Complete your security setup with this very easy-to-use software which combines high performance components such as a firewall, a virtual private network (VPN) server and client, an intrusion detection system and a traffic manager."), 0, 20, 500, 0, 0 ],
-	 [ N("This product is available on the MandrakeStore Web site."), 0, 70, 500, 0, 0 ],
-#	 [ 'text', $x, $y, $area_width, $area_height ],
-	);
+
+$y_start = 10;
+
+$title = N("Secure your networks with the Multi Network Firewall");
+
+@text = (N("Complete your security setup with this very easy-to-use software which combines high performance components such as a firewall, a virtual private network (VPN) server and client, an intrusion detection system and a traffic manager."),
+         N("This product is available on the MandrakeStore Web site."));
diff --git a/perl-install/share/advertising/12-mdkexpert.pl b/perl-install/share/advertising/12-mdkexpert.pl
index 68bb44f55..9e96f4478 100644
--- a/perl-install/share/advertising/12-mdkexpert.pl
+++ b/perl-install/share/advertising/12-mdkexpert.pl
@@ -2,13 +2,11 @@
 
 $width = 556;
 $height = 303;
-$icon = 0;
-$icon_dx = 0;
-$icon_dy = 0;
-@data = (
-	 [ N("Become a MandrakeExpert"), 0, 0, 400, 0, 1],
-	 [ N("Find the solutions of your problems via MandrakeSoft's online support platform."), 0, 20, 500, 0, 0 ],
-	 [ N("Join the MandrakeSoft support teams and the Linux Community online to share your knowledge and help others by becoming a recognized Expert on the online technical support website:"), 0, 40, 533, 0, 0 ],
-	 [ ("www.mandrakeexpert.com"), 0, 90, 500, 0, 0 ],
-#	 [ 'text', $x, $y, $area_width, $area_height ],
-	);
+
+$y_start = 10;
+
+$title = N("Become a MandrakeExpert");
+
+@text = (N("Find the solutions of your problems via MandrakeSoft's online support platform."),
+         N("Join the MandrakeSoft support teams and the Linux Community online to share your knowledge and help others by becoming a recognized Expert on the online technical support website:"),
+         ("www.mandrakeexpert.com"));
diff --git a/perl-install/share/advertising/13-mdkexpert_corporate.pl b/perl-install/share/advertising/13-mdkexpert_corporate.pl
index d675dee85..5b8c9b3b2 100644
--- a/perl-install/share/advertising/13-mdkexpert_corporate.pl
+++ b/perl-install/share/advertising/13-mdkexpert_corporate.pl
@@ -2,13 +2,11 @@
 
 $width = 556;
 $height = 303;
-$icon = 0;
-$icon_dx = 0;
-$icon_dy = 0;
-@data = (
-	 [ N("MandrakeExpert Corporate"), 0, 0, 400, 0, 1 ],
-	 [ N("An online platform to respond to enterprise support needs."), 0, 20, 500, 0, 0 ],
-	 [ N("All incidents will be followed up by a single qualified MandrakeSoft technical expert."), 0, 40, 500, 0, 0 ],
-	 [ ("corporate.mandrakeexpert.com"), 0, 60, 500, 0, 0 ],
-#	 [ 'text', $x, $y, $area_width, $area_height ],
-	);
+
+$y_start = 10;
+
+$title = N("MandrakeExpert Corporate");
+
+@text = (N("An online platform to respond to enterprise support needs."),
+         N("All incidents will be followed up by a single qualified MandrakeSoft technical expert."),
+         ("corporate.mandrakeexpert.com"));