summaryrefslogtreecommitdiffstats
path: root/perl-install/share/advertising
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/share/advertising')
-rw-r--r--perl-install/share/advertising/dis-01.pl19
-rw-r--r--perl-install/share/advertising/dis-02.pl15
-rw-r--r--perl-install/share/advertising/dis-03.pl11
-rw-r--r--perl-install/share/advertising/dis-04.pl20
-rw-r--r--perl-install/share/advertising/dis-05.pl15
-rw-r--r--perl-install/share/advertising/dis-06.pl21
-rw-r--r--perl-install/share/advertising/dis-07.pl19
-rw-r--r--perl-install/share/advertising/dis-08.pl15
-rw-r--r--perl-install/share/advertising/dis-09.pl11
-rw-r--r--perl-install/share/advertising/dis-10.pl25
-rw-r--r--perl-install/share/advertising/dis-11.pl15
-rw-r--r--perl-install/share/advertising/dwd-02.pl4
-rw-r--r--perl-install/share/advertising/dwd-03.pl6
-rw-r--r--perl-install/share/advertising/dwd-04.pl8
-rw-r--r--perl-install/share/advertising/dwd-05.pl8
-rw-r--r--perl-install/share/advertising/dwd-06.pl4
-rw-r--r--perl-install/share/advertising/dwd-07.pl14
-rw-r--r--perl-install/share/advertising/dwd-08.pl4
-rw-r--r--perl-install/share/advertising/dwd-09.pl6
-rw-r--r--perl-install/share/advertising/ppp-01.pl10
-rw-r--r--perl-install/share/advertising/ppp-02.pl6
-rw-r--r--perl-install/share/advertising/ppp-03.pl2
-rw-r--r--perl-install/share/advertising/ppp-04.pl12
-rw-r--r--perl-install/share/advertising/ppp-05.pl12
-rw-r--r--perl-install/share/advertising/ppp-06.pl10
-rw-r--r--perl-install/share/advertising/ppp-07.pl10
-rw-r--r--perl-install/share/advertising/ppp-08.pl6
-rw-r--r--perl-install/share/advertising/ppp-09.pl2
-rw-r--r--perl-install/share/advertising/pwp-01.pl19
-rw-r--r--perl-install/share/advertising/pwp-02.pl11
-rw-r--r--perl-install/share/advertising/pwp-03.pl11
-rw-r--r--perl-install/share/advertising/pwp-04.pl22
-rw-r--r--perl-install/share/advertising/pwp-05.pl17
-rw-r--r--perl-install/share/advertising/pwp-06.pl17
-rw-r--r--perl-install/share/advertising/pwp-07.pl15
-rw-r--r--perl-install/share/advertising/pwp-08.pl13
-rw-r--r--perl-install/share/advertising/pwp-09.pl27
-rw-r--r--perl-install/share/advertising/pwp-10.pl15
38 files changed, 284 insertions, 193 deletions
diff --git a/perl-install/share/advertising/dis-01.pl b/perl-install/share/advertising/dis-01.pl
index b6f7f108e..ab8cc8acc 100644
--- a/perl-install/share/advertising/dis-01.pl
+++ b/perl-install/share/advertising/dis-01.pl
@@ -3,12 +3,17 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = N("Congratulations for choosing Mandrake Linux!");
+# Use <b>text</b> for bold
-@text = (N("Welcome to the Open Source world!"),
- '',
- N("Your new Mandrake Linux operating system and its many applications is the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world."),
- '',
- N("We would like to thank everyone who participated in the development of this latest release."));
+# @text = ([ N("text to display"), center => 1 ],
+
+@text = ([ N("<b>Congratulations for choosing Mandrake Linux!</b>"), center => 1 ],
+ ' ',
+ N("Welcome to the Open Source world!"),
+ ' ',
+ N("Your new Mandrake Linux operating system and its many applications is the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world."),
+ ' ',
+ N("We would like to thank everyone who participated in the development of this latest release."));
diff --git a/perl-install/share/advertising/dis-02.pl b/perl-install/share/advertising/dis-02.pl
index 1f914a6bd..ecf53f844 100644
--- a/perl-install/share/advertising/dis-02.pl
+++ b/perl-install/share/advertising/dis-02.pl
@@ -3,10 +3,15 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = N("Discovery");
+# Use <b>text</b> for bold
-@text = (N("Discovery is the easiest and most user-friendly Linux distribution. It includes a hand-picked selection of premium software for Office, Multimedia and Internet activities."),
- '',
- N("The menu is task-oriented, with a single selected application per task."));
+# @text = ([ N("text to display"), center => 1 ],
+
+@text = ([ N("<b>Discovery</b>"), center => 1 ],
+ ' ',
+ N("Discovery is the easiest and most user-friendly Linux distribution. It includes a hand-picked selection of premium software for Office, Multimedia and Internet activities."),
+ ' ',
+ N("The menu is task-oriented, with a single selected application per task."));
diff --git a/perl-install/share/advertising/dis-03.pl b/perl-install/share/advertising/dis-03.pl
index 6fc69737b..d32cfcc59 100644
--- a/perl-install/share/advertising/dis-03.pl
+++ b/perl-install/share/advertising/dis-03.pl
@@ -3,8 +3,13 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = N("The KDE Choice");
+# Use <b>text</b> for bold
-@text = (N("The powerful Open Source graphical desktop environment KDE is the desktop of choice for the Discovery Pack."));
+# @text = ([ N("text to display"), center => 1 ],
+
+@text = ([ N("<b>The KDE Choice</b>"), center => 1 ],
+ ' ',
+ N("The powerful Open Source graphical desktop environment KDE is the desktop of choice for the Discovery Pack."));
diff --git a/perl-install/share/advertising/dis-04.pl b/perl-install/share/advertising/dis-04.pl
index d85415785..c20b63ff1 100644
--- a/perl-install/share/advertising/dis-04.pl
+++ b/perl-install/share/advertising/dis-04.pl
@@ -3,14 +3,16 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = N("OpenOffice.org: The complete Linux office suite.");
+# Use <b>text</b> for bold
-@text = (N("WRITER is a powerful word processor for creating all types of text documents. Documents may include images, diagrams and tables."),
- '',
- N("CALC is a feature-packed spreadsheet which enables you to compute, analyze and manage all of your data."),
- '',
- N("IMPRESS is the fastest, most powerful way to create effective multimedia presentations."),
- '',
- N("DRAW will produce everything from simple diagrams to dynamic 3D illustrations."));
+# @text = ([ N("text to display"), center => 1 ],
+
+@text = ([ N("<b>OpenOffice.org:</b> The complete Linux office suite."), center => 1 ],
+ ' ',
+ N("WRITER is a powerful word processor for creating all types of text documents. Documents may include images, diagrams and tables."),
+ N("CALC is a feature-packed spreadsheet which enables you to compute, analyze and manage all of your data."),
+ N("IMPRESS is the fastest, most powerful way to create effective multimedia presentations."),
+ N("DRAW will produce everything from simple diagrams to dynamic 3D illustrations."));
diff --git a/perl-install/share/advertising/dis-05.pl b/perl-install/share/advertising/dis-05.pl
index c963d5f0e..2a6d33acc 100644
--- a/perl-install/share/advertising/dis-05.pl
+++ b/perl-install/share/advertising/dis-05.pl
@@ -3,10 +3,15 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = N("Surf The Internet");
+# Use <b>text</b> for bold
-@text = (N("Discover the new integrated personal information suite KDE Kontact."),
- '',
- N("More than just a full-featured email client, Kontact also includes an address book, a calendar and scheduling program, plus a tool for taking notes!"));
+# @text = ([ N("text to display"), center => 1 ],
+
+@text = ([ N("<b>Surf The Internet</b>"), center => 1 ],
+ ' ',
+ N("Discover the new integrated personal information suite KDE Kontact."),
+ ' ',
+ N("More than just a full-featured email client, Kontact also includes an address book, a calendar and scheduling program, plus a tool for taking notes!"));
diff --git a/perl-install/share/advertising/dis-06.pl b/perl-install/share/advertising/dis-06.pl
index e045a7c38..f5df61e07 100644
--- a/perl-install/share/advertising/dis-06.pl
+++ b/perl-install/share/advertising/dis-06.pl
@@ -3,13 +3,18 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = N("Surf The Internet");
+# Use <b>text</b> for bold
-@text = (N("You can also:"),
- N(" - browse the Web"),
- N(" - chat"),
- N(" - organize a video-conference"),
- N(" - create your own Web site"),
- N(" - ..."));
+# @text = ([ N("text to display"), center => 1 ],
+
+@text = ([ N("<b>Surf The Internet</b>"), center => 1 ],
+ ' ',
+ N("You can also:"),
+ N(" - browse the Web"),
+ N(" - chat"),
+ N(" - organize a video-conference"),
+ N(" - create your own Web site"),
+ N(" - ..."));
diff --git a/perl-install/share/advertising/dis-07.pl b/perl-install/share/advertising/dis-07.pl
index ccc55aa2b..358f6c109 100644
--- a/perl-install/share/advertising/dis-07.pl
+++ b/perl-install/share/advertising/dis-07.pl
@@ -3,12 +3,17 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = N("Multimedia: Software for every need!");
+# Use <b>text</b> for bold
-@text = (N("Listen to audio CDs with KsCD."),
- '',
- N("Listen to music files and watch videos with Totem."),
- '',
- N("View and edit images and photos with GQview and the Gimp!"));
+# @text = ([ N("text to display"), center => 1 ],
+
+@text = (N("<b>Multimedia:</b> Software for every need!"),
+ ' ',
+ N("Listen to audio CDs with <b>KsCD</b>."),
+ ' ',
+ N("Listen to music files and watch videos with <b>Totem</b>."),
+ ' ',
+ N("View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"));
diff --git a/perl-install/share/advertising/dis-08.pl b/perl-install/share/advertising/dis-08.pl
index c0329755b..ec0a211cc 100644
--- a/perl-install/share/advertising/dis-08.pl
+++ b/perl-install/share/advertising/dis-08.pl
@@ -3,10 +3,15 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = N("Mandrake Control Center");
+# Use <b>text</b> for bold
-@text = (N("The Mandrake Control Center is an essential collection of Mandrake-specific utilities for simplifying the configuration of your computer."),
- '',
- N("You will immediately appreciate this collection of handy utilities for easily configuring hardware devices, defining mount points, setting up Network and Internet, adjusting the security level of your computer, and just about everything related to the system."));
+# @text = ([ N("text to display"), center => 1 ],
+
+@text = ([ N("<b>Mandrake Control Center</b>"), center => 1 ],
+ ' ',
+ N("The Mandrake Control Center is an essential collection of Mandrake-specific utilities for simplifying the configuration of your computer."),
+ ' ',
+ N("You will immediately appreciate this collection of handy utilities for easily configuring hardware devices, defining mount points, setting up Network and Internet, adjusting the security level of your computer, and just about everything related to the system."));
diff --git a/perl-install/share/advertising/dis-09.pl b/perl-install/share/advertising/dis-09.pl
index 9f0db699d..aab862418 100644
--- a/perl-install/share/advertising/dis-09.pl
+++ b/perl-install/share/advertising/dis-09.pl
@@ -3,10 +3,13 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = "";
+# Use <b>text</b> for bold
+
+# @text = ([ N("text to display"), center => 1 ],
@text = (N("Find all MandrakeSoft products and services at MandrakeStore -- our full service e-commerce platform."),
- '',
- N("Stop by today at www.mandrakestore.com"));
+ ' ',
+ N("Stop by today at <b>www.mandrakestore.com</b>"));
diff --git a/perl-install/share/advertising/dis-10.pl b/perl-install/share/advertising/dis-10.pl
index 0d5a43aac..e60c7ad04 100644
--- a/perl-install/share/advertising/dis-10.pl
+++ b/perl-install/share/advertising/dis-10.pl
@@ -3,15 +3,20 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = N("Become a MandrakeClub member!");
+# Use <b>text</b> for bold
-@text = (N("Take advantage of valuable benefits, products and services by joining MandrakeClub, such as:"),
- N(" - Full access to commercial applications"),
- N(" - Special download mirror list exclusively for MandrakeClub Members"),
- N(" - Voting for software to put in Mandrake Linux"),
- N(" - Special discounts for products and services at MandrakeStore"),
- N(" - Plus much more"),
- '',
- N("For more information, please visit www.mandrakeclub.com"));
+# @text = ([ N("text to display"), center => 1 ],
+
+@text = (N("Become a <b>MandrakeClub</b> member!"),
+ ' ',
+ N("Take advantage of valuable benefits, products and services by joining MandrakeClub, such as:"),
+ N(" - Full access to commercial applications"),
+ N(" - Special download mirror list exclusively for MandrakeClub Members"),
+ N(" - Voting for software to put in Mandrake Linux"),
+ N(" - Special discounts for products and services at MandrakeStore"),
+ N(" - Plus much more"),
+ ' ',
+ N("For more information, please visit <b>www.mandrakeclub.com</b>"));
diff --git a/perl-install/share/advertising/dis-11.pl b/perl-install/share/advertising/dis-11.pl
index b30ba8000..af966ab17 100644
--- a/perl-install/share/advertising/dis-11.pl
+++ b/perl-install/share/advertising/dis-11.pl
@@ -3,12 +3,15 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = "";
+# Use <b>text</b> for bold
+
+# @text = ([ N("text to display"), center => 1 ],
@text = (N("Do you require assistance?"),
- '',
- N("MandrakeExpert is the primary source for technical support."),
- '',
- N("If you have Linux questions, subscribe to MandrakeExpert at www.mandrakeexpert.com"));
+ ' ',
+ N("MandrakeExpert is the primary source for technical support."),
+ ' ',
+ N("If you have Linux questions, subscribe to MandrakeExpert at <b>www.mandrakeexpert.com</b>"));
diff --git a/perl-install/share/advertising/dwd-02.pl b/perl-install/share/advertising/dwd-02.pl
index a8df59911..7f52f4eed 100644
--- a/perl-install/share/advertising/dwd-02.pl
+++ b/perl-install/share/advertising/dwd-02.pl
@@ -12,6 +12,6 @@ $border = 10; #- for leftish text
@text = ([ N("<b>Join the Mandrake Linux community!</b>"), center => 1 ],
' ',
- N("If you would like to get involved, please subscribe to the \"Cooker\" mailing list by visiting <b>mandrakelinux.com/cooker</b>"),
+ N("If you would like to get involved, please subscribe to the \"Cooker\" mailing list by visiting mandrake-linux.com/cooker"),
' ',
- N("To learn more about our dynamic community, please visit <b>www.mandrakelinux.com</b>!"));
+ N("To learn more about our dynamic community, please visit www.mandrake-linux.com!"));
diff --git a/perl-install/share/advertising/dwd-03.pl b/perl-install/share/advertising/dwd-03.pl
index b9947438e..f21d5ffaf 100644
--- a/perl-install/share/advertising/dwd-03.pl
+++ b/perl-install/share/advertising/dwd-03.pl
@@ -12,6 +12,6 @@ $border = 10; #- for leftish text
@text = ([ N("<b>What is Mandrake Linux?</b>"), center => 1 ],
' ',
- N("Mandrake Linux is an Open Source distribution created with thousands of the choicest applications from the Free Software world. Mandrake Linux is one of the most widely used Linux distributions worldwide!"),
- ' ',
- N("Mandrake Linux includes the famous graphical desktops KDE and GNOME, plus the latest versions of the most popular Open Source applications."));
+ N("Mandrake Linux is an Open Source distribution created with thousands of the choicest applications from the Free Software world. Mandrake Linux is one of the most widely used Linux distributions worldwide!"),
+ ' ',
+ N("Mandrake Linux includes the famous graphical desktops KDE and GNOME, plus the latest versions of the most popular Open Source applications."));
diff --git a/perl-install/share/advertising/dwd-04.pl b/perl-install/share/advertising/dwd-04.pl
index 81650a3c6..712e9f117 100644
--- a/perl-install/share/advertising/dwd-04.pl
+++ b/perl-install/share/advertising/dwd-04.pl
@@ -13,7 +13,7 @@ $border = 10; #- for leftish text
@text = (N("Mandrake Linux is widely known as the most user-friendly and the easiest to install and to use Linux distribution."),
' ',
N("Find out about our personal solutions:"),
- N(" - Find out Mandrake Linux on a bootable CD with <b>MandrakeMove</b>"),
- N(" - If you use Linux mostly for Office, Internet and Multimedia tasks, <b>Discovery</b> perfectly meets your needs"),
- N(" - If you appreciate the largest selection of software including powerful development tools, <b>PowerPack</b> is for you"),
- N(" - If you require a full-featured Linux solution customized for small to medium-sized networks, choose <b>PowerPack+</b>"));
+ N(" - Find out Mandrake Linux on a bootable CD with <b>MandrakeMove</b>"),
+ N(" - If you use Linux mostly for Office, Internet and Multimedia tasks, <b>Discovery</b> perfectly meets your needs"),
+ N(" - If you appreciate the largest selection of software including powerful development tools, <b>PowerPack</b> is for you"),
+ N(" - If you require a full-featured Linux solution customized for small to medium-sized networks, choose <b>PowerPack+</b>"));
diff --git a/perl-install/share/advertising/dwd-05.pl b/perl-install/share/advertising/dwd-05.pl
index 067a46f88..ed98eda42 100644
--- a/perl-install/share/advertising/dwd-05.pl
+++ b/perl-install/share/advertising/dwd-05.pl
@@ -13,7 +13,7 @@ $border = 10; #- for leftish text
@text = (N("Find out also our business solutions!"),
' ',
N("<b>Corporate Server</b>: the ideal solution for entreprises. It is a complete \"all-in-one\" solution that includes everything needed to rapidly deploy world-class Linux server applications."),
- ' ',
- N("<b>Multi Network Firewall</b>: based on Linux 2.4 \"kernel secure\" to provide multi-VPN as well as multi-DMZ functionalities. It is the perfect high performance security solution."),
- ' ',
- N("<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined with the stability and easy-of-use of the world-famous Mandrake Linux distribution. A unique blend for incomparable HPC performance."));
+ ' ',
+ N("<b>Multi Network Firewall</b>: based on Linux 2.4 \"kernel secure\" to provide multi-VPN as well as multi-DMZ functionalities. It is the perfect high performance security solution."),
+ ' ',
+ N("<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined with the stability and easy-of-use of the world-famous Mandrake Linux distribution. A unique blend for incomparable HPC performance."));
diff --git a/perl-install/share/advertising/dwd-06.pl b/perl-install/share/advertising/dwd-06.pl
index 02ad3ccf5..475bf0ab3 100644
--- a/perl-install/share/advertising/dwd-06.pl
+++ b/perl-install/share/advertising/dwd-06.pl
@@ -13,5 +13,5 @@ $border = 10; #- for leftish text
@text = (N("Find all MandrakeSoft products <b>at MandrakeStore</b> - our full service e-commerce platform."),
' ',
N("Find out also support incidents if you have any problems, from standard to professional support, from 1 to 50 incidents, take the one which meets perfectly your needs!"),
- ' ',
- N("Stop by today at <b>www.mandrakestore.com</b>"));
+ ' ',
+ N("Stop by today at www.mandrakestore.com"));
diff --git a/perl-install/share/advertising/dwd-07.pl b/perl-install/share/advertising/dwd-07.pl
index a7d3db69c..f543e62e3 100644
--- a/perl-install/share/advertising/dwd-07.pl
+++ b/perl-install/share/advertising/dwd-07.pl
@@ -13,10 +13,10 @@ $border = 10; #- for leftish text
@text = ([ N("<b>Become a MandrakeClub member!</b>"), center => 1 ],
' ',
N("Take advantage of valuable benefits, products and services by joining Mandrake Club, such as:"),
- N(" - Full access to commercial applications"),
- N(" - Special download mirror list exclusively for MandrakeClub Members"),
- N(" - Voting for software to put in Mandrake Linux"),
- N(" - Special discounts for products and services at MandrakeStore"),
- N(" - Plus much more"),
- ' ',
- N("For more information, please visit <b>www.mandrakeclub.com</b>"));
+ N(" - Full access to commercial applications"),
+ N(" - Special download mirror list exclusively for MandrakeClub Members"),
+ N(" - Voting for software to put in Mandrake Linux"),
+ N(" - Special discounts for products and services at MandrakeStore"),
+ N(" - Plus much more"),
+ ' ',
+ N("For more information, please visit www.mandrakeclub.com"));
diff --git a/perl-install/share/advertising/dwd-08.pl b/perl-install/share/advertising/dwd-08.pl
index d2bb67265..2d42cb9a6 100644
--- a/perl-install/share/advertising/dwd-08.pl
+++ b/perl-install/share/advertising/dwd-08.pl
@@ -14,5 +14,5 @@ $border = 10; #- for leftish text
@text = (N("Do you require assistance?"),
' ',
N("<b>MandrakeExpert</b> is the primary source for technical support."),
- ' ',
- N("If you have Linux questions, subscribe to MandrakeExpert at <b>www.mandrakeexpert.com</b>"));
+ ' ',
+ N("If you have Linux questions, subscribe to MandrakeExpert at www.mandrakeexpert.com"));
diff --git a/perl-install/share/advertising/dwd-09.pl b/perl-install/share/advertising/dwd-09.pl
index e5d880a9c..7abd367e2 100644
--- a/perl-install/share/advertising/dwd-09.pl
+++ b/perl-install/share/advertising/dwd-09.pl
@@ -12,6 +12,6 @@ $border = 10; #- for leftish text
@text = ([ N("<b>Note</b>"), center => 1 ],
' ',
- N("This is the Mandrake Linux \"Download version\"."),
- ' ',
- N("The free download version does not include commercial software, and therefore may not work with certain proprietary network cards and video cards such as NVIDIA(r) nForce. To avoid possible compatibiity issues with these devices, we recommend the purchase of one of our retail products that includes commercial drivers and additional software."));
+ N("This is the Mandrake Linux \"Download version\"."),
+ ' ',
+ N("The free download version does not include commercial software, and therefore may not work with certain proprietary network cards and video cards such as NVIDA(r) nForce. To avoid possible compatibiity issues with these devices, we recommend the purchase of one of our retail products that includes commercial drivers and additional software."));
diff --git a/perl-install/share/advertising/ppp-01.pl b/perl-install/share/advertising/ppp-01.pl
index 006ffaac9..71c7580f0 100644
--- a/perl-install/share/advertising/ppp-01.pl
+++ b/perl-install/share/advertising/ppp-01.pl
@@ -12,8 +12,8 @@ $border = 10; #- for leftish text
@text = ([ N("<b>Congratulations for choosing Mandrake Linux!</b>"), center => 1 ],
' ',
- N("Welcome to the Open Source world!"),
- ' ',
- N("Your new Mandrake Linux distribution and its many applications are the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world."),
- ' ',
- N("We would like to thank everyone who participated in the development of this latest release."));
+ N("Welcome to the Open Source world!"),
+ ' ',
+ N("Your new Mandrake Linux distribution and its many applications are the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world."),
+ ' ',
+ N("We would like to thank everyone who participated in the development of this latest release."));
diff --git a/perl-install/share/advertising/ppp-02.pl b/perl-install/share/advertising/ppp-02.pl
index f5ef4d868..6c9eb25d5 100644
--- a/perl-install/share/advertising/ppp-02.pl
+++ b/perl-install/share/advertising/ppp-02.pl
@@ -12,6 +12,6 @@ $border = 10; #- for leftish text
@text = ([ N("<b>PowerPack+</b>"), center => 1 ],
' ',
- N("PowerPack+ is a full-featured Linux solution for small to medium-sized networks. PowerPack+ increases the value of the standard PowerPack by adding a comprehensive selection of world-class server applications."),
- ' ',
- N("It is the only Mandrake Linux product that includes the groupware solution."));
+ N("PowerPack+ is a full-featured Linux solution for small to medium-sized networks. PowerPack+ increases the value of the standard PowerPack by adding a comprehensive selection of world-class server applications."),
+ ' ',
+ N("It is the only Mandrake Linux product that includes the groupware solution."));
diff --git a/perl-install/share/advertising/ppp-03.pl b/perl-install/share/advertising/ppp-03.pl
index 833a61909..5642d6120 100644
--- a/perl-install/share/advertising/ppp-03.pl
+++ b/perl-install/share/advertising/ppp-03.pl
@@ -12,4 +12,4 @@ $border = 10; #- for leftish text
@text = ([ N("<b>Choose your graphical Desktop environment!</b>"), center => 1 ],
' ',
- N("When you log into your Mandrake Linux system for the first time, you can choose between several popular graphical desktops environments, including: KDE, GNOME, WindowMaker, IceWM, and others."));
+ N("When you log into your Mandrake Linux system for the first time, you can choose between several popular graphical desktops environments, including: KDE, GNOME, WindowMaker, IceWM, and others."));
diff --git a/perl-install/share/advertising/ppp-04.pl b/perl-install/share/advertising/ppp-04.pl
index 25858cc94..ade8962af 100644
--- a/perl-install/share/advertising/ppp-04.pl
+++ b/perl-install/share/advertising/ppp-04.pl
@@ -13,9 +13,9 @@ $border = 10; #- for leftish text
@text = (N("In the Mandrake Linux menu you will find easy-to-use applications for all tasks:"),
' ',
N(" - Create, edit and share office documents with <b>OpenOffice.org</b>"),
- N(" - Take charge of your personal data with the integrated personal information suites: <b>Kontact</b> and <b>Evolution</b>"),
- N(" - Browse the Web with <b>Mozilla and Konqueror</b>"),
- N(" - Participate in online chat with <b>Kopete</b>"),
- N(" - Listen to audio CDs and music files with KsCD and <b>Totem</b>"),
- N(" - Edit images and photos with <b>The Gimp</b>"),
- N(" - Plus much more"));
+ N(" - Take charge of your personal data with the integrated personal information suites: <b>Kontact</b> and <b>Evolution</b>"),
+ N(" - Browse the Web with <b>Mozilla and Konqueror</b>"),
+ N(" - Participate in online chat with <b>Kopete</b>"),
+ N(" - Listen to audio CDs and music files with KsCD and <b>Totem</b>"),
+ N(" - Edit images and photos with <b>The Gimp</b>"),
+ N(" - Plus much more"));
diff --git a/perl-install/share/advertising/ppp-05.pl b/perl-install/share/advertising/ppp-05.pl
index a16114aa9..aeb802053 100644
--- a/perl-install/share/advertising/ppp-05.pl
+++ b/perl-install/share/advertising/ppp-05.pl
@@ -12,9 +12,9 @@ $border = 10; #- for leftish text
@text = (N("PowerPack+ includes everything needed for developing and creating your own software, including:"),
' ',
- N(" - <b>Kdevelop</b>: a full featured, easy to use Integrated Development Environment for C++ programming"),
- N(" - <b>GCC</b>: the GNU Compiler Collection"),
- N(" - <b>GDB</b>: the GNU Project debugger"),
- N(" - <b>Emacs</b>: a customizable and real time display editor"),
- N(" - <b>Xemacs</b>: open source text editor and application development system"),
- N(" - <b>Vim</b>: advanced text editor with more features than standard Vi"));
+ N(" - <b>Kdevelop</b>: a full featured, easy to use Integrated Development Environment for C++ programming"),
+ N(" - <b>GCC</b>: the GNU Compiler Collection"),
+ N(" - <b>GDB</b>: the GNU Project debugger"),
+ N(" - <b>Emacs</b>: a customizable and real time display editor"),
+ N(" - <b>Xemacs</b>: open source text editor and application development system"),
+ N(" - <b>Vim</b>: advanced text editor with more features than standard Vi"));
diff --git a/perl-install/share/advertising/ppp-06.pl b/perl-install/share/advertising/ppp-06.pl
index ea01c9245..4c4cee7c2 100644
--- a/perl-install/share/advertising/ppp-06.pl
+++ b/perl-install/share/advertising/ppp-06.pl
@@ -12,8 +12,8 @@ $border = 10; #- for leftish text
@text = ([ N("<b>Discover the full-featured groupware solution!</b>"), center => 1 ],
' ',
- N("It includes both server and client features for:"),
- N(" - Sending and receiving emails"),
- N(" - Calendar, Task List, Memos, Contacts, Meeting Request (sending and receiving), Task Requests (sending and receiving)"),
- N(" - Address Book (server and client)"),
- N(" - Plus much more"));
+ N("It includes both server and client features for:"),
+ N(" - Sending and receiving emails"),
+ N(" - Calendar, Task List, Memos, Contacts, Meeting Request (sending and receiving), Task Requests (sending and receiving)"),
+ N(" - Address Book (server and client)"),
+ N(" - Plus much more"));
diff --git a/perl-install/share/advertising/ppp-07.pl b/perl-install/share/advertising/ppp-07.pl
index c99ccd29b..314af75ad 100644
--- a/perl-install/share/advertising/ppp-07.pl
+++ b/perl-install/share/advertising/ppp-07.pl
@@ -13,8 +13,8 @@ $border = 10; #- for leftish text
@text = (N("Empower your business network with premier server solutions including:"),
' ',
N(" - Samba: File and print services for MS-Windows clients"),
- N(" - Apache: The most widely used Web server"),
- N(" - MySQL: The world's most popular Open Source database"),
- N(" - CVS: Concurrent Versions System, the dominant open-source network-transparent version control system"),
- N(" - ProFTPD: the highly configurable GPL-licensed FTP server software"),
- N(" - And others"));
+ N(" - Apache: The most widely used Web server"),
+ N(" - MySQL: The world's most popular Open Source database"),
+ N(" - CVS: Concurrent Versions System, the dominant open-source network-transparent version control system"),
+ N(" - ProFTPD: the highly configurable GPL-licensed FTP server software"),
+ N(" - And others"));
diff --git a/perl-install/share/advertising/ppp-08.pl b/perl-install/share/advertising/ppp-08.pl
index 9ad45745c..78bb86892 100644
--- a/perl-install/share/advertising/ppp-08.pl
+++ b/perl-install/share/advertising/ppp-08.pl
@@ -12,6 +12,6 @@ $border = 10; #- for leftish text
@text = ([ N("<b>Mandrake Control Center</b>"), center => 1 ],
' ',
- N("The Mandrake Control Center is an essential collection of Mandrake-specific utilities for simplifying the configuration of your computer."),
- ' ',
- N("You will immediately appreciate this collection of handy utilities for easily configuring hardware devices, defining mount points, setting up Network and Internet, adjusting the security level of your computer, and just about everything related to the system."));
+ N("The Mandrake Control Center is an essential collection of Mandrake-specific utilities for simplifying the configuration of your computer."),
+ ' ',
+ N("You will immediately appreciate this collection of handy utilities for easily configuring hardware devices, defining mount points, setting up Network and Internet, adjusting the security level of your computer, and just about everything related to the system."));
diff --git a/perl-install/share/advertising/ppp-09.pl b/perl-install/share/advertising/ppp-09.pl
index 0d897b9f0..aab862418 100644
--- a/perl-install/share/advertising/ppp-09.pl
+++ b/perl-install/share/advertising/ppp-09.pl
@@ -12,4 +12,4 @@ $border = 10; #- for leftish text
@text = (N("Find all MandrakeSoft products and services at MandrakeStore -- our full service e-commerce platform."),
' ',
- N("Stop by today at <b>www.mandrakestore.com</b>"));
+ N("Stop by today at <b>www.mandrakestore.com</b>"));
diff --git a/perl-install/share/advertising/pwp-01.pl b/perl-install/share/advertising/pwp-01.pl
index d6ca9ea49..94dd285cd 100644
--- a/perl-install/share/advertising/pwp-01.pl
+++ b/perl-install/share/advertising/pwp-01.pl
@@ -3,12 +3,17 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = N("Congratulations for choosing Mandrake Linux!");
+# Use <b>text</b> for bold
-@text = (N("Welcome to the Open Source world!"),
- '',
- N("Your new Mandrake Linux distribution is the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world."),
- '',
- N("We would like to thank everyone who participated in the development of our latest release."));
+# @text = ([ N("text to display"), center => 1 ],
+
+@text = ([ N("<b>Congratulations for choosing Mandrake Linux!</b>"), center => 1 ],
+ ' ',
+ N("Welcome to the Open Source world!"),
+ ' ',
+ N("Your new Mandrake Linux distribution is the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world."),
+ ' ',
+ N("We would like to thank everyone who participated in the development of our latest release."));
diff --git a/perl-install/share/advertising/pwp-02.pl b/perl-install/share/advertising/pwp-02.pl
index f9e2a905d..55a21b907 100644
--- a/perl-install/share/advertising/pwp-02.pl
+++ b/perl-install/share/advertising/pwp-02.pl
@@ -3,8 +3,13 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = N("PowerPack");
+# Use <b>text</b> for bold
-@text = (N("PowerPack is MandrakeSoft's premier Linux desktop product. In addition to being the easiest and the most user-friendly Linux distribution, PowerPack includes thousands of applications - everything from the most popular to the most technical."));
+# @text = ([ N("text to display"), center => 1 ],
+
+@text = ([ N("<b>PowerPack</b>"), center => 1 ],
+ ' ',
+ N("PowerPack is MandrakeSoft's premier Linux desktop product. In addition to being the easiest and the most user-friendly Linux distribution, PowerPack includes thousands of applications - everything from the most popular to the most technical."));
diff --git a/perl-install/share/advertising/pwp-03.pl b/perl-install/share/advertising/pwp-03.pl
index 5b52c5055..5642d6120 100644
--- a/perl-install/share/advertising/pwp-03.pl
+++ b/perl-install/share/advertising/pwp-03.pl
@@ -3,8 +3,13 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = N("Choose your graphical Desktop environment!");
+# Use <b>text</b> for bold
-@text = (N("When you log into your Mandrake Linux system for the first time, you can choose between several popular graphical desktops environments, including: KDE, GNOME, WindowMaker, IceWM, and others."));
+# @text = ([ N("text to display"), center => 1 ],
+
+@text = ([ N("<b>Choose your graphical Desktop environment!</b>"), center => 1 ],
+ ' ',
+ N("When you log into your Mandrake Linux system for the first time, you can choose between several popular graphical desktops environments, including: KDE, GNOME, WindowMaker, IceWM, and others."));
diff --git a/perl-install/share/advertising/pwp-04.pl b/perl-install/share/advertising/pwp-04.pl
index 1188071ef..6287b58d6 100644
--- a/perl-install/share/advertising/pwp-04.pl
+++ b/perl-install/share/advertising/pwp-04.pl
@@ -3,15 +3,19 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = "";
+# Use <b>text</b> for bold
+
+# @text = ([ N("text to display"), center => 1 ],
@text = (N("In the Mandrake Linux menu you will find easy-to-use applications for all of your tasks:"),
- N(" * Create, edit and share office documents with OpenOffice.org"),
- N(" * Take charge of your personal data with the integrated personal information suites Kontact and Evolution"),
- N(" * Browse the Web with Mozilla and Konqueror"),
- N(" * Participate in online chat with Gaim"),
- N(" * Listen to audio CDs and music files with KsCD and Totem"),
- N(" * Edit images and photos with The Gimp"),
- N(" * Plus much more"));
+ ' ',
+ N(" - Create, edit and share office documents with <b>OpenOffice.org</b>"),
+ N(" - Take charge of your personal data with the integrated personal information suites <b>Kontact</b> and <b>Evolution</b>"),
+ N(" - Browse the Web with <b>Mozilla and Konqueror</b>"),
+ N(" - Participate in online chat with <b>Gaim</b>"),
+ N(" - Listen to audio CDs and music files with KsCD and <b>Totem</b>"),
+ N(" - Edit images and photos with <b>The Gimp</b>"),
+ N(" - Plus much more"));
diff --git a/perl-install/share/advertising/pwp-05.pl b/perl-install/share/advertising/pwp-05.pl
index 9633c3314..e12965c08 100644
--- a/perl-install/share/advertising/pwp-05.pl
+++ b/perl-install/share/advertising/pwp-05.pl
@@ -3,11 +3,16 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = N("Development tools");
+# Use <b>text</b> for bold
-@text = (N("PowerPack includes everything needed for developing and creating your own software, including:"),
- N(" * Kdevelop: a full featured, easy to use Integrated Development Environment for C++ programming"),
- N(" * GCC: the GNU Compiler Collection"),
- N(" * GDB: the GNU Project debugger"));
+# @text = ([ N("text to display"), center => 1 ],
+
+@text = ([ N("<b>Development tools</b>"), center => 1 ],
+ ' ',
+ N("PowerPack includes everything needed for developing and creating your own software, including:"),
+ N(" - <b>Kdevelop:</b> a full featured, easy to use Integrated Development Environment for C++ programming"),
+ N(" - <b>GCC:</b> the GNU Compiler Collection"),
+ N(" - <b>GDB:</b> the GNU Project debugger"));
diff --git a/perl-install/share/advertising/pwp-06.pl b/perl-install/share/advertising/pwp-06.pl
index 324d5c744..db6f92d76 100644
--- a/perl-install/share/advertising/pwp-06.pl
+++ b/perl-install/share/advertising/pwp-06.pl
@@ -3,11 +3,16 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = N("Development tools");
+# Use <b>text</b> for bold
-@text = (N("And of course the editors!"),
- N(" * Emacs: a customizable and real time display editor"),
- N(" * Xemacs: another open source text editor and application development system"),
- N(" * Vim: an advanced text editor with more features than standard Vi"));
+# @text = ([ N("text to display"), center => 1 ]
+
+@text = ([ N("<b>Development tools</b>"), center => 1 ],
+ ' ',
+ N("And of course the editors!"),
+ N(" - <b>Emacs:</b> a customizable and real time display editor"),
+ N(" - <b>Xemacs:</b> another open source text editor and application development system"),
+ N(" - <b>Vim:</b> an advanced text editor with more features than standard Vi"));
diff --git a/perl-install/share/advertising/pwp-07.pl b/perl-install/share/advertising/pwp-07.pl
index 5a7226414..ddec8dc1c 100644
--- a/perl-install/share/advertising/pwp-07.pl
+++ b/perl-install/share/advertising/pwp-07.pl
@@ -3,10 +3,15 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = N("Mandrake Control Center");
+# Use <b>text</b> for bold
-@text = (N("The Mandrake Control Center is an essential collection of Mandrake-specific utilities for simplifying the configuration of your computer."),
- '',
- N("You will immediately appreciate this collection of handy utilities for easily configuring hardware devices, defining mount points, setting up Network and Internet, adjusting the security level of your computer, and just about everything related to the system."));
+# @text = ([ N("text to display"), center => 1 ],
+
+@text = ([ N("<b>Mandrake Control Center</b>"), center => 1 ],
+ ' ',
+ N("The Mandrake Control Center is an essential collection of Mandrake-specific utilities for simplifying the configuration of your computer."),
+ ' ',
+ N("You will immediately appreciate this collection of handy utilities for easily configuring hardware devices, defining mount points, setting up Network and Internet, adjusting the security level of your computer, and just about everything related to the system."));
diff --git a/perl-install/share/advertising/pwp-08.pl b/perl-install/share/advertising/pwp-08.pl
index 9f0db699d..bd2b707aa 100644
--- a/perl-install/share/advertising/pwp-08.pl
+++ b/perl-install/share/advertising/pwp-08.pl
@@ -3,10 +3,13 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = "";
+# Use <b>text</b> for bold
-@text = (N("Find all MandrakeSoft products and services at MandrakeStore -- our full service e-commerce platform."),
- '',
- N("Stop by today at www.mandrakestore.com"));
+# @text = ([ N("text to display"), center => 1 ],
+
+@text = (N("Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our full service e-commerce platform."),
+ ' ',
+ N("Stop by today at <b>www.mandrakestore.com</b>"));
diff --git a/perl-install/share/advertising/pwp-09.pl b/perl-install/share/advertising/pwp-09.pl
index adc2ee769..8d91e2553 100644
--- a/perl-install/share/advertising/pwp-09.pl
+++ b/perl-install/share/advertising/pwp-09.pl
@@ -3,17 +3,20 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = "";
+# Use <b>text</b> for bold
-@text = (N("Become a MandrakeClub member!"),
- '',
- N("Take advantage of valuable benefits, products and services by joining MandrakeClub, such as:"),
- N(" - Full access to commercial applications"),
- N(" - Special download mirror list exclusively for MandrakeClub Members"),
- N(" - Voting for software to put in Mandrake Linux"),
- N(" - Special discounts for products and services at MandrakeStore"),
- N(" - Plus much more"),
- '',
- N("For more information, please visit www.mandrakeclub.com"));
+# @text = ([ N("text to display"), center => 1 ],
+
+@text = (N("Become a <b>MandrakeClub</b> member!"),
+ ' ',
+ N("Take advantage of valuable benefits, products and services by joining MandrakeClub, such as:"),
+ N(" - Full access to commercial applications"),
+ N(" - Special download mirror list exclusively for MandrakeClub Members"),
+ N(" - Voting for software to put in Mandrake Linux"),
+ N(" - Special discounts for products and services at MandrakeStore"),
+ N(" - Plus much more"),
+ ' ',
+ N("For more information, please visit <b>www.mandrakeclub.com</b>"));
diff --git a/perl-install/share/advertising/pwp-10.pl b/perl-install/share/advertising/pwp-10.pl
index b30ba8000..543502f61 100644
--- a/perl-install/share/advertising/pwp-10.pl
+++ b/perl-install/share/advertising/pwp-10.pl
@@ -3,12 +3,15 @@
$width = 556;
$height = 303;
-$y_start = 80;
+$y_start = 10;
+$border = 10; #- for leftish text
-$title = "";
+# Use <b>text</b> for bold
+
+# @text = ([ N("text to display"), center => 1 ],
@text = (N("Do you require assistance?"),
- '',
- N("MandrakeExpert is the primary source for technical support."),
- '',
- N("If you have Linux questions, subscribe to MandrakeExpert at www.mandrakeexpert.com"));
+ ' ',
+ N("<b>MandrakeExpert</b> is the primary source for technical support."),
+ ' ',
+ N("If you have Linux questions, subscribe to MandrakeExpert at <b>www.mandrakeexpert.com</b>"));