15 files changed, 37 insertions, 37 deletions
diff --git a/perl-install/share/advertising/dis-08.pl b/perl-install/share/advertising/dis-08.pl
index ec0a211cc..957bae386 100644
--- a/perl-install/share/advertising/dis-08.pl
+++ b/perl-install/share/advertising/dis-08.pl
@@ -10,8 +10,8 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Mandrake Control Center</b>"), center => 1 ],
+@text = ([ N("<b>Mandrakelinux 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("The Mandrakelinux Control Center is an essential collection of Mandrakelinux-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 30e4b19bb..91ba6d117 100644
--- a/perl-install/share/advertising/dis-09.pl
+++ b/perl-install/share/advertising/dis-09.pl
@@ -10,8 +10,8 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>MandrakeStore</b>"), center => 1 ],
+@text = ([ N("<b>Mandrakestore</b>"), center => 1 ],
         ' ',
-        N("Find all Mandrakesoft products and services at <b>MandrakeStore</b> -- our full service e-commerce platform."),
+        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/dis-10.pl b/perl-install/share/advertising/dis-10.pl
index e0f574c6d..5d9d958f1 100644
--- a/perl-install/share/advertising/dis-10.pl
+++ b/perl-install/share/advertising/dis-10.pl
@@ -10,13 +10,13 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("Become a <b>MandrakeClub</b> member!"), center => 1 ],
+@text = ([ N("Become a <b>Mandrakeclub</b> member!"), center => 1 ],
         ' ',
-	N("Take advantage of valuable benefits, products and services by joining MandrakeClub, such as:"),
+	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("	- Special download mirror list exclusively for Mandrakeclub Members"),
 	N("	- Voting for software to put in Mandrakelinux"),
-	N("	- Special discounts for products and services at MandrakeStore"),
+	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/dwd-04.pl b/perl-install/share/advertising/dwd-04.pl
index 002d36dd6..922499109 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("Mandrakelinux is widely known as the most user-friendly and the easiest to install and easy to use Linux distribution."),
          ' ',
          N("Find out about our <b>Personal Solutions</b>:"),
-	 N("	- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"),
+	 N("	- Find out Mandrakelinux 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-06.pl b/perl-install/share/advertising/dwd-06.pl
index 14e1ca4e8..1e7cb7fb7 100644
--- a/perl-install/share/advertising/dwd-06.pl
+++ b/perl-install/share/advertising/dwd-06.pl
@@ -10,9 +10,9 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>MandrakeStore</b>"), center => 1 ],
+@text = ([ N("<b>Mandrakestore</b>"), center => 1 ],
          ' ',
-         N("Find all Mandrakesoft products at <b>MandrakeStore</b> -- our full service e-commerce platform."),
+         N("Find all Mandrakesoft products and services at <b>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!"),
 	' ',
diff --git a/perl-install/share/advertising/dwd-07.pl b/perl-install/share/advertising/dwd-07.pl
index c30fb004a..e5bd40565 100644
--- a/perl-install/share/advertising/dwd-07.pl
+++ b/perl-install/share/advertising/dwd-07.pl
@@ -10,13 +10,13 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Become a MandrakeClub member!</b>"), center => 1 ],
+@text = ([ N("<b>Become a Mandrakeclub member!</b>"), center => 1 ],
         ' ',
-        N("Take advantage of valuable benefits, products and services by joining MandrakeClub, such as:"),
+        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("	- Special download mirror list exclusively for Mandrakeclub Members"),
 	N("	- Voting for software to put in Mandrakelinux"),
-	N("	- Special discounts for products and services at MandrakeStore"),
+	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/ppp-04.pl b/perl-install/share/advertising/ppp-04.pl
index 911dc5fe9..55c189add 100644
--- a/perl-install/share/advertising/ppp-04.pl
+++ b/perl-install/share/advertising/ppp-04.pl
@@ -10,11 +10,11 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = (N("In the Mandrakelinux menu you will find easy-to-use applications for all tasks:"),
+@text = (N("In the Mandrakelinux menu you will find easy-to-use applications for all of your 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("	- 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</b> and <b>Konqueror</b>"),
 	 N("	- Participate in online chat with <b>Kopete</b>"),
 	 N("	- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"),
 	 N("	- Edit images and photos with <b>The Gimp</b>"),
diff --git a/perl-install/share/advertising/ppp-05.pl b/perl-install/share/advertising/ppp-05.pl
index aeb802053..32e9bc7f3 100644
--- a/perl-install/share/advertising/ppp-05.pl
+++ b/perl-install/share/advertising/ppp-05.pl
@@ -16,5 +16,5 @@ $border = 10;  #- for leftish text
 	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>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/ppp-08.pl b/perl-install/share/advertising/ppp-08.pl
index 78bb86892..617cdcf35 100644
--- a/perl-install/share/advertising/ppp-08.pl
+++ b/perl-install/share/advertising/ppp-08.pl
@@ -10,8 +10,8 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Mandrake Control Center</b>"), center => 1 ],
+@text = ([ N("<b>Mandrakelinux 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("The Mandrakelinux Control Center is an essential collection of Mandrakelinux-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 20a9002ef..667cde781 100644
--- a/perl-install/share/advertising/ppp-09.pl
+++ b/perl-install/share/advertising/ppp-09.pl
@@ -10,8 +10,8 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>MandrakeStore</b>"), center => 1 ],
+@text = ([ N("<b>Mandrakestore</b>"), center => 1 ],
 	' ',
-	N("Find all Mandrakesoft products and services at <b>MandrakeStore</b> -- our full service e-commerce platform."),
+	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/ppp-10.pl b/perl-install/share/advertising/ppp-10.pl
index 1276fa8e7..462caee9c 100644
--- a/perl-install/share/advertising/ppp-10.pl
+++ b/perl-install/share/advertising/ppp-10.pl
@@ -10,14 +10,14 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("Become a <b>MandrakeClub</b> member!"), center => 1 ],
+@text = ([ N("Become a <b>Mandrakeclub</b> member!"), center => 1 ],
         ' ',
-	N("Take advantage of valuable benefits, products and services by joining MandrakeClub, such as:"),
+	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("	- Special download mirror list exclusively for Mandrakeclub Members"),
 	N("	- Voting for software to put in Mandrakelinux"),
-	N("	- Special discounts for products and services at MandrakeStore"),
+	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-04.pl b/perl-install/share/advertising/pwp-04.pl
index a96ff2096..55c189add 100644
--- a/perl-install/share/advertising/pwp-04.pl
+++ b/perl-install/share/advertising/pwp-04.pl
@@ -16,6 +16,6 @@ $border = 10;  #- for leftish text
 	 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</b> and <b>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("	- Listen to audio CDs and music files with <b>KsCD</b> 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-07.pl b/perl-install/share/advertising/pwp-07.pl
index ddec8dc1c..02deb8cce 100644
--- a/perl-install/share/advertising/pwp-07.pl
+++ b/perl-install/share/advertising/pwp-07.pl
@@ -10,8 +10,8 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Mandrake Control Center</b>"), center => 1 ],
+@text = ([ N("<b>Mandrakelinux 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("The Mandrakelinux Control Center is an essential collection of Mandrakelinux-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 abbc1c053..fe4edb604 100644
--- a/perl-install/share/advertising/pwp-08.pl
+++ b/perl-install/share/advertising/pwp-08.pl
@@ -10,8 +10,8 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>MandrakeStore</b>"), center => 1 ],
+@text = ([ N("<b>Mandrakestore</b>"), center => 1 ],
         ' ',
-	N("Find all Mandrakesoft products and services at <b>MandrakeStore</b> -- our full service e-commerce platform."),
+	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 f16aaeeaa..47d8c076f 100644
--- a/perl-install/share/advertising/pwp-09.pl
+++ b/perl-install/share/advertising/pwp-09.pl
@@ -10,13 +10,13 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("Become a <b>MandrakeClub</b> member!"), center => 1 ],
+@text = ([ N("Become a <b>Mandrakeclub</b> member!"), center => 1 ],
          ' ',
-	 N("Take advantage of valuable benefits, products and services by joining MandrakeClub, such as:"),
+	 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("	- Special download mirror list exclusively for Mandrakeclub Members"),
 	 N("	- Voting for software to put in Mandrakelinux"),
-	 N("	- Special discounts for products and services at MandrakeStore"),
+	 N("	- Special discounts for products and services at Mandrakestore"),
 	 N("	- Plus much more"),
 	 ' ',
 	 N("For more information, please visit <b>www.mandrakeclub.com</b>"));