switch from MandrakeSoft to Mandriva

20 files changed, 46 insertions, 46 deletions

diff --git a/perl-install/share/advertising/01.pl b/perl-install/share/advertising/01.pl
index 3c5fb7ec6..21dba375d 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 Mandrakelinux?</b>"), center => 1 ],
+@text = ([ N("<b>What is Mandrivalinux?</b>"), center => 1 ],
          ' ',
-	 N("Welcome to <b>Mandrakelinux</b>!"),
+	 N("Welcome to <b>Mandrivalinux</b>!"),
 		 ' ',
-         N("Mandrakelinux 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 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("Mandrakelinux 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("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
diff --git a/perl-install/share/advertising/02.pl b/perl-install/share/advertising/02.pl
index 5747bea5f..bd137f43b 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("Mandrakelinux is committed to the open source model. This means that this new release is the result of <b>collaboration</b> between <b>Mandrakesoft's team of developers</b> and the <b>worldwide community</b> of Mandrakelinux contributors."),
+         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("We would like to <b>thank</b> everyone who participated in the development of this latest release."));
\ No newline at end of file
diff --git a/perl-install/share/advertising/03.pl b/perl-install/share/advertising/03.pl
index aa6ab140c..4dc4e887d 100644
--- a/perl-install/share/advertising/03.pl
+++ b/perl-install/share/advertising/03.pl
@@ -12,7 +12,7 @@ $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 Mandrakelinux tools are licensed under the <b>General Public License</b>."),
+	 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("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."),
          ' ',
diff --git a/perl-install/share/advertising/04.pl b/perl-install/share/advertising/04.pl
index 59d3aa078..619b56784 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("Mandrakelinux 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 Mandrakelinux world."),
+	 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("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
diff --git a/perl-install/share/advertising/05.pl b/perl-install/share/advertising/05.pl
index e2017969d..e00ee15a5 100644
--- a/perl-install/share/advertising/05.pl
+++ b/perl-install/share/advertising/05.pl
@@ -14,10 +14,10 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Download Version</b>"), center => 1 ],
          ' ',
-	 N("You are now installing <b>Mandrakelinux Download</b>. This is the free version that Mandrakesoft wants to keep <b>available to everyone</b>."),
+	 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("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.)."),
 	 N("	* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, Flash™, etc.)."),
 	 ' ',
-	 N("You will not have access to the <b>services included</b> in the other Mandrakesoft products either."));
+	 N("You will not have access to the <b>services included</b> in the other Mandriva products either."));
diff --git a/perl-install/share/advertising/06.pl b/perl-install/share/advertising/06.pl
index 4a232d0c9..a08f66b6c 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>Mandrakelinux Discovery</b>."),
+	 N("You are now installing <b>Mandrivalinux 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
diff --git a/perl-install/share/advertising/07.pl b/perl-install/share/advertising/07.pl
index 27a0aa468..aa32ac02a 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>Mandrakelinux PowerPack</b>."),
+	N("You are now installing <b>Mandrivalinux PowerPack</b>."),
 	' ',
-	N("PowerPack is Mandrakesoft'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."));
\ No newline at end of file
diff --git a/perl-install/share/advertising/08.pl b/perl-install/share/advertising/08.pl
index 071baacf3..a006eaeb9 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>Mandrakelinux PowerPack+</b>."),
+	N("You are now installing <b>Mandrivalinux 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
diff --git a/perl-install/share/advertising/09.pl b/perl-install/share/advertising/09.pl
index 12cfb449c..bc51ed0c5 100644
--- a/perl-install/share/advertising/09.pl
+++ b/perl-install/share/advertising/09.pl
@@ -10,12 +10,12 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Mandrakesoft Products</b>"), center => 1 ],
+@text = ([ N("<b>Mandriva Products</b>"), center => 1 ],
 	' ',
-	N("<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> products."),
+	N("<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."),
 	' ',
-	N("The Mandrakelinux products are:"),
+	N("The Mandrivalinux 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>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making the most of your 64-bit processor."));
+	N("	* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux 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 a59f1d206..91088e020 100644
--- a/perl-install/share/advertising/10.pl
+++ b/perl-install/share/advertising/10.pl
@@ -12,8 +12,8 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Mandrakesoft Products (Nomad Products)</b>"), center => 1 ],
+@text = ([ N("<b>Mandriva Products (Nomad Products)</b>"), center => 1 ],
 	' ',
-	N("Mandrakesoft has developed two products that allow you to use Mandrakelinux <b>on any computer</b> and without any need to actually install it:"),
-	N("	* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a bootable CD-ROM."),
-	N("	* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the ultra-compact “LaCie Mobile Hard Drive”."));
+	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”."));
diff --git a/perl-install/share/advertising/11.pl b/perl-install/share/advertising/11.pl
index 286e48e42..ed0eefa34 100644
--- a/perl-install/share/advertising/11.pl
+++ b/perl-install/share/advertising/11.pl
@@ -10,9 +10,9 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Mandrakesoft Products (Professional Solutions)</b>"), center => 1 ],
+@text = ([ N("<b>Mandriva Products (Professional Solutions)</b>"), center => 1 ],
 	' ',
-	N("Below are the Mandrakesoft products designed to meet the <b>professional needs</b>:"),
-	N("	* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."),
-	N("	* <b>Corporate Server</b>, The Mandrakelinux Server Solution."),
-	N("	* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."));
\ No newline at end of file
+	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
diff --git a/perl-install/share/advertising/13-a.pl b/perl-install/share/advertising/13-a.pl
index a8a81ec8e..a863cec0e 100644
--- a/perl-install/share/advertising/13-a.pl
+++ b/perl-install/share/advertising/13-a.pl
@@ -12,7 +12,7 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Choose your Favorite Desktop Environment</b>"), center => 1 ],
 	' ',
-	N("With PowerPack, you will have the choice of the <b>graphical desktop environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."),
+	N("With PowerPack, you will have the choice of the <b>graphical desktop environment</b>. Mandriva has chosen <b>KDE</b> as the default one."),
 	' ',
 	N("KDE is one of the <b>most advanced</b> and <b>user-friendly</b> graphical desktop environment available. It includes a lot of integrated applications."),
 	' ',
diff --git a/perl-install/share/advertising/13-b.pl b/perl-install/share/advertising/13-b.pl
index 5914d8b68..72e42206d 100644
--- a/perl-install/share/advertising/13-b.pl
+++ b/perl-install/share/advertising/13-b.pl
@@ -12,7 +12,7 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Choose your Favorite Desktop Environment</b>"), center => 1 ],
 	' ',
-	N("With PowerPack+, you will have the choice of the <b>graphical desktop environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."),
+	N("With PowerPack+, you will have the choice of the <b>graphical desktop environment</b>. Mandriva has chosen <b>KDE</b> as the default one."),
 	' ',
 	N("KDE is one of the <b>most advanced</b> and <b>user-friendly</b> graphical desktop environment available. It includes a lot of integrated applications."),
 	' ',
diff --git a/perl-install/share/advertising/18.pl b/perl-install/share/advertising/18.pl
index c1a5e2860..0ff5f7ce0 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 Mandrakelinux menu you will find <b>easy-to-use</b> applications for <b>all of your tasks</b>:"),
+	N("In the Mandrivalinux 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 93975500d..69cd49cc3 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>Mandrakelinux Control Center</b>"), center => 1 ],
+@text = ([ N("<b>Mandrivalinux Control Center</b>"), center => 1 ],
 	' ',
-	N("The <b>Mandrakelinux Control Center</b> is an essential collection of Mandrakelinux-specific utilities designed to simplify the configuration of your computer."),
+	N("The <b>Mandrivalinux Control Center</b> is an essential collection of Mandrivalinux-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
diff --git a/perl-install/share/advertising/26.pl b/perl-install/share/advertising/26.pl
index 89df6f915..c43d69e89 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, Mandrakesoft sells added value products and services to <b>keep improving Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> and the development of Mandrakelinux, <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 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
diff --git a/perl-install/share/advertising/27.pl b/perl-install/share/advertising/27.pl
index faac46418..359e8e54b 100644
--- a/perl-install/share/advertising/27.pl
+++ b/perl-install/share/advertising/27.pl
@@ -12,7 +12,7 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Online Store</b>"), center => 1 ],
 	' ',
-	N("To learn more about Mandrakesoft products and services, you can visit our <b>e-commerce platform</b>."),
+	N("To learn more about Mandriva products and services, you can visit our <b>e-commerce platform</b>."),
 	' ',
 	N("There you can find all our products, services and third-party products."),
 	' ',
diff --git a/perl-install/share/advertising/28.pl b/perl-install/share/advertising/28.pl
index cce312594..a1108c3d8 100644
--- a/perl-install/share/advertising/28.pl
+++ b/perl-install/share/advertising/28.pl
@@ -12,13 +12,13 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Mandrakeclub</b>"), center => 1 ],
+@text = ([ N("<b>Mandriva Club</b>"), center => 1 ],
 	' ',
-	N("<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux product.."),
+	N("<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux product.."),
 	' ',
-	N("Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"),
+	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("	* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ drivers)."),
-	N("	* Participation in Mandrakelinux <b>user forums</b>."),
-	N("	* <b>Early and privileged access</b>, before public release, to Mandrakelinux <b>ISO images</b>."),
+	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("	* And many more."));
diff --git a/perl-install/share/advertising/29.pl b/perl-install/share/advertising/29.pl
index 719c82338..ad997d59e 100644
--- a/perl-install/share/advertising/29.pl
+++ b/perl-install/share/advertising/29.pl
@@ -10,12 +10,12 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Mandrakeonline</b>"), center => 1 ],
+@text = ([ N("<b>Mandriva Online</b>"), center => 1 ],
 	' ',
-	N("<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to offer its customers!"),
+	N("<b>Mandriva Online</b> is a new premium service that Mandriva is proud to offer its customers!"),
 	' ',
-	N("Mandrakeonline provides a wide range of valuable services for <b>easily updating</b> your Mandrakelinux systems:"),
+	N("Mandriva Online provides a wide range of valuable services for <b>easily updating</b> your Mandrivalinux 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 Mandrakelinux systems</b> with one account."));
\ No newline at end of file
+	N("	* Management of <b>all your Mandrivalinux systems</b> with one account."));
\ No newline at end of file
diff --git a/perl-install/share/advertising/30.pl b/perl-install/share/advertising/30.pl
index b76729750..650c04833 100644
--- a/perl-install/share/advertising/30.pl
+++ b/perl-install/share/advertising/30.pl
@@ -10,10 +10,10 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Mandrakeexpert</b>"), center => 1 ],
+@text = ([ N("<b>Mandriva Expert</b>"), center => 1 ],
 	' ',
-	N("Do you require <b>assistance?</b> Meet Mandrakesoft'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.mandrakeexpert.com."),
 	' ',
-	N("Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save a lot of time."),
+	N("Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save a lot of time."),
 	' ',
-	N("For any question related to Mandrakelinux, 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 Mandrivalinux, you have the possibility to purchase support incidents at <b>store.mandrakesoft.com</b>."));
\ No newline at end of file