s/Mandrivalinux/Mandriva Linux/

18 files changed, 41 insertions, 41 deletions

diff --git a/perl-install/share/advertising/01.pl b/perl-install/share/advertising/01.pl
index 21dba375d..80ea97273 100644
--- a/perl-install/share/advertising/01.pl
+++ b/perl-install/share/advertising/01.pl
@@ -10,10 +10,10 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>What is Mandrivalinux?</b>"), center => 1 ],
+@text = ([ N("<b>What is Mandriva Linux?</b>"), center => 1 ],
          ' ',
-	 N("Welcome to <b>Mandrivalinux</b>!"),
+	 N("Welcome to <b>Mandriva Linux</b>!"),
 		 ' ',
-         N("Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the system, called the <b>operating system</b> (based on the Linux kernel) together with <b>a lot of applications</b> meeting every need you could even think of."),
+         N("Mandriva Linux is a <b>Linux distribution</b> that comprises the core of the system, called the <b>operating system</b> (based on the Linux kernel) together with <b>a lot of applications</b> meeting every need you could even think of."),
          ' ',
-         N("Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It is also one of the <b>most widely used</b> Linux distributions worldwide!"));
\ No newline at end of file
+         N("Mandriva Linux is the most <b>user-friendly</b> Linux distribution today. It is also one of the <b>most widely used</b> Linux distributions worldwide!"));
diff --git a/perl-install/share/advertising/02.pl b/perl-install/share/advertising/02.pl
index bd137f43b..39acc4f07 100644
--- a/perl-install/share/advertising/02.pl
+++ b/perl-install/share/advertising/02.pl
@@ -14,6 +14,6 @@ $border = 10;  #- for leftish text
          ' ',
 	 N("Welcome to the <b>world of open source</b>!"),
 		 ' ',
-         N("Mandrivalinux is committed to the open source model. This means that this new release is the result of <b>collaboration</b> between <b>Mandriva's team of developers</b> and the <b>worldwide community</b> of Mandrivalinux contributors."),
+         N("Mandriva Linux is committed to the open source model. This means that this new release is the result of <b>collaboration</b> between <b>Mandriva's team of developers</b> and the <b>worldwide community</b> of Mandriva Linux contributors."),
          ' ',
-         N("We would like to <b>thank</b> everyone who participated in the development of this latest release."));
\ No newline at end of file
+         N("We would like to <b>thank</b> everyone who participated in the development of this latest release."));
diff --git a/perl-install/share/advertising/03.pl b/perl-install/share/advertising/03.pl
index 4dc4e887d..db196895f 100644
--- a/perl-install/share/advertising/03.pl
+++ b/perl-install/share/advertising/03.pl
@@ -12,8 +12,8 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>The GPL</b>"), center => 1 ],
          ' ',
-	 N("Most of the software included in the distribution and all of the Mandrivalinux tools are licensed under the <b>General Public License</b>."),
+	 N("Most of the software included in the distribution and all of the Mandriva Linux tools are licensed under the <b>General Public License</b>."),
 		 ' ',
          N("The GPL is at the heart of the open source model; it grants everyone the <b>freedom</b> to use, study, distribute and improve the software any way they want, provided they make the results available."),
          ' ',
-         N("The main benefit of this is that the number of developers is virtually <b>unlimited</b>, resulting in <b>very high quality</b> software."));
\ No newline at end of file
+         N("The main benefit of this is that the number of developers is virtually <b>unlimited</b>, resulting in <b>very high quality</b> software."));
diff --git a/perl-install/share/advertising/04.pl b/perl-install/share/advertising/04.pl
index 619b56784..f24a655a3 100644
--- a/perl-install/share/advertising/04.pl
+++ b/perl-install/share/advertising/04.pl
@@ -12,6 +12,6 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Join the Community</b>"), center => 1 ],
          ' ',
-	 N("Mandrivalinux has one of the <b>biggest communities</b> of users and developers. The role of such a community is very wide, ranging from bug reporting to the development of new applications. The community plays a <b>key role</b> in the Mandrivalinux world."),
+	 N("Mandriva Linux has one of the <b>biggest communities</b> of users and developers. The role of such a community is very wide, ranging from bug reporting to the development of new applications. The community plays a <b>key role</b> in the Mandriva Linux world."),
 		 ' ',
-         N("To <b>learn more</b> about our dynamic community, please visit <b>www.mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel.php3</b> if you would like to get <b>involved</b> in the development."));
\ No newline at end of file
+         N("To <b>learn more</b> about our dynamic community, please visit <b>www.mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel.php3</b> if you would like to get <b>involved</b> in the development."));
diff --git a/perl-install/share/advertising/05.pl b/perl-install/share/advertising/05.pl
index e00ee15a5..ccfe50956 100644
--- a/perl-install/share/advertising/05.pl
+++ b/perl-install/share/advertising/05.pl
@@ -14,7 +14,7 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Download Version</b>"), center => 1 ],
          ' ',
-	 N("You are now installing <b>Mandrivalinux Download</b>. This is the free version that Mandriva wants to keep <b>available to everyone</b>."),
+	 N("You are now installing <b>Mandriva Linux Download</b>. This is the free version that Mandriva wants to keep <b>available to everyone</b>."),
 		 ' ',
          N("The Download version <b>cannot include</b> all the software that is not open source. Therefore, you will not find in the Download version:"),
 	 N("	* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."),
diff --git a/perl-install/share/advertising/06.pl b/perl-install/share/advertising/06.pl
index a08f66b6c..49daf9f9f 100644
--- a/perl-install/share/advertising/06.pl
+++ b/perl-install/share/advertising/06.pl
@@ -12,6 +12,6 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Discovery, Your First Linux Desktop</b>"), center => 1 ],
          ' ',
-	 N("You are now installing <b>Mandrivalinux Discovery</b>."),
+	 N("You are now installing <b>Mandriva Linux Discovery</b>."),
 		 ' ',
-         N("Discovery is the <b>easiest</b> and most <b>user-friendly</b> Linux distribution. It includes a hand-picked selection of <b>premium software</b> for office, multimedia and Internet activities. Its menu is task-oriented, with a single application per task."));
\ No newline at end of file
+         N("Discovery is the <b>easiest</b> and most <b>user-friendly</b> Linux distribution. It includes a hand-picked selection of <b>premium software</b> for office, multimedia and Internet activities. Its menu is task-oriented, with a single application per task."));
diff --git a/perl-install/share/advertising/07.pl b/perl-install/share/advertising/07.pl
index aa32ac02a..8553e3d73 100644
--- a/perl-install/share/advertising/07.pl
+++ b/perl-install/share/advertising/07.pl
@@ -12,6 +12,6 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>PowerPack, The Ultimate Linux Desktop</b>"), center => 1 ],
 	' ',
-	N("You are now installing <b>Mandrivalinux PowerPack</b>."),
+	N("You are now installing <b>Mandriva Linux PowerPack</b>."),
 	' ',
-	N("PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack includes <b>thousands of applications</b> - everything from the most popular to the most advanced."));
\ No newline at end of file
+	N("PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack includes <b>thousands of applications</b> - everything from the most popular to the most advanced."));
diff --git a/perl-install/share/advertising/08.pl b/perl-install/share/advertising/08.pl
index a006eaeb9..c041aeb7a 100644
--- a/perl-install/share/advertising/08.pl
+++ b/perl-install/share/advertising/08.pl
@@ -12,6 +12,6 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"), center => 1 ],
 	' ',
-	N("You are now installing <b>Mandrivalinux PowerPack+</b>."),
+	N("You are now installing <b>Mandriva Linux PowerPack+</b>."),
 	' ',
-	N("PowerPack+ is a <b>full-featured Linux solution</b> for small to medium-sized <b>networks</b>. PowerPack+ includes thousands of <b>desktop applications</b> and a comprehensive selection of world-class <b>server applications</b>."));
\ No newline at end of file
+	N("PowerPack+ is a <b>full-featured Linux solution</b> for small to medium-sized <b>networks</b>. PowerPack+ includes thousands of <b>desktop applications</b> and a comprehensive selection of world-class <b>server applications</b>."));
diff --git a/perl-install/share/advertising/09.pl b/perl-install/share/advertising/09.pl
index bc51ed0c5..e336c8544 100644
--- a/perl-install/share/advertising/09.pl
+++ b/perl-install/share/advertising/09.pl
@@ -12,10 +12,10 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Mandriva Products</b>"), center => 1 ],
 	' ',
-	N("<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."),
+	N("<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."),
 	' ',
-	N("The Mandrivalinux products are:"),
+	N("The Mandriva Linux products are:"),
 	N("	* <b>Discovery</b>, Your First Linux Desktop."),
 	N("	* <b>PowerPack</b>, The Ultimate Linux Desktop."),
 	N("	* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."),
-	N("	* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making the most of your 64-bit processor."));
+	N("	* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making the most of your 64-bit processor."));
diff --git a/perl-install/share/advertising/10.pl b/perl-install/share/advertising/10.pl
index 91088e020..95f2453ec 100644
--- a/perl-install/share/advertising/10.pl
+++ b/perl-install/share/advertising/10.pl
@@ -14,6 +14,6 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Mandriva Products (Nomad Products)</b>"), center => 1 ],
 	' ',
-	N("Mandriva has developed two products that allow you to use Mandrivalinux <b>on any computer</b> and without any need to actually install it:"),
-	N("	* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a bootable CD-ROM."),
-	N("	* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the ultra-compact “LaCie Mobile Hard Drive”."));
+	N("Mandriva has developed two products that allow you to use Mandriva Linux <b>on any computer</b> and without any need to actually install it:"),
+	N("	* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a bootable CD-ROM."),
+	N("	* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the ultra-compact “LaCie Mobile Hard Drive”."));
diff --git a/perl-install/share/advertising/11.pl b/perl-install/share/advertising/11.pl
index ed0eefa34..8a9fdd53f 100644
--- a/perl-install/share/advertising/11.pl
+++ b/perl-install/share/advertising/11.pl
@@ -13,6 +13,6 @@ $border = 10;  #- for leftish text
 @text = ([ N("<b>Mandriva Products (Professional Solutions)</b>"), center => 1 ],
 	' ',
 	N("Below are the Mandriva products designed to meet the <b>professional needs</b>:"),
-	N("	* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."),
-	N("	* <b>Corporate Server</b>, The Mandrivalinux Server Solution."),
-	N("	* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."));
\ No newline at end of file
+	N("	* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."),
+	N("	* <b>Corporate Server</b>, The Mandriva Linux Server Solution."),
+	N("	* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."));
diff --git a/perl-install/share/advertising/18.pl b/perl-install/share/advertising/18.pl
index 0ff5f7ce0..845af3f0d 100644
--- a/perl-install/share/advertising/18.pl
+++ b/perl-install/share/advertising/18.pl
@@ -12,7 +12,7 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Enjoy the Wide Range of Applications</b>"), center => 1 ],
 	' ',
-	N("In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for <b>all of your tasks</b>:"),
+	N("In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for <b>all of your tasks</b>:"),
 	N("	* Create, edit and share office documents with <b>OpenOffice.org</b>."),
 	N("	* Manage 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>."),
diff --git a/perl-install/share/advertising/25.pl b/perl-install/share/advertising/25.pl
index 69cd49cc3..914f34f45 100644
--- a/perl-install/share/advertising/25.pl
+++ b/perl-install/share/advertising/25.pl
@@ -10,8 +10,8 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Mandrivalinux Control Center</b>"), center => 1 ],
+@text = ([ N("<b>Mandriva Linux Control Center</b>"), center => 1 ],
 	' ',
-	N("The <b>Mandrivalinux Control Center</b> is an essential collection of Mandrivalinux-specific utilities designed to simplify the configuration of your computer."),
+	N("The <b>Mandriva Linux Control Center</b> is an essential collection of Mandriva Linux-specific utilities designed to simplify the configuration of your computer."),
 	' ',
-	N("You will immediately appreciate this collection of <b>more than 60</b> handy utilities for <b>easily configuring your system</b>: hardware devices, mount points, network and Internet, security level of your computer, etc."));
\ No newline at end of file
+	N("You will immediately appreciate this collection of <b>more than 60</b> handy utilities for <b>easily configuring your system</b>: hardware devices, mount points, network and Internet, security level of your computer, etc."));
diff --git a/perl-install/share/advertising/26.pl b/perl-install/share/advertising/26.pl
index c43d69e89..730d08868 100644
--- a/perl-install/share/advertising/26.pl
+++ b/perl-install/share/advertising/26.pl
@@ -12,4 +12,4 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>The Open Source Model</b>"), center => 1 ],
 	' ',
-	N("Like all computer programming, open source software <b>requires time and people</b> for development. In order to respect the open source philosophy, Mandriva sells added value products and services to <b>keep improving Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> and the development of Mandrivalinux, <b>please</b> consider buying one of our products or services!"));
\ No newline at end of file
+	N("Like all computer programming, open source software <b>requires time and people</b> for development. In order to respect the open source philosophy, Mandriva sells added value products and services to <b>keep improving Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> and the development of Mandriva Linux, <b>please</b> consider buying one of our products or services!"));
diff --git a/perl-install/share/advertising/27.pl b/perl-install/share/advertising/27.pl
index 359e8e54b..9a89fa3c5 100644
--- a/perl-install/share/advertising/27.pl
+++ b/perl-install/share/advertising/27.pl
@@ -18,4 +18,4 @@ $border = 10;  #- for leftish text
 	' ',
 	N("This platform has just been <b>redesigned</b> to improve its efficiency and usability."),
 	' ',
-	[ N("Stop by today at <b>store.mandrakesoft.com</b>!"), center => 1 ]);
\ No newline at end of file
+	[ N("Stop by today at <b>store.mandriva.com</b>!"), center => 1 ]);
diff --git a/perl-install/share/advertising/28.pl b/perl-install/share/advertising/28.pl
index a1108c3d8..407016442 100644
--- a/perl-install/share/advertising/28.pl
+++ b/perl-install/share/advertising/28.pl
@@ -14,11 +14,11 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Mandriva Club</b>"), center => 1 ],
 	' ',
-	N("<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux product.."),
+	N("<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux product.."),
 	' ',
 	N("Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"),
-	N("	* <b>Special discounts</b> on products and services of our online store <b>store.mandrakesoft.com</b>."),
+	N("	* <b>Special discounts</b> on products and services of our online store <b>store.mandriva.com</b>."),
 	N("	* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ drivers)."),
-	N("	* Participation in Mandrivalinux <b>user forums</b>."),
-	N("	* <b>Early and privileged access</b>, before public release, to Mandrivalinux <b>ISO images</b>."),
+	N("	* Participation in Mandriva Linux <b>user forums</b>."),
+	N("	* <b>Early and privileged access</b>, before public release, to Mandriva Linux <b>ISO images</b>."),
 	N("	* And many more."));
diff --git a/perl-install/share/advertising/29.pl b/perl-install/share/advertising/29.pl
index ad997d59e..82db30101 100644
--- a/perl-install/share/advertising/29.pl
+++ b/perl-install/share/advertising/29.pl
@@ -14,8 +14,8 @@ $border = 10;  #- for leftish text
 	' ',
 	N("<b>Mandriva Online</b> is a new premium service that Mandriva is proud to offer its customers!"),
 	' ',
-	N("Mandriva Online provides a wide range of valuable services for <b>easily updating</b> your Mandrivalinux systems:"),
+	N("Mandriva Online provides a wide range of valuable services for <b>easily updating</b> your Mandriva Linux systems:"),
 	N("	* <b>Perfect</b> system security (automated software updates)."),
 	N("	* <b>Notification</b> of updates (by e-mail or by an applet on the desktop)."),
 	N("	* Flexible <b>scheduled</b> updates."),
-	N("	* Management of <b>all your Mandrivalinux systems</b> with one account."));
\ No newline at end of file
+	N("	* Management of <b>all your Mandriva Linux systems</b> with one account."));
diff --git a/perl-install/share/advertising/30.pl b/perl-install/share/advertising/30.pl
index 650c04833..f0fe6c1c3 100644
--- a/perl-install/share/advertising/30.pl
+++ b/perl-install/share/advertising/30.pl
@@ -12,8 +12,8 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Mandriva Expert</b>"), center => 1 ],
 	' ',
-	N("Do you require <b>assistance?</b> Meet Mandriva's technical experts on <b>our technical support platform</b> www.mandrakeexpert.com."),
+	N("Do you require <b>assistance?</b> Meet Mandriva's technical experts on <b>our technical support platform</b> www.mandrivaexpert.com."),
 	' ',
-	N("Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save a lot of time."),
+	N("Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save a lot of time."),
 	' ',
-	N("For any question related to Mandrivalinux, you have the possibility to purchase support incidents at <b>store.mandrakesoft.com</b>."));
\ No newline at end of file
+	N("For any question related to Mandriva Linux, you have the possibility to purchase support incidents at <b>store.mandriva.com</b>."));