From b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 21 Apr 2005 15:25:29 +0000 Subject: switch from MandrakeSoft to Mandriva --- perl-install/share/advertising/01.pl | 8 ++++---- perl-install/share/advertising/02.pl | 2 +- perl-install/share/advertising/03.pl | 2 +- perl-install/share/advertising/04.pl | 2 +- perl-install/share/advertising/05.pl | 4 ++-- perl-install/share/advertising/06.pl | 2 +- perl-install/share/advertising/07.pl | 4 ++-- perl-install/share/advertising/08.pl | 2 +- perl-install/share/advertising/09.pl | 8 ++++---- perl-install/share/advertising/10.pl | 8 ++++---- perl-install/share/advertising/11.pl | 10 +++++----- perl-install/share/advertising/13-a.pl | 2 +- perl-install/share/advertising/13-b.pl | 2 +- perl-install/share/advertising/18.pl | 2 +- perl-install/share/advertising/25.pl | 4 ++-- perl-install/share/advertising/26.pl | 2 +- perl-install/share/advertising/27.pl | 2 +- perl-install/share/advertising/28.pl | 10 +++++----- perl-install/share/advertising/29.pl | 8 ++++---- perl-install/share/advertising/30.pl | 8 ++++---- 20 files changed, 46 insertions(+), 46 deletions(-) (limited to 'perl-install/share/advertising') 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("What is Mandrakelinux?"), center => 1 ], +@text = ([ N("What is Mandrivalinux?"), center => 1 ], ' ', - N("Welcome to Mandrakelinux!"), + N("Welcome to Mandrivalinux!"), ' ', - N("Mandrakelinux is a Linux distribution that comprises the core of the system, called the operating system (based on the Linux kernel) together with a lot of applications meeting every need you could even think of."), + N("Mandrivalinux is a Linux distribution that comprises the core of the system, called the operating system (based on the Linux kernel) together with a lot of applications meeting every need you could even think of."), ' ', - N("Mandrakelinux is the most user-friendly Linux distribution today. It is also one of the most widely used Linux distributions worldwide!")); \ No newline at end of file + N("Mandrivalinux is the most user-friendly Linux distribution today. It is also one of the most widely used 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 world of open source!"), ' ', - N("Mandrakelinux is committed to the open source model. This means that this new release is the result of collaboration between Mandrakesoft's team of developers and the worldwide community of Mandrakelinux contributors."), + N("Mandrivalinux is committed to the open source model. This means that this new release is the result of collaboration between Mandriva's team of developers and the worldwide community of Mandrivalinux contributors."), ' ', N("We would like to thank 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("The GPL"), center => 1 ], ' ', - N("Most of the software included in the distribution and all of the Mandrakelinux tools are licensed under the General Public License."), + N("Most of the software included in the distribution and all of the Mandrivalinux tools are licensed under the General Public License."), ' ', N("The GPL is at the heart of the open source model; it grants everyone the freedom 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("Join the Community"), center => 1 ], ' ', - N("Mandrakelinux has one of the biggest communities 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 key role in the Mandrakelinux world."), + N("Mandrivalinux has one of the biggest communities 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 key role in the Mandrivalinux world."), ' ', N("To learn more about our dynamic community, please visit www.mandrakelinux.com or directly www.mandrakelinux.com/en/cookerdevel.php3 if you would like to get involved 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("Download Version"), center => 1 ], ' ', - N("You are now installing Mandrakelinux Download. This is the free version that Mandrakesoft wants to keep available to everyone."), + N("You are now installing Mandrivalinux Download. This is the free version that Mandriva wants to keep available to everyone."), ' ', N("The Download version cannot include all the software that is not open source. Therefore, you will not find in the Download version:"), N(" * Proprietary drivers (such as drivers for NVIDIA®, ATI™, etc.)."), N(" * Proprietary software (such as Acrobat® Reader®, RealPlayer®, Flash™, etc.)."), ' ', - N("You will not have access to the services included in the other Mandrakesoft products either.")); + N("You will not have access to the services included 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("Discovery, Your First Linux Desktop"), center => 1 ], ' ', - N("You are now installing Mandrakelinux Discovery."), + N("You are now installing Mandrivalinux Discovery."), ' ', 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. 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("PowerPack, The Ultimate Linux Desktop"), center => 1 ], ' ', - N("You are now installing Mandrakelinux PowerPack."), + N("You are now installing Mandrivalinux PowerPack."), ' ', - N("PowerPack is Mandrakesoft's premier Linux desktop product. PowerPack includes thousands of applications - everything from the most popular to the most advanced.")); \ No newline at end of file + N("PowerPack is Mandriva's premier Linux desktop product. PowerPack includes thousands of applications - 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("PowerPack+, The Linux Solution for Desktops and Servers"), center => 1 ], ' ', - N("You are now installing Mandrakelinux PowerPack+."), + N("You are now installing Mandrivalinux PowerPack+."), ' ', N("PowerPack+ is a full-featured Linux solution for small to medium-sized networks. PowerPack+ includes thousands of desktop applications and a comprehensive selection of world-class server applications.")); \ 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("Mandrakesoft Products"), center => 1 ], +@text = ([ N("Mandriva Products"), center => 1 ], ' ', - N("Mandrakesoft has developed a wide range of Mandrakelinux products."), + N("Mandriva has developed a wide range of Mandrivalinux products."), ' ', - N("The Mandrakelinux products are:"), + N("The Mandrivalinux products are:"), N(" * Discovery, Your First Linux Desktop."), N(" * PowerPack, The Ultimate Linux Desktop."), N(" * PowerPack+, The Linux Solution for Desktops and Servers."), - N(" * Mandrakelinux for x86-64, The Mandrakelinux solution for making the most of your 64-bit processor.")); + N(" * Mandrivalinux for x86-64, 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("Mandrakesoft Products (Nomad Products)"), center => 1 ], +@text = ([ N("Mandriva Products (Nomad Products)"), center => 1 ], ' ', - N("Mandrakesoft has developed two products that allow you to use Mandrakelinux on any computer and without any need to actually install it:"), - N(" * Move, a Mandrakelinux distribution that runs entirely from a bootable CD-ROM."), - N(" * GlobeTrotter, 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 on any computer and without any need to actually install it:"), + N(" * Move, a Mandrivalinux distribution that runs entirely from a bootable CD-ROM."), + N(" * GlobeTrotter, 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("Mandrakesoft Products (Professional Solutions)"), center => 1 ], +@text = ([ N("Mandriva Products (Professional Solutions)"), center => 1 ], ' ', - N("Below are the Mandrakesoft products designed to meet the professional needs:"), - N(" * Corporate Desktop, The Mandrakelinux Desktop for Businesses."), - N(" * Corporate Server, The Mandrakelinux Server Solution."), - N(" * Multi-Network Firewall, The Mandrakelinux Security Solution.")); \ No newline at end of file + N("Below are the Mandriva products designed to meet the professional needs:"), + N(" * Corporate Desktop, The Mandrivalinux Desktop for Businesses."), + N(" * Corporate Server, The Mandrivalinux Server Solution."), + N(" * Multi-Network Firewall, 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("Choose your Favorite Desktop Environment"), center => 1 ], ' ', - N("With PowerPack, you will have the choice of the graphical desktop environment. Mandrakesoft has chosen KDE as the default one."), + N("With PowerPack, you will have the choice of the graphical desktop environment. Mandriva has chosen KDE as the default one."), ' ', N("KDE is one of the most advanced and user-friendly 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("Choose your Favorite Desktop Environment"), center => 1 ], ' ', - N("With PowerPack+, you will have the choice of the graphical desktop environment. Mandrakesoft has chosen KDE as the default one."), + N("With PowerPack+, you will have the choice of the graphical desktop environment. Mandriva has chosen KDE as the default one."), ' ', N("KDE is one of the most advanced and user-friendly 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("Enjoy the Wide Range of Applications"), center => 1 ], ' ', - N("In the Mandrakelinux menu you will find easy-to-use applications for all of your tasks:"), + N("In the Mandrivalinux menu you will find easy-to-use applications for all of your tasks:"), N(" * Create, edit and share office documents with OpenOffice.org."), N(" * Manage your personal data with the integrated personal information suites Kontact and Evolution."), N(" * Browse the web with Mozilla and Konqueror."), 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("Mandrakelinux Control Center"), center => 1 ], +@text = ([ N("Mandrivalinux Control Center"), center => 1 ], ' ', - N("The Mandrakelinux Control Center is an essential collection of Mandrakelinux-specific utilities designed to simplify the configuration of your computer."), + N("The Mandrivalinux Control Center is an essential collection of Mandrivalinux-specific utilities designed to simplify the configuration of your computer."), ' ', N("You will immediately appreciate this collection of more than 60 handy utilities for easily configuring your system: 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("The Open Source Model"), center => 1 ], ' ', - N("Like all computer programming, open source software requires time and people for development. In order to respect the open source philosophy, Mandrakesoft sells added value products and services to keep improving Mandrakelinux. If you want to support the open source philosophy and the development of Mandrakelinux, please consider buying one of our products or services!")); \ No newline at end of file + N("Like all computer programming, open source software requires time and people for development. In order to respect the open source philosophy, Mandriva sells added value products and services to keep improving Mandrivalinux. If you want to support the open source philosophy and the development of Mandrivalinux, please 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("Online Store"), center => 1 ], ' ', - N("To learn more about Mandrakesoft products and services, you can visit our e-commerce platform."), + N("To learn more about Mandriva products and services, you can visit our e-commerce platform."), ' ', 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("Mandrakeclub"), center => 1 ], +@text = ([ N("Mandriva Club"), center => 1 ], ' ', - N("Mandrakeclub is the perfect companion to your Mandrakelinux product.."), + N("Mandriva Club is the perfect companion to your Mandrivalinux product.."), ' ', - N("Take advantage of valuable benefits by joining Mandrakeclub, such as:"), + N("Take advantage of valuable benefits by joining Mandriva Club, such as:"), N(" * Special discounts on products and services of our online store store.mandrakesoft.com."), N(" * Access to commercial applications (for example to NVIDIA® or ATI™ drivers)."), - N(" * Participation in Mandrakelinux user forums."), - N(" * Early and privileged access, before public release, to Mandrakelinux ISO images."), + N(" * Participation in Mandrivalinux user forums."), + N(" * Early and privileged access, before public release, to Mandrivalinux ISO images."), 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("Mandrakeonline"), center => 1 ], +@text = ([ N("Mandriva Online"), center => 1 ], ' ', - N("Mandrakeonline is a new premium service that Mandrakesoft is proud to offer its customers!"), + N("Mandriva Online is a new premium service that Mandriva is proud to offer its customers!"), ' ', - N("Mandrakeonline provides a wide range of valuable services for easily updating your Mandrakelinux systems:"), + N("Mandriva Online provides a wide range of valuable services for easily updating your Mandrivalinux systems:"), N(" * Perfect system security (automated software updates)."), N(" * Notification of updates (by e-mail or by an applet on the desktop)."), N(" * Flexible scheduled updates."), - N(" * Management of all your Mandrakelinux systems with one account.")); \ No newline at end of file + N(" * Management of all your Mandrivalinux systems 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("Mandrakeexpert"), center => 1 ], +@text = ([ N("Mandriva Expert"), center => 1 ], ' ', - N("Do you require assistance? Meet Mandrakesoft's technical experts on our technical support platform www.mandrakeexpert.com."), + N("Do you require assistance? Meet Mandriva's technical experts on our technical support platform www.mandrakeexpert.com."), ' ', - N("Thanks to the help of qualified Mandrakelinux experts, you will save a lot of time."), + N("Thanks to the help of qualified Mandrivalinux experts, you will save a lot of time."), ' ', - N("For any question related to Mandrakelinux, you have the possibility to purchase support incidents at store.mandrakesoft.com.")); \ No newline at end of file + N("For any question related to Mandrivalinux, you have the possibility to purchase support incidents at store.mandrakesoft.com.")); \ No newline at end of file -- cgit v1.2.1