From f4b77f9504fa80bc3bef6a20e9a61b08b6f5f1f4 Mon Sep 17 00:00:00 2001 From: Pablo Saratxaga Date: Sat, 23 Apr 2005 16:03:57 +0000 Subject: s/Mandrivalinux/Mandriva Linux/ --- perl-install/share/advertising/01.pl | 8 ++++---- perl-install/share/advertising/02.pl | 4 ++-- perl-install/share/advertising/03.pl | 4 ++-- perl-install/share/advertising/04.pl | 4 ++-- perl-install/share/advertising/05.pl | 2 +- perl-install/share/advertising/06.pl | 4 ++-- perl-install/share/advertising/07.pl | 4 ++-- perl-install/share/advertising/08.pl | 4 ++-- perl-install/share/advertising/09.pl | 6 +++--- perl-install/share/advertising/10.pl | 6 +++--- perl-install/share/advertising/11.pl | 6 +++--- perl-install/share/advertising/18.pl | 2 +- perl-install/share/advertising/25.pl | 6 +++--- perl-install/share/advertising/26.pl | 2 +- perl-install/share/advertising/27.pl | 2 +- perl-install/share/advertising/28.pl | 8 ++++---- perl-install/share/advertising/29.pl | 4 ++-- perl-install/share/advertising/30.pl | 6 +++--- 18 files changed, 41 insertions(+), 41 deletions(-) (limited to 'perl-install/share/advertising') 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("What is Mandrivalinux?"), center => 1 ], +@text = ([ N("What is Mandriva Linux?"), center => 1 ], ' ', - N("Welcome to Mandrivalinux!"), + N("Welcome to Mandriva Linux!"), ' ', - 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("Mandriva Linux 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 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("Mandriva Linux is the most user-friendly Linux distribution today. It is also one of the most widely used 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 world of open source!"), ' ', - 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("Mandriva Linux 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 Mandriva Linux contributors."), ' ', - N("We would like to thank everyone who participated in the development of this latest release.")); \ No newline at end of file + N("We would like to thank 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("The GPL"), center => 1 ], ' ', - N("Most of the software included in the distribution and all of the Mandrivalinux tools are licensed under the General Public License."), + N("Most of the software included in the distribution and all of the Mandriva Linux 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."), ' ', - N("The main benefit of this is that the number of developers is virtually unlimited, resulting in very high quality software.")); \ No newline at end of file + N("The main benefit of this is that the number of developers is virtually unlimited, resulting in very high quality 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("Join the Community"), center => 1 ], ' ', - 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("Mandriva Linux 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 Mandriva Linux 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 + N("To learn more about our dynamic community, please visit www.mandrivalinux.com or directly www.mandrivalinux.com/en/cookerdevel.php3 if you would like to get involved 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("Download Version"), center => 1 ], ' ', - N("You are now installing Mandrivalinux Download. This is the free version that Mandriva wants to keep available to everyone."), + N("You are now installing Mandriva Linux 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.)."), 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("Discovery, Your First Linux Desktop"), center => 1 ], ' ', - N("You are now installing Mandrivalinux Discovery."), + N("You are now installing Mandriva Linux 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 + 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.")); 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("PowerPack, The Ultimate Linux Desktop"), center => 1 ], ' ', - N("You are now installing Mandrivalinux PowerPack."), + N("You are now installing Mandriva Linux PowerPack."), ' ', - 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 + N("PowerPack is Mandriva's premier Linux desktop product. PowerPack includes thousands of applications - 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("PowerPack+, The Linux Solution for Desktops and Servers"), center => 1 ], ' ', - N("You are now installing Mandrivalinux PowerPack+."), + N("You are now installing Mandriva Linux 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 + 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.")); 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("Mandriva Products"), center => 1 ], ' ', - N("Mandriva has developed a wide range of Mandrivalinux products."), + N("Mandriva has developed a wide range of Mandriva Linux products."), ' ', - N("The Mandrivalinux products are:"), + N("The Mandriva Linux products are:"), N(" * Discovery, Your First Linux Desktop."), N(" * PowerPack, The Ultimate Linux Desktop."), N(" * PowerPack+, The Linux Solution for Desktops and Servers."), - N(" * Mandrivalinux for x86-64, The Mandrivalinux solution for making the most of your 64-bit processor.")); + N(" * Mandriva Linux for x86-64, 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("Mandriva Products (Nomad Products)"), center => 1 ], ' ', - 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”.")); + N("Mandriva has developed two products that allow you to use Mandriva Linux on any computer and without any need to actually install it:"), + N(" * Move, a Mandriva Linux distribution that runs entirely from a bootable CD-ROM."), + N(" * GlobeTrotter, 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("Mandriva Products (Professional Solutions)"), center => 1 ], ' ', 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 + N(" * Corporate Desktop, The Mandriva Linux Desktop for Businesses."), + N(" * Corporate Server, The Mandriva Linux Server Solution."), + N(" * Multi-Network Firewall, 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("Enjoy the Wide Range of Applications"), center => 1 ], ' ', - N("In the Mandrivalinux menu you will find easy-to-use applications for all of your tasks:"), + N("In the Mandriva 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(" * 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 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("Mandrivalinux Control Center"), center => 1 ], +@text = ([ N("Mandriva Linux Control Center"), center => 1 ], ' ', - N("The Mandrivalinux Control Center is an essential collection of Mandrivalinux-specific utilities designed to simplify the configuration of your computer."), + N("The Mandriva Linux Control Center 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 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 + 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.")); 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("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, 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 + 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 Mandriva Linux. If you want to support the open source philosophy and the development of Mandriva Linux, please 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 redesigned to improve its efficiency and usability."), ' ', - [ N("Stop by today at store.mandrakesoft.com!"), center => 1 ]); \ No newline at end of file + [ N("Stop by today at store.mandriva.com!"), 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("Mandriva Club"), center => 1 ], ' ', - N("Mandriva Club is the perfect companion to your Mandrivalinux product.."), + N("Mandriva Club is the perfect companion to your Mandriva Linux product.."), ' ', 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(" * Special discounts on products and services of our online store store.mandriva.com."), N(" * Access to commercial applications (for example to NVIDIA® or ATI™ drivers)."), - N(" * Participation in Mandrivalinux user forums."), - N(" * Early and privileged access, before public release, to Mandrivalinux ISO images."), + N(" * Participation in Mandriva Linux user forums."), + N(" * Early and privileged access, before public release, to Mandriva Linux ISO images."), 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("Mandriva Online is a new premium service that Mandriva is proud to offer its customers!"), ' ', - N("Mandriva Online provides a wide range of valuable services for easily updating your Mandrivalinux systems:"), + N("Mandriva Online provides a wide range of valuable services for easily updating your Mandriva Linux 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 Mandrivalinux systems with one account.")); \ No newline at end of file + N(" * Management of all your Mandriva Linux systems 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("Mandriva Expert"), center => 1 ], ' ', - N("Do you require assistance? Meet Mandriva'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.mandrivaexpert.com."), ' ', - N("Thanks to the help of qualified Mandrivalinux experts, you will save a lot of time."), + N("Thanks to the help of qualified Mandriva Linux experts, you will save a lot of time."), ' ', - 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 + N("For any question related to Mandriva Linux, you have the possibility to purchase support incidents at store.mandriva.com.")); -- cgit v1.2.1