summaryrefslogtreecommitdiffstats
path: root/perl-install/network
ModeNameSize
-rw-r--r--adsl.pm6721logstatsplain
-rw-r--r--drakfirewall.pm4415logstatsplain
-rw-r--r--ethernet.pm8655logstatsplain
-rw-r--r--isdn.pm9590logstatsplain
-rw-r--r--isdn_consts.pm8124logstatsplain
-rw-r--r--modem.pm3028logstatsplain
-rw-r--r--netconnect.pm25990logstatsplain
-rw-r--r--network.pm16695logstatsplain
-rw-r--r--nfs.pm1433logstatsplain
-rw-r--r--shorewall.pm3980logstatsplain
-rw-r--r--smb.pm3974logstatsplain
-rw-r--r--smbnfs.pm960logstatsplain
-rw-r--r--tools.pm7603logstatsplain
>413
-rw-r--r--perl-install/share/po/da.po682
-rw-r--r--perl-install/share/po/de.po2494
-rw-r--r--perl-install/share/po/el.po285
-rw-r--r--perl-install/share/po/eo.po221
-rw-r--r--perl-install/share/po/es.po496
-rw-r--r--perl-install/share/po/et.po407
-rw-r--r--perl-install/share/po/eu.po448
-rw-r--r--perl-install/share/po/fa.po233
-rw-r--r--perl-install/share/po/fi.po599
-rw-r--r--perl-install/share/po/fr.po486
-rw-r--r--perl-install/share/po/fur.po217
-rw-r--r--perl-install/share/po/ga.po221
-rw-r--r--perl-install/share/po/gl.po344
-rw-r--r--perl-install/share/po/he.po227
-rw-r--r--perl-install/share/po/hi.po266
-rw-r--r--perl-install/share/po/hr.po323
-rw-r--r--perl-install/share/po/hu.po495
-rw-r--r--perl-install/share/po/id.po390
-rw-r--r--perl-install/share/po/is.po308
-rw-r--r--perl-install/share/po/it.po468
-rw-r--r--perl-install/share/po/ja.po407
-rw-r--r--perl-install/share/po/ko.po314
-rw-r--r--perl-install/share/po/ky.po966
-rw-r--r--perl-install/share/po/lt.po235
-rw-r--r--perl-install/share/po/ltg.po312
-rw-r--r--perl-install/share/po/lv.po307
-rw-r--r--perl-install/share/po/mk.po249
-rw-r--r--perl-install/share/po/mn.po215
-rw-r--r--perl-install/share/po/ms.po225
-rw-r--r--perl-install/share/po/mt.po393
-rw-r--r--perl-install/share/po/nb.po410
-rw-r--r--perl-install/share/po/nl.po720
-rw-r--r--perl-install/share/po/nn.po211
-rw-r--r--perl-install/share/po/pa_IN.po373
-rw-r--r--perl-install/share/po/pl.po420
-rw-r--r--perl-install/share/po/pt.po6692
-rw-r--r--perl-install/share/po/pt_BR.po435
-rw-r--r--perl-install/share/po/ro.po308
-rw-r--r--perl-install/share/po/ru.po521
-rw-r--r--perl-install/share/po/sc.po252
-rw-r--r--perl-install/share/po/sk.po444
-rw-r--r--perl-install/share/po/sl.po451
-rw-r--r--perl-install/share/po/sq.po386
-rw-r--r--perl-install/share/po/sr.po383
-rw-r--r--perl-install/share/po/sr@Latn.po373
-rw-r--r--perl-install/share/po/sv.po469
-rw-r--r--perl-install/share/po/ta.po395
-rw-r--r--perl-install/share/po/tg.po555
-rw-r--r--perl-install/share/po/th.po267
-rw-r--r--perl-install/share/po/tl.po639
-rw-r--r--perl-install/share/po/tr.po387
-rw-r--r--perl-install/share/po/uk.po459
-rw-r--r--perl-install/share/po/uz.po308
-rw-r--r--perl-install/share/po/uz@Latn.po297
-rw-r--r--perl-install/share/po/vi.po472
-rw-r--r--perl-install/share/po/wa.po462
-rw-r--r--perl-install/share/po/zh_CN.po574
-rw-r--r--perl-install/share/po/zh_TW.po331
71 files changed, 16657 insertions, 18861 deletions
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index cc164c9c8..d56008a58 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -1088,7 +1088,7 @@ msgstr ""
#: any.pm:733
#, c-format
msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux can support multiple languages. Select\n"
"the languages you would like to install. They will be available\n"
"when your installation is complete and you restart your system."
msgstr ""
@@ -3252,7 +3252,7 @@ msgstr ""
#, c-format
msgid ""
"Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
"terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
"button will reboot your computer."
msgstr ""
@@ -3354,7 +3354,7 @@ msgstr ""
#: help.pm:85
#, c-format
msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
"selected package is located on another CD-ROM, DrakX will eject the current\n"
"CD and ask you to insert the required one. If you do not have the requested\n"
"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3365,11 +3365,11 @@ msgstr ""
#, c-format
msgid ""
"It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make it\n"
"simpler to manage, they have been placed into groups of similar\n"
"applications.\n"
"\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
"match applications from the various categories, so a ``Workstation''\n"
"installation can still have applications from the ``Server'' category\n"
"installed.\n"
@@ -3475,10 +3475,10 @@ msgid ""
"!! If a server package has been selected, either because you specifically\n"
"chose the individual package or because it was part of a group of packages,\n"
"you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux will automatically start any installed\n"
"services at boot time. Even if they are safe and have no known issues at\n"
"the time the distribution was shipped, it is entirely possible that\n"
-"security holes were discovered after this version of Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
"finalized. If you do not know what a particular service is supposed to do or\n"
"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
"the listed services and they will be started automatically at boot time. !!\n"
@@ -3583,7 +3583,7 @@ msgstr ""
msgid ""
"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
"on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
"\n"
"You'll see a list of different parameters to change to get an optimal\n"
"graphical display.\n"
@@ -3681,12 +3681,12 @@ msgstr ""
#: help.pm:316
#, c-format
msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\n"
"operating system on your hard drive. If your hard drive is empty or if an\n"
"existing operating system is using all the available space you will have to\n"
"partition the drive. Basically, partitioning a hard drive means to\n"
"logically divide it to create the space needed to install your new\n"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
"\n"
"Because the process of partitioning a hard drive is usually irreversible\n"
"and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -3713,7 +3713,7 @@ msgid ""
"FAT or NTFS partition. Resizing can be performed without the loss of any\n"
"data, provided you've previously defragmented the Windows partition.\n"
"Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
"the same computer.\n"
"\n"
" Before choosing this option, please understand that after this\n"
@@ -3722,7 +3722,7 @@ msgid ""
"to store your data or to install new software.\n"
"\n"
" * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, choose\n"
"this option. Be careful, because you will not be able to undo this operation\n"
"after you confirm.\n"
"\n"
@@ -3849,7 +3849,7 @@ msgid ""
"Click on \"%s\" when you're ready to format the partitions.\n"
"\n"
"Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
"\n"
"Click on \"%s\" if you wish to select partitions which will be checked for\n"
"bad blocks on the disk."
@@ -3863,7 +3863,7 @@ msgstr ""
#: help.pm:434
#, c-format
msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
"have been updated since the initial release. Bugs may have been fixed,\n"
"security issues resolved. To allow you to benefit from these updates,\n"
"you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -3891,7 +3891,7 @@ msgid ""
"generally obtained at the expense of ease of use.\n"
"\n"
"If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
"Control Center.\n"
"\n"
"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -3907,7 +3907,7 @@ msgstr ""
#, c-format
msgid ""
"At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
"defined, either from a previous installation of GNU/Linux or by another\n"
"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
"partitions must be defined.\n"
@@ -3993,7 +3993,7 @@ msgstr ""
msgid ""
"More than one Microsoft partition has been detected on your hard drive.\n"
"Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
"\n"
"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
"\"Capacity\".\n"
@@ -4037,7 +4037,7 @@ msgid ""
"found on your machine.\n"
"\n"
"DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
"\n"
" * \"%s\". For the most part, this completely wipes out the old system.\n"
"However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4046,13 +4046,13 @@ msgid ""
"the file system, you should use this option.\n"
"\n"
" * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux system. Your current partitioning\n"
"scheme and user data will not be altered. Most of the other configuration\n"
"steps remain available and are similar to a standard installation.\n"
"\n"
-"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
msgstr ""
#: help.pm:591
@@ -4093,7 +4093,7 @@ msgid ""
"\n"
"About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
"cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 will\n"
"depend on the user's choices:\n"
"\n"
" * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4248,7 +4248,7 @@ msgstr ""
#, c-format
msgid ""
"Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
"the printing systems is best suited to particular types of configuration.\n"
"\n"
" * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4269,7 +4269,7 @@ msgid ""
"options and for managing the printer.\n"
"\n"
"If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
"Control Center and clicking on the \"%s\" button."
msgstr ""
@@ -4368,7 +4368,7 @@ msgid ""
"\n"
" * \"%s\": if you wish to configure your Internet or local network access,\n"
"you can do so now. Refer to the printed documentation or use the\n"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to benefit\n"
"from full in-line help.\n"
"\n"
" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4385,7 +4385,7 @@ msgid ""
" * \"%s\": if you wish to change your bootloader configuration, click this\n"
"button. This should be reserved to advanced users. Refer to the printed\n"
"documentation or the in-line help about bootloader configuration in the\n"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
"\n"
" * \"%s\": through this entry you can fine tune which services will be run\n"
"on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4446,7 +4446,7 @@ msgstr ""
#, c-format
msgid ""
"Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
"and will not be recoverable!"
msgstr ""
@@ -4743,7 +4743,7 @@ msgstr ""
#: install_interactive.pm:163
#, c-format
-msgid "Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrivalinux installation."
+msgid "Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandriva Linux installation."
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -4845,10 +4845,10 @@ msgstr ""
msgid ""
"Introduction\n"
"\n"
-"The operating system and the different components available in the Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva Linux distribution \n"
"shall be called the \"Software Products\" hereafter. The Software Products include, but are not \n"
"restricted to, the set of programs, methods, rules and documentation related to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
"\n"
"\n"
"1. License Agreement\n"
@@ -4883,7 +4883,7 @@ msgid ""
"limitation damages for loss of business, interruption of business, financial loss, legal fees \n"
"and penalties resulting from a court judgment, or any other consequential loss) arising out \n"
"of the possession and use of software components or arising out of downloading software components \n"
-"from one of Mandrivalinux sites which are prohibited or restricted in some countries by local laws.\n"
+"from one of Mandriva Linux sites which are prohibited or restricted in some countries by local laws.\n"
"This limited liability applies to, but is not restricted to, the strong cryptography components \n"
"included in the Software Products.\n"
"\n"
@@ -4907,7 +4907,7 @@ msgid ""
"protected by intellectual property and copyright laws applicable to software programs.\n"
"Mandriva S.A. reserves its rights to modify or adapt the Software Products, as a whole or in \n"
"parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of Mandriva S.A. \n"
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of Mandriva S.A. \n"
"\n"
"\n"
"5. Governing Laws \n"
@@ -4974,7 +4974,7 @@ msgid ""
"Remove the boot media and press return to reboot.\n"
"\n"
"\n"
-"For information on fixes which are available for this release of Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva Linux,\n"
"consult the Errata available from:\n"
"\n"
"\n"
@@ -4982,13 +4982,13 @@ msgid ""
"\n"
"\n"
"Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
#: install_messages.pm:144
#, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
msgstr ""
#: install_steps.pm:246
@@ -5016,7 +5016,7 @@ msgstr ""
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For this,\n"
+"Mandriva Linux. If that occurs, you can try a text install instead. For this,\n"
"press `F1' when booting on CDROM, then enter `text'."
msgstr ""
@@ -5500,7 +5500,7 @@ msgstr ""
#: install_steps_interactive.pm:821
#, c-format
-msgid "Contacting Mandrivalinux web site to get the list of available mirrors..."
+msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
#: install_steps_interactive.pm:840
@@ -5692,7 +5692,7 @@ msgstr ""
#: install_steps_newt.pm:20
#, c-format
-msgid "Mandrivalinux Installation %s"
+msgid "Mandriva Linux Installation %s"
msgstr ""
#. -PO: This string must fit in a 80-char wide text screen
@@ -8236,7 +8236,7 @@ msgstr ""
msgid ""
"drakfirewall configurator\n"
"\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
"For a powerful and dedicated firewall solution, please look to the\n"
"specialized MandrakeSecurity Firewall distribution."
msgstr ""
@@ -11471,7 +11471,7 @@ msgstr ""
#: printer/printerdrake.pm:3929
#, c-format
msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to share your scanner on the network.\n"
"\n"
""
msgstr ""
@@ -13035,22 +13035,22 @@ msgstr ""
#: share/advertising/01.pl:13
#, c-format
-msgid "<b>What is Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
msgstr ""
#: share/advertising/01.pl:15
#, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
msgstr ""
#: share/advertising/01.pl:17
#, c-format
-msgid "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."
+msgid "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."
msgstr ""
#: share/advertising/01.pl:19
#, c-format
-msgid "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!"
+msgid "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!"
msgstr ""
#: share/advertising/02.pl:13
@@ -13065,7 +13065,7 @@ msgstr ""
#: share/advertising/02.pl:17
#, c-format
-msgid "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."
+msgid "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."
msgstr ""
#: share/advertising/02.pl:19
@@ -13080,7 +13080,7 @@ msgstr ""
#: share/advertising/03.pl:15
#, c-format
-msgid "Most of the software included in the distribution and all of the Mandrivalinux tools are licensed under the <b>General Public License</b>."
+msgid "Most of the software included in the distribution and all of the Mandriva Linux tools are licensed under the <b>General Public License</b>."
msgstr ""
#: share/advertising/03.pl:17
@@ -13100,12 +13100,12 @@ msgstr ""
#: share/advertising/04.pl:15
#, c-format
-msgid "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."
+msgid "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."
msgstr ""
#: share/advertising/04.pl:17
#, c-format
-msgid "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."
+msgid "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."
msgstr ""
#: share/advertising/05.pl:15
@@ -13115,7 +13115,7 @@ msgstr ""
#: share/advertising/05.pl:17
#, c-format
-msgid "You are now installing <b>Mandrivalinux Download</b>. This is the free version that Mandriva wants to keep <b>available to everyone</b>."
+msgid "You are now installing <b>Mandriva Linux Download</b>. This is the free version that Mandriva wants to keep <b>available to everyone</b>."
msgstr ""
#: share/advertising/05.pl:19
@@ -13145,7 +13145,7 @@ msgstr ""
#: share/advertising/06.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
msgstr ""
#: share/advertising/06.pl:17
@@ -13160,7 +13160,7 @@ msgstr ""
#: share/advertising/07.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
msgstr ""
#: share/advertising/07.pl:17
@@ -13175,7 +13175,7 @@ msgstr ""
#: share/advertising/08.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
msgstr ""
#: share/advertising/08.pl:17
@@ -13190,12 +13190,12 @@ msgstr ""
#: share/advertising/09.pl:15
#, c-format
-msgid "<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+msgid "<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
msgstr ""
#: share/advertising/09.pl:17
#, c-format
-msgid "The Mandrivalinux products are:"
+msgid "The Mandriva Linux products are:"
msgstr ""
#: share/advertising/09.pl:18
@@ -13215,7 +13215,7 @@ msgstr ""
#: share/advertising/09.pl:21
#, c-format
-msgid "\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making the most of your 64-bit processor."
+msgid "\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making the most of your 64-bit processor."
msgstr ""
#: share/advertising/10.pl:15
@@ -13225,17 +13225,17 @@ msgstr ""
#: share/advertising/10.pl:17
#, c-format
-msgid "Mandriva has developed two products that allow you to use Mandrivalinux <b>on any computer</b> and without any need to actually install it:"
+msgid "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:"
msgstr ""
#: share/advertising/10.pl:18
#, c-format
-msgid "\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a bootable CD-ROM."
+msgid "\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a bootable CD-ROM."
msgstr ""
#: share/advertising/10.pl:19
#, c-format
-msgid "\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the ultra-compact “LaCie Mobile Hard Drive”."
+msgid "\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the ultra-compact “LaCie Mobile Hard Drive”."
msgstr ""
#: share/advertising/11.pl:13
@@ -13250,17 +13250,17 @@ msgstr ""
#: share/advertising/11.pl:16
#, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
msgstr ""
#: share/advertising/11.pl:17
#, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
msgstr ""
#: share/advertising/11.pl:18
#, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
msgstr ""
#: share/advertising/12.pl:13
@@ -13410,7 +13410,7 @@ msgstr ""
#: share/advertising/18.pl:15
#, c-format
-msgid "In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for <b>all of your tasks</b>:"
+msgid "In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for <b>all of your tasks</b>:"
msgstr ""
#: share/advertising/18.pl:16
@@ -13615,12 +13615,12 @@ msgstr ""
#: share/advertising/25.pl:13
#, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
msgstr ""
#: share/advertising/25.pl:15
#, c-format
-msgid "The <b>Mandrivalinux Control Center</b> is an essential collection of Mandrivalinux-specific utilities designed to simplify the configuration of your computer."
+msgid "The <b>Mandriva Linux Control Center</b> is an essential collection of Mandriva Linux-specific utilities designed to simplify the configuration of your computer."
msgstr ""
#: share/advertising/25.pl:17
@@ -13635,7 +13635,7 @@ msgstr ""
#: share/advertising/26.pl:15
#, c-format
-msgid "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!"
+msgid "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!"
msgstr ""
#: share/advertising/27.pl:13
@@ -13660,7 +13660,7 @@ msgstr ""
#: share/advertising/27.pl:21
#, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
msgstr ""
#: share/advertising/28.pl:15
@@ -13670,7 +13670,7 @@ msgstr ""
#: share/advertising/28.pl:17
#, c-format
-msgid "<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux product.."
+msgid "<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux product.."
msgstr ""
#: share/advertising/28.pl:19
@@ -13680,7 +13680,7 @@ msgstr ""
#: share/advertising/28.pl:20
#, c-format
-msgid "\t* <b>Special discounts</b> on products and services of our online store <b>store.mandrakesoft.com</b>."
+msgid "\t* <b>Special discounts</b> on products and services of our online store <b>store.mandriva.com</b>."
msgstr ""
#: share/advertising/28.pl:21
@@ -13690,12 +13690,12 @@ msgstr ""
#: share/advertising/28.pl:22
#, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
msgstr ""
#: share/advertising/28.pl:23
#, c-format
-msgid "\t* <b>Early and privileged access</b>, before public release, to Mandrivalinux <b>ISO images</b>."
+msgid "\t* <b>Early and privileged access</b>, before public release, to Mandriva Linux <b>ISO images</b>."
msgstr ""
#: share/advertising/29.pl:13
@@ -13710,7 +13710,7 @@ msgstr ""
#: share/advertising/29.pl:17
#, c-format
-msgid "Mandriva Online provides a wide range of valuable services for <b>easily updating</b> your Mandrivalinux systems:"
+msgid "Mandriva Online provides a wide range of valuable services for <b>easily updating</b> your Mandriva Linux systems:"
msgstr ""
#: share/advertising/29.pl:18
@@ -13730,7 +13730,7 @@ msgstr ""
#: share/advertising/29.pl:21
#, c-format
-msgid "\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+msgid "\t* Management of <b>all your Mandriva Linux systems</b> with one account."
msgstr ""
#: share/advertising/30.pl:13
@@ -13740,17 +13740,17 @@ msgstr ""
#: share/advertising/30.pl:15
#, c-format
-msgid "Do you require <b>assistance?</b> Meet Mandriva's technical experts on <b>our technical support platform</b> www.mandrakeexpert.com."
+msgid "Do you require <b>assistance?</b> Meet Mandriva's technical experts on <b>our technical support platform</b> www.mandrivaexpert.com."
msgstr ""
#: share/advertising/30.pl:17
#, c-format
-msgid "Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save a lot of time."
+msgid "Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save a lot of time."
msgstr ""
#: share/advertising/30.pl:19
#, c-format
-msgid "For any question related to Mandrivalinux, you have the possibility to purchase support incidents at <b>store.mandrakesoft.com</b>."
+msgid "For any question related to Mandriva Linux, you have the possibility to purchase support incidents at <b>store.mandriva.com</b>."
msgstr ""
#: share/compssUsers.pl:25
@@ -14090,8 +14090,8 @@ msgid ""
"\n"
"OPTIONS:\n"
" --help - print this help message.\n"
-" --report - program should be one of mandrakelinux tools\n"
-" --incident - program should be one of mandrakelinux tools"
+" --report - program should be one of Mandriva Linux tools\n"
+" --incident - program should be one of Mandriva Linux tools"
msgstr ""
#: standalone.pm:63
@@ -14127,7 +14127,7 @@ msgstr ""
#, c-format
msgid ""
"[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
"--enable : enable MTS\n"
"--disable : disable MTS\n"
"--start : start MTS\n"
@@ -16609,12 +16609,12 @@ msgstr ""
#: standalone/drakbug:41
#, c-format
-msgid "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
msgstr ""
#: standalone/drakbug:46
#, c-format
-msgid "Mandrivalinux Control Center"
+msgid "Mandriva Linux Control Center"
msgstr ""
#: standalone/drakbug:48
@@ -17072,14 +17072,14 @@ msgstr ""
#, c-format
msgid ""
"This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
msgstr ""
#: standalone/drakconnect:1009 standalone/net_applet:61
#, c-format
msgid ""
"You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
msgstr ""
#. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -17130,7 +17130,7 @@ msgstr ""
#: standalone/drakedm:36
#, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
msgstr ""
#: standalone/drakedm:37
@@ -17418,9 +17418,9 @@ msgid ""
"\n"
" DUPONT Sebastien (original version)\n"
"\n"
-" CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+" CHAUMETTE Damien <dchaumette@mandriva.com>\n"
"\n"
-" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+" VIGNAUD Thierry <tvignaud@mandriva.com>"
msgstr ""
#: standalone/drakfont:520
@@ -17890,7 +17890,7 @@ msgstr ""
#: standalone/drakhelp:36
#, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
msgstr ""
#: standalone/drakhelp:36
@@ -18449,7 +18449,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
#: standalone/draksound:57
@@ -20068,7 +20068,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
#: standalone/harddrake2:24
@@ -20726,7 +20726,7 @@ msgstr ""
msgid ""
"This is HardDrake, a %s hardware configuration tool.\n"
"<span foreground=\"royalblue3\">Version:</span> %s\n"
-"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;tvignaud@mandrakesoft.com&gt;\n"
+"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;tvignaud@mandriva.com&gt;\n"
"\n"
""
msgstr ""
@@ -20833,7 +20833,7 @@ msgstr ""
#: standalone/logdrake:50
#, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
msgstr ""
#: standalone/logdrake:51
@@ -21336,7 +21336,7 @@ msgstr ""
#, c-format
msgid ""
"Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
msgstr ""
#: standalone/net_monitor:341
diff --git a/perl-install/share/po/af.po b/perl-install/share/po/af.po
index 830afddc1..6717b8210 100644
--- a/perl-install/share/po/af.po
+++ b/perl-install/share/po/af.po
@@ -1303,7 +1303,7 @@ msgstr "selfdoen"
#: any.pm:733
#, c-format
msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux can support multiple languages. Select\n"
"the languages you would like to install. They will be available\n"
"when your installation is complete and you restart your system."
msgstr "U kan ander tale selekteer wat na installasie beskikbaar sal wees."
@@ -3707,12 +3707,12 @@ msgstr "laat radio ondersteuning toe"
#, c-format
msgid ""
"Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
"terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
"button will reboot your computer."
msgstr ""
"Voordat u voortgaan, lees asb die lisensieterme noukeurig deur. Dit dek\n"
-"die hele Mandrivalinux distribusie. Indien u saamstem met al die\n"
+"die hele Mandriva Linux distribusie. Indien u saamstem met al die\n"
"voorwaardes daarin, merk die \"%s\" boksie. Indien nie, kan u op die\n"
"\"%s\" knoppie druk om teherlaai."
@@ -3898,13 +3898,13 @@ msgstr ""
#: help.pm:85
#, fuzzy, c-format
msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
"selected package is located on another CD-ROM, DrakX will eject the current\n"
"CD and ask you to insert the required one. If you do not have the requested\n"
"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
"installed."
msgstr ""
-"Die Mandrivalinux installasie is versprei oor 'n aantal CD-ROMs.DrakX\n"
+"Die Mandriva Linux installasie is versprei oor 'n aantal CD-ROMs.DrakX\n"
"weet wanneer 'n gekose pakket op 'n ander CD-ROM is. DrakX sal in so\n"
"geval die huidige CD uitskop en aandui watter een benodig word."
@@ -3912,11 +3912,12 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
"simpler to manage, they have been placed into groups of similar\n"
"applications.\n"
"\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
"match applications from the various categories, so a ``Workstation''\n"
"installation can still have applications from the ``Server'' category\n"
"installed.\n"
@@ -3968,12 +3969,12 @@ msgid ""
"megabytes."
msgstr ""
"Nou moet u spesifiseer watter programme u op die rekenaar wil\n"
-"installeer. Daar is duisende pakkette beskikbaar vir Mandrivalinux, en\n"
+"installeer. Daar is duisende pakkette beskikbaar vir Mandriva Linux, en\n"
"om alles meer eenvoudig te maak, is die pakkette gegroepeer onder\n"
"groepe van selfde tipe programme.\n"
"\n"
"Die groepe is so saamgestel dat dit saamval met die tipe gebruik van u\n"
-"rekenaar. Mandrivalinux het vier vooraf gespesifseerde installasies\n"
+"rekenaar. Mandriva Linux het vier vooraf gespesifseerde installasies\n"
"beskikbaar. Dink aan hierdie tipes as houers met verskillende pakkette.\n"
"U kan wel uit die verskillende houers, verskillende pakkette kies.\n"
"Dus kan u \"Werkstasie\" ook programme uit die \"Ontwikkeling\"\n"
@@ -4066,10 +4067,10 @@ msgid ""
"!! If a server package has been selected, either because you specifically\n"
"chose the individual package or because it was part of a group of packages,\n"
"you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux will automatically start any installed\n"
"services at boot time. Even if they are safe and have no known issues at\n"
"the time the distribution was shipped, it is entirely possible that\n"
-"security holes were discovered after this version of Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
"finalized. If you do not know what a particular service is supposed to do "
"or\n"
"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4099,7 +4100,7 @@ msgstr ""
"\n"
"Indien u 'n diensprogram kies, of dit nou deel is van 'n groepe pakkette of\n"
"'n enkel een, sal u gevra word om die installasie daarvan te bevestig.\n"
-"Mandrivalinux sal by verstek alle bediener-programme afskop nadat u die\n"
+"Mandriva Linux sal by verstek alle bediener-programme afskop nadat u die\n"
"rekenaar aangeskakel het. Hierdie bediener-programme is verpak sonder\n"
"enige probleme bekend. Dit kon intussen verander het, nadat sekuriteits-"
"gate\n"
@@ -4242,7 +4243,7 @@ msgstr ""
msgid ""
"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
"on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
"\n"
"You'll see a list of different parameters to change to get an optimal\n"
"graphical display.\n"
@@ -4410,12 +4411,12 @@ msgstr ""
#: help.pm:316
#, fuzzy, c-format
msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\n"
"operating system on your hard drive. If your hard drive is empty or if an\n"
"existing operating system is using all the available space you will have to\n"
"partition the drive. Basically, partitioning a hard drive means to\n"
"logically divide it to create the space needed to install your new\n"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
"\n"
"Because the process of partitioning a hard drive is usually irreversible\n"
"and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4442,7 +4443,7 @@ msgid ""
"FAT or NTFS partition. Resizing can be performed without the loss of any\n"
"data, provided you've previously defragmented the Windows partition.\n"
"Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
"the same computer.\n"
"\n"
" Before choosing this option, please understand that after this\n"
@@ -4451,7 +4452,8 @@ msgid ""
"to store your data or to install new software.\n"
"\n"
" * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
"this option. Be careful, because you will not be able to undo this "
"operation\n"
"after you confirm.\n"
@@ -4471,11 +4473,11 @@ msgid ""
"experience. For more instructions on how to use the DiskDrake utility,\n"
"refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
msgstr ""
-"Op hierdie tydstip moet u besluit waar op die hardeskyf u Mandrivalinux\n"
+"Op hierdie tydstip moet u besluit waar op die hardeskyf u Mandriva Linux\n"
"wil installeer. Indien u 'n leë hardeskyf het, of indien 'n bestaande\n"
"bedryfstelsel al die beskikbare spasie gebruik, sal u partisies moet\n"
"skep. Om 'n partisie te skep veroorsaak dat u die hardeskyf logies\n"
-"verdeel, om spasie te skep vir u nuwe Mandrivalinux bedryfstelsel.\n"
+"verdeel, om spasie te skep vir u nuwe Mandriva Linux bedryfstelsel.\n"
"\n"
"Indien u 'n onervare gebruiker is, kan die skep van partisies vreemd en\n"
"intimiderend wees.\n"
@@ -4505,14 +4507,14 @@ msgstr ""
"geskied\n"
"sonner verlies van data, mits u die partisie gedefragmenteer het.Ons beveel "
"ten sterkste aan dat u 'n rugsteun maak van u data. Hierdie is\n"
-"die beste metode indien u beide Mandrivalinux en Microsoft Windows op die\n"
+"die beste metode indien u beide Mandriva Linux en Microsoft Windows op die\n"
"rekenaar wil gebruik.\n"
"\n"
"Neem tog kennis dat dit die beskikbare oop spasie in Microsoft Windows sal\n"
"verminder, aangesien ons plek moet maak vir Linux op die hardeskyf.\n"
"\n"
" * \"%s\": Indien u alle data op alle partisies op u hardeskyf wil uitwis,\n"
-"en dit dan vervang met Mandrivalinux, kan u hierdie opsie kies.\n"
+"en dit dan vervang met Mandriva Linux, kan u hierdie opsie kies.\n"
"Wees versigtig die opsie is onomkeerbaar!\n"
"\n"
" !! Net weer waarsku: alle data op die skyf sal vernietig word. !! \n"
@@ -4664,7 +4666,7 @@ msgid ""
"Click on \"%s\" when you're ready to format the partitions.\n"
"\n"
"Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
"\n"
"Click on \"%s\" if you wish to select partitions which will be checked for\n"
"bad blocks on the disk."
@@ -4704,7 +4706,7 @@ msgstr "Vorige"
#: help.pm:434
#, fuzzy, c-format
msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
"have been updated since the initial release. Bugs may have been fixed,\n"
"security issues resolved. To allow you to benefit from these updates,\n"
"you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4716,7 +4718,7 @@ msgid ""
"will appear: review the selection, and press \"%s\" to retrieve and install\n"
"the selected package(s), or \"%s\" to abort."
msgstr ""
-"Teen die tyd wat u Mandrivalinux installeer, is dit hoogs waarskynlik\n"
+"Teen die tyd wat u Mandriva Linux installeer, is dit hoogs waarskynlik\n"
"dat van die pakkette intussen opgedateer is. Foute kom reggestel wees,\n"
"of sekuriteits probleme is dalk opgelos. Om voordeel hieruit te put, kan\n"
"u hulle nou van die Internet aflaai. Merk \"%s\" indien u 'n werkende\n"
@@ -4743,7 +4745,7 @@ msgid ""
"generally obtained at the expense of ease of use.\n"
"\n"
"If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
"Control Center.\n"
"\n"
"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4756,7 +4758,8 @@ msgstr ""
"dit algemene gebruik op die rekenaar moeiliker maak.\n"
"\n"
"Indien u onseker is oor wat om te kies, bly by die verstek opsie. U\n"
-"kan altyd later die vlak verander deur draksec in die Mandrivalinux Control\n"
+"kan altyd later die vlak verander deur draksec in die Mandriva Linux "
+"Control\n"
"Center te grbruik.\n"
"\n"
"Die \"%s\" veld kan boodskappe stuur na 'n gekose persoon wat\n"
@@ -4772,7 +4775,7 @@ msgstr "Sekuriteits-admin:"
#, c-format
msgid ""
"At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
"defined, either from a previous installation of GNU/Linux or by another\n"
"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
"partitions must be defined.\n"
@@ -4843,7 +4846,7 @@ msgid ""
"emergency boot situations."
msgstr ""
"Nou moet u asseblief besluit watter partisie(s) u gaan gebruik vir die\n"
-"installasie van u Mandrivalinux rekenaar.Indien die partisies reeds\n"
+"installasie van u Mandriva Linux rekenaar.Indien die partisies reeds\n"
"geskep is gedurende 'n vorige GNU/Linux installasie of deur 'n ander\n"
"partisie-program, kan u hulle gebruik.Indien nie, moet u eerstens\n"
"partisies skep.\n"
@@ -4927,7 +4930,7 @@ msgstr "Skakel tussen normale/kenner modus"
msgid ""
"More than one Microsoft partition has been detected on your hard drive.\n"
"Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
"\n"
"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
"\"Capacity\".\n"
@@ -4957,7 +4960,7 @@ msgid ""
msgstr ""
"Ons het meer as een Microsoft-partisie op u hardeskyf gevind.\n"
"Kies dan nou die een wie se grootte u wil verander, om plek te maak\n"
-"vir u nuwe Mandrivalinux bedryfstelsel.\n"
+"vir u nuwe Mandriva Linux bedryfstelsel.\n"
"\n"
"Elke partisie is as volg gelys: \"Linux-naam\", \"Windows-naam\"\n"
"\"Kapasiteit\".\n"
@@ -5006,7 +5009,7 @@ msgid ""
"found on your machine.\n"
"\n"
"DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
"\n"
" * \"%s\". For the most part, this completely wipes out the old system.\n"
"However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5015,19 +5018,20 @@ msgid ""
"the file system, you should use this option.\n"
"\n"
" * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux system. Your current "
+"partitioning\n"
"scheme and user data will not be altered. Most of the other configuration\n"
"steps remain available and are similar to a standard installation.\n"
"\n"
-"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
msgstr ""
"Hierdie stap word slegs gedoen indien ou GNU/Linux partisies op die\n"
"rekenaar gevind is.\n"
"\n"
"DrakX moet nou weet of u 'n nuwe installasie of 'n opgradering van 'n\n"
-"bestaande Mandrivalinux wil doen:\n"
+"bestaande Mandriva Linux wil doen:\n"
"\n"
" * \"%s\": Hierdie deel word grootliks gebruik vir 'n hele nuwe "
"installasie.\n"
@@ -5036,7 +5040,7 @@ msgstr ""
"van u partisies se data wil behou.\n"
"\n"
" * \"%s\": hierdie tipe installasie laat u toe om pakkette op te dateer\n"
-"wat deel uitmaak van u huidige Mandrivalinux installasie. Die partisies\n"
+"wat deel uitmaak van u huidige Mandriva Linux installasie. Die partisies\n"
"en gebruiker se data bly onveranderd. Ander stappe is baie dieselfde as\n"
"'n normale installasie.\n"
"\n"
@@ -5095,7 +5099,8 @@ msgid ""
"\n"
"About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
"cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 "
+"will\n"
"depend on the user's choices:\n"
"\n"
" * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5349,7 +5354,7 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
"the printing systems is best suited to particular types of configuration.\n"
"\n"
" * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5370,11 +5375,11 @@ msgid ""
"options and for managing the printer.\n"
"\n"
"If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
"Control Center and clicking on the \"%s\" button."
msgstr ""
"Dit is nou tyd om u drukkerstelsel te kies. Ander bedryfstelsels sal\n"
-"seker net een aan u bied, maar Mandrivalinux gee twee. Elk van hulle\n"
+"seker net een aan u bied, maar Mandriva Linux gee twee. Elk van hulle\n"
"is beter as die ander in sekere gevalle.\n"
"\n"
" * \"%s\" -- wat vir \"print, do not queue\" staan. Kies dit indien u\n"
@@ -5393,7 +5398,7 @@ msgstr ""
"opsies te keis en drukkers te bestuur.\n"
"\n"
"Sou u die keuse nou, later wil verander, gaan gerus na 'PrinterDrake'\n"
-"in die 'Mandrivalinux Control Center' en klik op die \"Kenner\" knoppie."
+"in die 'Mandriva Linux Control Center' en klik op die \"Kenner\" knoppie."
#: help.pm:765
#, c-format
@@ -5511,7 +5516,8 @@ msgid ""
"\n"
" * \"%s\": if you wish to configure your Internet or local network access,\n"
"you can do so now. Refer to the printed documentation or use the\n"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to "
+"benefit\n"
"from full in-line help.\n"
"\n"
" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5528,7 +5534,7 @@ msgid ""
" * \"%s\": if you wish to change your bootloader configuration, click this\n"
"button. This should be reserved to advanced users. Refer to the printed\n"
"documentation or the in-line help about bootloader configuration in the\n"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
"\n"
" * \"%s\": through this entry you can fine tune which services will be run\n"
"on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5640,10 +5646,10 @@ msgstr "Dienste"
#, c-format
msgid ""
"Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
"and will not be recoverable!"
msgstr ""
-"Kies die hardeskyf wat u wil wis, om u nuwe Mandrivalinux\n"
+"Kies die hardeskyf wat u wil wis, om u nuwe Mandriva Linux\n"
"te kan installeer. Wees tog versigtig, alle huidige data op daardie\n"
"partisie sal vernietig word!"
@@ -5990,7 +5996,7 @@ msgstr "Bereken die grootte van die Windowspartisie"
#, c-format
msgid ""
"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
"installation."
msgstr "U Windows-partisie is te gefragmenteer. Loop eers 'defrag' asb."
@@ -6104,13 +6110,13 @@ msgstr "Netwerk op pad af"
msgid ""
"Introduction\n"
"\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
"shall be called the \"Software Products\" hereafter. The Software Products "
"include, but are not \n"
"restricted to, the set of programs, methods, rules and documentation related "
"to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
"\n"
"\n"
"1. License Agreement\n"
@@ -6164,7 +6170,7 @@ msgid ""
"loss) arising out \n"
"of the possession and use of software components or arising out of "
"downloading software components \n"
-"from one of Mandrivalinux sites which are prohibited or restricted in some "
+"from one of Mandriva Linux sites which are prohibited or restricted in some "
"countries by local laws.\n"
"This limited liability applies to, but is not restricted to, the strong "
"cryptography components \n"
@@ -6201,7 +6207,7 @@ msgid ""
"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
"as a whole or in \n"
"parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
"Mandriva S.A. \n"
"\n"
"\n"
@@ -6309,8 +6315,8 @@ msgid ""
"Remove the boot media and press return to reboot.\n"
"\n"
"\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
"consult the Errata available from:\n"
"\n"
"\n"
@@ -6318,13 +6324,13 @@ msgid ""
"\n"
"\n"
"Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
msgstr ""
"Geluk, installasie is afgehandel.\n"
"Verwyder die herlaaimedium en druk 'enter' om te herlaai.\n"
"\n"
"\n"
-"Vir inligting oor hierdie vrystelling van Mandrivalinux,\n"
+"Vir inligting oor hierdie vrystelling van Mandriva Linux,\n"
"bekyk die errata beskikbaar op\n"
"\n"
"\n"
@@ -6332,13 +6338,13 @@ msgstr ""
"\n"
"\n"
"Inligting oor stelskonfigurasie is beskikbaar in die postinstallasie-\n"
-"hoofstuk in die Offisiële Mandrivalinux Gebruikersgids."
+"hoofstuk in die Offisiële Mandriva Linux Gebruikersgids."
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
#: install_messages.pm:144
#, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
#: install_steps.pm:246
#, c-format
@@ -6367,13 +6373,13 @@ msgstr "Gaan stap '%s' binne\n"
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
"this,\n"
"press `F1' when booting on CDROM, then enter `text'."
msgstr ""
"U stelsel het min hulpbronne beskikbaar. U mag dalk probleme\n"
"ondervind met die installering\n"
-"van Mandrivalinux. In so 'n geval probeer eerder die teksinstallasie.\n"
+"van Mandriva Linux. In so 'n geval probeer eerder die teksinstallasie.\n"
"Daarvoor moet u\n"
"'F1' druk wanneer u vanaf die CDROM herlaai en dan 'text' op die\n"
"instruksielyn intik."
@@ -6912,8 +6918,8 @@ msgstr ""
#: install_steps_interactive.pm:821
#, c-format
msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
-msgstr "Kontak Mandrivalinux se webwerf vir 'n lys van spieëlwebplekke...."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr "Kontak Mandriva Linux se webwerf vir 'n lys van spieëlwebplekke...."
#: install_steps_interactive.pm:840
#, c-format
@@ -7135,8 +7141,8 @@ msgstr ""
#: install_steps_newt.pm:20
#, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux Installasie %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux Installasie %s"
#. -PO: This string must fit in a 80-char wide text screen
#: install_steps_newt.pm:34
@@ -9727,13 +9733,13 @@ msgstr ""
msgid ""
"drakfirewall configurator\n"
"\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
"For a powerful and dedicated firewall solution, please look to the\n"
"specialized MandrakeSecurity Firewall distribution."
msgstr ""
"drakfirewall konfigurasie\n"
"\n"
-"Hiermee stel u 'n persoonlike vuurmuur op vir die Mandrivalinux\n"
+"Hiermee stel u 'n persoonlike vuurmuur op vir die Mandriva Linux\n"
"rekenaar. Indien u 'n kragtige en toegewyde vuurmuur verlang, kyk\n"
"dan gerus na die 'MandrakeSecurity Firewall'."
@@ -13773,8 +13779,8 @@ msgstr ""
#: printer/printerdrake.pm:3929
#, c-format
msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
"\n"
msgstr ""
@@ -14046,7 +14052,7 @@ msgid ""
msgstr ""
"Die netwerk, soos opgestel gedurende die installasie, kom nie aan die gang "
"nie. Maak tog seker die netwerk is tot u beskikking, en gaan u konfigurasie "
-"na deur die 'Mandrivalinux Control Center' te gebruik. "
+"na deur die 'Mandriva Linux Control Center' te gebruik. "
#: printer/printerdrake.pm:4196
#, c-format
@@ -15674,18 +15680,18 @@ msgstr "Stop"
#: share/advertising/01.pl:13
#, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Wat is Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Wat is Mandriva Linux?</b>"
#: share/advertising/01.pl:15
#, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Welkom by <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Welkom by <b>Mandriva Linux</b>!"
#: share/advertising/01.pl:17
#, c-format
msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"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."
@@ -15694,11 +15700,11 @@ msgstr ""
#: share/advertising/01.pl:19
#, fuzzy, c-format
msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"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!"
msgstr ""
-"Mandrivalinux is 'n Oopbron bedryfstelsel wat duisende van die keurigste "
-"programme beskikbaar in die Oopbron wêreld bevat. Mandrivalinux is een van "
+"Mandriva Linux is 'n Oopbron bedryfstelsel wat duisende van die keurigste "
+"programme beskikbaar in die Oopbron wêreld bevat. Mandriva Linux is een van "
"die gewildste in die wereld!"
#: share/advertising/02.pl:13
@@ -15714,12 +15720,12 @@ msgstr "Welkom by die wêreld van Oopbron sagteware!"
#: share/advertising/02.pl:17
#, fuzzy, c-format
msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"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 Mandrivalinux "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
"contributors."
msgstr ""
-"Mandrivalinux is toegewyd aan die Oopbron manier van dinge doen. Hierdie "
+"Mandriva Linux is toegewyd aan die Oopbron manier van dinge doen. Hierdie "
"vrystelling is die reslutaat van samewerking tussen Mandriva se span "
"ontwikkelaars en 'n wereldwye gemeenskap wan mense wat bydraes lewer."
@@ -15740,8 +15746,8 @@ msgstr "<b>Neem Kennis</b>"
#: share/advertising/03.pl:15
#, c-format
msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
msgstr ""
#: share/advertising/03.pl:17
@@ -15762,34 +15768,34 @@ msgstr ""
#: share/advertising/04.pl:13
#, fuzzy, c-format
msgid "<b>Join the Community</b>"
-msgstr "<b>Sluit aan by die Mandrivalinux gemeenskap!</b>"
+msgstr "<b>Sluit aan by die Mandriva Linux gemeenskap!</b>"
#: share/advertising/04.pl:15
#, c-format
msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"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 Mandrivalinux world."
+"<b>key role</b> in the Mandriva Linux world."
msgstr ""
#: share/advertising/04.pl:17
#, c-format
msgid ""
"To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"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."
msgstr ""
#: share/advertising/05.pl:15
#, fuzzy, c-format
msgid "<b>Download Version</b>"
-msgstr "Hierdie is die Mandrivalinux <b>Download weergawe</b>."
+msgstr "Hierdie is die Mandriva Linux <b>Download weergawe</b>."
#: share/advertising/05.pl:17
#, c-format
msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
"version that Mandriva wants to keep <b>available to everyone</b>."
msgstr ""
@@ -15827,7 +15833,7 @@ msgstr ""
#: share/advertising/06.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
msgstr ""
#: share/advertising/06.pl:17
@@ -15849,7 +15855,7 @@ msgstr ""
#: share/advertising/07.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
msgstr ""
#: share/advertising/07.pl:17
@@ -15870,7 +15876,7 @@ msgstr ""
#: share/advertising/08.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
msgstr ""
#: share/advertising/08.pl:17
@@ -15893,13 +15899,13 @@ msgstr "<b>Mandriva Store</b>"
#: share/advertising/09.pl:15
#, c-format
msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
msgstr ""
#: share/advertising/09.pl:17
#, fuzzy, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux Updates Applet"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux Updates Applet"
#: share/advertising/09.pl:18
#, c-format
@@ -15919,7 +15925,7 @@ msgstr ""
#: share/advertising/09.pl:21
#, c-format
msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
"the most of your 64-bit processor."
msgstr ""
@@ -15931,21 +15937,21 @@ msgstr ""
#: share/advertising/10.pl:17
#, c-format
msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"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:"
msgstr ""
#: share/advertising/10.pl:18
#, c-format
msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
"bootable CD-ROM."
msgstr ""
#: share/advertising/10.pl:19
#, c-format
msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
"ultra-compact “LaCie Mobile Hard Drive”."
msgstr ""
@@ -15963,17 +15969,19 @@ msgstr ""
#: share/advertising/11.pl:16
#, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
msgstr ""
#: share/advertising/11.pl:17
#, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
msgstr ""
#: share/advertising/11.pl:18
#, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
msgstr ""
#: share/advertising/12.pl:13
@@ -16152,10 +16160,10 @@ msgstr ""
#: share/advertising/18.pl:15
#, fuzzy, c-format
msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
"<b>all of your tasks</b>:"
msgstr ""
-"Die kieslys in Mandrivalinux het gebruikersvriendelike programme vir alle "
+"Die kieslys in Mandriva Linux het gebruikersvriendelike programme vir alle "
"behoefdes:"
#: share/advertising/18.pl:16
@@ -16397,18 +16405,18 @@ msgstr ""
#: share/advertising/25.pl:13
#, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux Control Center</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux Control Center</b>"
#: share/advertising/25.pl:15
#, fuzzy, c-format
msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
"your computer."
msgstr ""
-"Die \"Mandrivalinux Control Center\" is 'n versameling nutsprogramme wat die "
-"opstel van u rekenaar vergemaklik."
+"Die \"Mandriva Linux Control Center\" is 'n versameling nutsprogramme wat "
+"die opstel van u rekenaar vergemaklik."
#: share/advertising/25.pl:17
#, fuzzy, c-format
@@ -16432,8 +16440,8 @@ msgid ""
"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 "
+"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!"
msgstr ""
@@ -16465,8 +16473,8 @@ msgstr ""
#: share/advertising/27.pl:21
#, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Gaan draai sommer vandag by <b>store.mandrakesoft.com</b>"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Gaan draai sommer vandag by <b>store.mandriva.com</b>"
#: share/advertising/28.pl:15
#, c-format
@@ -16476,7 +16484,7 @@ msgstr "<b>Mandriva Club</b>"
#: share/advertising/28.pl:17
#, c-format
msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
"product.."
msgstr ""
@@ -16492,7 +16500,7 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
msgstr "\t* Spesiale afslag vir produkte en dienste by \"Mandriva Store\""
#: share/advertising/28.pl:21
@@ -16504,14 +16512,14 @@ msgstr ""
#: share/advertising/28.pl:22
#, fuzzy, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
msgstr "\t* Deel in die aanlyn kletzkamers met <b>Kopete</b>"
#: share/advertising/28.pl:23
#, c-format
msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
msgstr ""
#: share/advertising/29.pl:13
@@ -16530,7 +16538,7 @@ msgstr ""
#, c-format
msgid ""
"Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
msgstr ""
#: share/advertising/29.pl:18
@@ -16553,7 +16561,7 @@ msgstr ""
#: share/advertising/29.pl:21
#, c-format
msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
msgstr ""
#: share/advertising/30.pl:13
@@ -16565,21 +16573,21 @@ msgstr "<b>Mandriva Expert</b>"
#, c-format
msgid ""
"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
msgstr ""
#: share/advertising/30.pl:17
#, c-format
msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
"a lot of time."
msgstr ""
#: share/advertising/30.pl:19
#, c-format
msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
msgstr ""
#: share/compssUsers.pl:25
@@ -16970,8 +16978,8 @@ msgid ""
"\n"
"OPTIONS:\n"
" --help - print this help message.\n"
-" --report - program should be one of mandrakelinux tools\n"
-" --incident - program should be one of mandrakelinux tools"
+" --report - program should be one of Mandriva Linux tools\n"
+" --incident - program should be one of Mandriva Linux tools"
msgstr ""
"[OPSIES] [PROGRAMNAAM]\n"
"\n"
@@ -17032,7 +17040,7 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
"--enable : enable MTS\n"
"--disable : disable MTS\n"
"--start : start MTS\n"
@@ -19890,13 +19898,13 @@ msgstr ""
#: standalone/drakbug:41
#, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux Bug Report Tool"
#: standalone/drakbug:46
#, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux Control Center"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux Control Center"
#: standalone/drakbug:48
#, c-format
@@ -20388,20 +20396,20 @@ msgstr "Gelaai tydens herlaaityd"
#, c-format
msgid ""
"This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
msgstr ""
"Hierdie koppelvlak is nog nie opgestel nie.\n"
-"Loods die \"Add an interface\"-assistent vanuit die Mandrivalinux Control "
+"Loods die \"Add an interface\"-assistent vanuit die Mandriva Linux Control "
"Center"
#: standalone/drakconnect:1009 standalone/net_applet:61
#, fuzzy, c-format
msgid ""
"You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
msgstr ""
"Hierdie koppelvlak is nog nie opgestel nie.\n"
-"Loods die \"%s\"-assistent vanuit die Mandrivalinux Control Center"
+"Loods die \"%s\"-assistent vanuit die Mandriva Linux Control Center"
#. -PO: here "Add Connection" should be translated the same was as in control-center
#: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20451,7 +20459,7 @@ msgstr ""
#: standalone/drakedm:36
#, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
msgstr ""
#: standalone/drakedm:37
@@ -20754,18 +20762,18 @@ msgid ""
"\n"
" DUPONT Sebastien (original version)\n"
"\n"
-" CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+" CHAUMETTE Damien <dchaumette@mandriva.com>\n"
"\n"
-" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+" VIGNAUD Thierry <tvignaud@mandriva.com>"
msgstr ""
"Copyright (C) 2001-2002 by Mandriva \n"
"\n"
"\n"
" DUPONT Sebastien (original version)\n"
"\n"
-" CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+" CHAUMETTE Damien <dchaumette@mandriva.com>\n"
"\n"
-" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+" VIGNAUD Thierry <tvignaud@mandriva.com>"
#: standalone/drakfont:520
#, c-format
@@ -21338,8 +21346,8 @@ msgstr ""
#: standalone/drakhelp:36
#, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinux Hulp Sentrum"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linux Hulp Sentrum"
#: standalone/drakhelp:36
#, c-format
@@ -22000,7 +22008,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
"Geen klankkaart is op u rekenaar bespeur nie. Maak tog seker dat dit 'n\n"
"Linux-ondersteunde klankkaart is. Kyk of dit reg ingeprop is.\n"
@@ -22009,7 +22017,7 @@ msgstr ""
"U kan ons hardeware-databasis besoek te:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
#: standalone/draksound:57
#, c-format
@@ -24021,7 +24029,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
"Geen TV-kaart is op u rekenaar bespeur nie. Maak tog seker dat dit 'n Linux-"
"ondersteunde Video/TV-kaart is. Kyk of dit reg ingeprop is.\n"
@@ -24030,7 +24038,7 @@ msgstr ""
"U kan ons hardeware-databasis besoek te:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
#: standalone/harddrake2:24
#, c-format
@@ -24741,13 +24749,13 @@ msgid ""
"This is HardDrake, a %s hardware configuration tool.\n"
"<span foreground=\"royalblue3\">Version:</span> %s\n"
"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
"\n"
msgstr ""
"Hierdie is HardDrake,'n Mandrake program vir hardewarekonfigurasie.\n"
"<span foreground=\"royalblue3\">Weergawe:</span> %s\n"
"<span foreground=\"royalblue3\">Skrywer</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
"\n"
#: standalone/harddrake2:243
@@ -24857,8 +24865,8 @@ msgstr "Die verandering is aangebring, maar u moet eers afteken"
#: standalone/logdrake:50
#, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linux Tools Logs"
#: standalone/logdrake:51
#, c-format
@@ -25368,10 +25376,10 @@ msgstr "Voltooide konneksie."
#, c-format
msgid ""
"Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
msgstr ""
"Probleme met die Konneksie\n"
-"Maak tog seker van u konfigurasie in die 'Mandrivalinux Control Center'."
+"Maak tog seker van u konfigurasie in die 'Mandriva Linux Control Center'."
#: standalone/net_monitor:341
#, c-format
@@ -26394,16 +26402,17 @@ msgstr "Installasie het gefaal!"
#~ msgstr "Fout om %s in skryfmodus te open: %s"
#~ msgid ""
-#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandriva Linux hardware configuration tool.\n"
#~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
#~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
#~ "\n"
#~ msgstr ""
-#~ "Hierdie is HardDrake,'n Mandrivalinux program vir hardewarekonfigurasie.\n"
+#~ "Hierdie is HardDrake,'n Mandriva Linux program vir "
+#~ "hardewarekonfigurasie.\n"
#~ "<span foreground=\"royalblue3\">Weergawe:</span> %s\n"
#~ "<span foreground=\"royalblue3\">Skrywer</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
#~ "\n"
#~ msgid "OK"
@@ -26804,8 +26813,8 @@ msgstr "Installasie het gefaal!"
#~ msgstr ""
#~ "Probleme om drukker \"%s\" uit Star Office/OpenOffice.org/GIMP te verwyder"
-#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
-#~ msgstr "<b>Veels Geluk met u puik keuse van Mandrivalinux! ;-)</b>"
+#~ msgid "<b>Congratulations for choosing Mandriva Linux!</b>"
+#~ msgstr "<b>Veels Geluk met u puik keuse van Mandriva Linux! ;-)</b>"
#~ msgid ""
#~ "We would like to thank everyone who participated in the development of "
@@ -26916,9 +26925,9 @@ msgstr "Installasie het gefaal!"
#~ "\t* Spesiale spieel bedieners wat uitsluitlik vir \"Mandriva Club\" se "
#~ "lede is"
-#~ msgid "\t* Voting for software to put in Mandrivalinux"
+#~ msgid "\t* Voting for software to put in Mandriva Linux"
#~ msgstr ""
-#~ "\t* Stemreg om te kan se watter sagteware u in Mandrivalinux wil sien"
+#~ "\t* Stemreg om te kan se watter sagteware u in Mandriva Linux wil sien"
#~ msgid "\t* Plus much more"
#~ msgstr "\t* Plus veel meer"
@@ -26934,10 +26943,10 @@ msgstr "Installasie het gefaal!"
#~ msgid ""
#~ "If you have Linux questions, subscribe to Mandriva Expert at <b>www."
-#~ "mandrakeexpert.com</b>"
+#~ "mandrivaexpert.com</b>"
#~ msgstr ""
#~ "Sou u enige Linux tipe vrae het, sluit aan by Mandriva Expert <b>www. "
-#~ "mandrakeexpert.com</b>"
+#~ "mandrivaexpert.com</b>"
#~ msgid ""
#~ "If you would like to get involved, please subscribe to the \"Cooker\" "
@@ -26954,22 +26963,23 @@ msgstr "Installasie het gefaal!"
#~ "mandrake- linux.com</b>!"
#~ msgid ""
-#~ "Mandrivalinux includes the famous graphical desktops KDE and GNOME, plus "
+#~ "Mandriva Linux includes the famous graphical desktops KDE and GNOME, plus "
#~ "the latest versions of the most popular Open Source applications."
#~ msgstr ""
-#~ "Mandrivalinux sluit die bekende KDEen GNOME grafiese werkskerms, asook "
+#~ "Mandriva Linux sluit die bekende KDEen GNOME grafiese werkskerms, asook "
#~ "die nuutste weergawes van die mees gewilde Oopbron programme in."
#~ msgid ""
-#~ "Mandrivalinux is widely known as the most user-friendly and the easiest "
+#~ "Mandriva Linux is widely known as the most user-friendly and the easiest "
#~ "to install and easy to use Linux distribution."
#~ msgstr ""
-#~ "Mandrivalinux word deur meeste mense as die gebruikervriendelikste Linux "
+#~ "Mandriva Linux word deur meeste mense as die gebruikervriendelikste Linux "
#~ "beskou. Dit is maklik om te installeer en maklik om te gebruik."
-#~ msgid "\t* Find out Mandrivalinux on a bootable CD with <b>Mandrakemove</b>"
+#~ msgid ""
+#~ "\t* Find out Mandriva Linux on a bootable CD with <b>Mandrakemove</b>"
#~ msgstr ""
-#~ "\t* Vind uit oor Mandrivalinux op 'n selflaai CD - <b>Mandrakemove</b>"
+#~ "\t* Vind uit oor Mandriva Linux op 'n selflaai CD - <b>Mandrakemove</b>"
#~ msgid ""
#~ "\t* If you use Linux mostly for Office, Internet and Multimedia tasks, "
@@ -27015,9 +27025,8 @@ msgstr "Installasie het gefaal!"
#~ msgid ""
#~ "<b>MandrakeClustering</b>: the power and speed of a Linux cluster "
-#~ "combined with the stability and easy-of-use of the world-famous "
-#~ "Mandrivalinux distribution. A unique blend for incomparable HPC "
-#~ "performance."
+#~ "combined with the stability and easy-of-use of the world-famous Mandriva "
+#~ "Linux distribution. A unique blend for incomparable HPC performance."
#~ msgstr ""
#~ "<b>MandrakeClustering</b>: die krag en spoed van 'n Linux-trosrekenaar "
#~ "gekombineer met die stabiliteit en gebruikersvriendelikheid van Mandrake "
@@ -27038,8 +27047,8 @@ msgstr "Installasie het gefaal!"
#~ msgid "<b>Do you require assistance?</b>"
#~ msgstr "<b>Benodig u bystand?</b>"
-#~ msgid "This is the Mandrivalinux <b>Download version</b>."
-#~ msgstr "Hierdie is die Mandrivalinux <b>Download weergawe</b>."
+#~ msgid "This is the Mandriva Linux <b>Download version</b>."
+#~ msgstr "Hierdie is die Mandriva Linux <b>Download weergawe</b>."
#~ msgid ""
#~ "The free download version does not include commercial software, and "
@@ -27063,26 +27072,27 @@ msgstr "Installasie het gefaal!"
#~ "'n volledige keuse wereldklas bediener aplikasies in te sluit."
#~ msgid ""
-#~ "It is the only Mandrivalinux product that includes the groupware solution."
+#~ "It is the only Mandriva Linux product that includes the groupware "
+#~ "solution."
#~ msgstr ""
-#~ "Dit is die enigste Mandrivalinux produk wat die \"groupware\" oplossing "
+#~ "Dit is die enigste Mandriva Linux produk wat die \"groupware\" oplossing "
#~ "bevat."
#~ msgid ""
-#~ "When you log into your Mandrivalinux system for the first time, you can "
+#~ "When you log into your Mandriva Linux system for the first time, you can "
#~ "choose between several popular graphical desktops environments, "
#~ "including: KDE, GNOME, WindowMaker, IceWM, and others."
#~ msgstr ""
-#~ "Sodra u die eerste keer inteken op u Mandrivalinux rekenaar, het u 'n "
+#~ "Sodra u die eerste keer inteken op u Mandriva Linux rekenaar, het u 'n "
#~ "keuse watter grafiese werksomgewing om te gebruik. Keuses sluit KDE, "
#~ "GNOME, WindowMaker, IceWM, en ander in."
#~ msgid ""
-#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
+#~ "In the Mandriva Linux menu you will find easy-to-use applications for all "
#~ "of your tasks:"
#~ msgstr ""
-#~ "Die kieslys in Mandrivalinux het gebruikersvriendelike programme vir alle "
-#~ "behoefdes:"
+#~ "Die kieslys in Mandriva Linux het gebruikersvriendelike programme vir "
+#~ "alle behoefdes:"
#~ msgid ""
#~ "\t* Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
@@ -27126,11 +27136,11 @@ msgstr "Installasie het gefaal!"
#~ msgstr "\t* Adresboek (kliënt en bediener)"
#~ msgid ""
-#~ "Your new Mandrivalinux distribution is the result of collaborative "
-#~ "efforts between Mandriva developers and Mandrivalinux contributors "
+#~ "Your new Mandriva Linux distribution is the result of collaborative "
+#~ "efforts between Mandriva developers and Mandriva Linux contributors "
#~ "throughout the world."
#~ msgstr ""
-#~ "U nuwe Mandrivalinux bedryfstelsel met al sy programme is die resultaat "
+#~ "U nuwe Mandriva Linux bedryfstelsel met al sy programme is die resultaat "
#~ "van 'n wereldwye gemeenskap, wat Mandriva se ontwikkelaars, asook mense "
#~ "in Sonnige Suid-Afrika insluit!"
@@ -27200,13 +27210,13 @@ msgstr "Installasie het gefaal!"
#~ msgid ""
#~ "Before continuing, you should carefully read the terms of the license. "
#~ "It\n"
-#~ "covers the entire Mandrivalinux distribution. If you do agree with all "
+#~ "covers the entire Mandriva Linux distribution. If you do agree with all "
#~ "the\n"
#~ "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
#~ "will reboot your computer."
#~ msgstr ""
#~ "Voordat u voortgaan, lees asb die lisensieterme noukeurig deur. Dit dek\n"
-#~ "die hele Mandrivalinux distribusie. Indien u saamstem met al die\n"
+#~ "die hele Mandriva Linux distribusie. Indien u saamstem met al die\n"
#~ "voorwaardes daarin, merk die \"%s\" boksie. Indien nie, kan u op die\n"
#~ "\"%s\" knoppie druk om teherlaai."
@@ -27318,25 +27328,27 @@ msgstr "Installasie het gefaal!"
#~ "nie. "
#~ msgid ""
-#~ "The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+#~ "The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
#~ "selected package is located on another CD-ROM, DrakX will eject the "
#~ "current\n"
#~ "CD and ask you to insert the correct CD as required."
#~ msgstr ""
-#~ "Die Mandrivalinux installasie is versprei oor 'n aantal CD-ROMs.DrakX\n"
+#~ "Die Mandriva Linux installasie is versprei oor 'n aantal CD-ROMs.DrakX\n"
#~ "weet wanneer 'n gekose pakket op 'n ander CD-ROM is. DrakX sal in so\n"
#~ "geval die huidige CD uitskop en aandui watter een benodig word."
#~ msgid ""
#~ "It is now time to specify which programs you wish to install on your\n"
-#~ "system. There are thousands of packages available for Mandrivalinux, and\n"
+#~ "system. There are thousands of packages available for Mandriva Linux, "
+#~ "and\n"
#~ "to make it simpler to manage the packages have been placed into groups "
#~ "of\n"
#~ "similar applications.\n"
#~ "\n"
#~ "Packages are sorted into groups corresponding to a particular use of "
#~ "your\n"
-#~ "machine. Mandrivalinux sorts packages groups in four categories. You can\n"
+#~ "machine. Mandriva Linux sorts packages groups in four categories. You "
+#~ "can\n"
#~ "mix and match applications from the various categories, so a\n"
#~ "``Workstation'' installation can still have applications from the\n"
#~ "``Development'' category installed.\n"
@@ -27389,12 +27401,12 @@ msgstr "Installasie het gefaal!"
#~ "updating an existing system."
#~ msgstr ""
#~ "Nou moet u spesifiseer watter programme u op die rekenaar wil\n"
-#~ "installeer. Daar is duisende pakkette beskikbaar vir Mandrivalinux, en\n"
+#~ "installeer. Daar is duisende pakkette beskikbaar vir Mandriva Linux, en\n"
#~ "om alles meer eenvoudig te maak, is die pakkette gegroepeer onder\n"
#~ "groepe van selfde tipe programme.\n"
#~ "\n"
#~ "Die groepe is so saamgestel dat dit saamval met die tipe gebruik van u\n"
-#~ "rekenaar. Mandrivalinux het vier vooraf gespesifseerde installasies\n"
+#~ "rekenaar. Mandriva Linux het vier vooraf gespesifseerde installasies\n"
#~ "beskikbaar. Dink aan hierdie tipes as houers met verskillende pakkette.\n"
#~ "U kan wel uit die verskillende houers, verskillende pakkette kies.\n"
#~ "Dus kan u \"Werkstasie\" ook programme uit die \"Ontwikkeling\"\n"
@@ -27450,11 +27462,11 @@ msgstr "Installasie het gefaal!"
#~ "chose the individual package or because it was part of a group of "
#~ "packages,\n"
#~ "you will be asked to confirm that you really want those servers to be\n"
-#~ "installed. By default Mandrivalinux will automatically start any "
+#~ "installed. By default Mandriva Linux will automatically start any "
#~ "installed\n"
#~ "services at boot time. Even if they are safe and have no known issues at\n"
#~ "the time the distribution was shipped, it is entirely possible that that\n"
-#~ "security holes were discovered after this version of Mandrivalinux was\n"
+#~ "security holes were discovered after this version of Mandriva Linux was\n"
#~ "finalized. If you do not know what a particular service is supposed to "
#~ "do\n"
#~ "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
@@ -27493,7 +27505,7 @@ msgstr "Installasie het gefaal!"
#~ "Indien u 'n diensprogram kies, of dit nou deel is van 'n groepe pakkette "
#~ "of\n"
#~ "'n enkel een, sal u gevra word om die installasie daarvan te bevestig.\n"
-#~ "Mandrivalinux sal by verstek alle bediener-programme afskop nadat u die\n"
+#~ "Mandriva Linux sal by verstek alle bediener-programme afskop nadat u die\n"
#~ "rekenaar aangeskakel het. Hierdie bediener-programme is verpak sonder\n"
#~ "enige probleme bekend. Dit kon intussen verander het, nadat sekuriteits-"
#~ "gate\n"
@@ -27522,7 +27534,8 @@ msgstr "Installasie het gefaal!"
#~ "You will now set up your Internet/network connection. If you wish to\n"
#~ "connect your computer to the Internet or to a local network, click \"%s"
#~ "\".\n"
-#~ "Mandrivalinux will attempt to auto-detect network devices and modems. If\n"
+#~ "Mandriva Linux will attempt to auto-detect network devices and modems. "
+#~ "If\n"
#~ "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
#~ "configure the network, or to do it later, in which case clicking the \"%s"
#~ "\"\n"
@@ -27543,7 +27556,7 @@ msgstr "Installasie het gefaal!"
#~ "modems\n"
#~ "that require additional software to work compared to Normal modems. Some "
#~ "of\n"
-#~ "those modems actually work under Mandrivalinux, some others do not. You\n"
+#~ "those modems actually work under Mandriva Linux, some others do not. You\n"
#~ "can consult the list of supported modems at LinModems.\n"
#~ "\n"
#~ "You can consult the ``Starter Guide'' chapter about Internet connections\n"
@@ -27554,7 +27567,7 @@ msgstr "Installasie het gefaal!"
#~ "U kan nou die Internet/netwerk konneksie opstel. Indien u graag die "
#~ "rekenaar\n"
#~ "aan die Internet of plaaslike netwerk wil koppel, kies \"%s\".\n"
-#~ "Mandrivalinux sal poog om u netwerk toestelle en modems te outospeur.\n"
+#~ "Mandriva Linux sal poog om u netwerk toestelle en modems te outospeur.\n"
#~ "Indien\n"
#~ "dit onsuksesvol was, probeer waar \"%s\" nie gemerk is nie. U kan ook "
#~ "kies\n"
@@ -27681,7 +27694,7 @@ msgstr "Installasie het gefaal!"
#~ "X (for X Window System) is the heart of the GNU/Linux graphical "
#~ "interface\n"
#~ "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-#~ "WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+#~ "WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
#~ "\n"
#~ "You will be presented with a list of different parameters to change to "
#~ "get\n"
@@ -27866,7 +27879,7 @@ msgstr "Installasie het gefaal!"
#~ "have to partition the drive. Basically, partitioning a hard drive "
#~ "consists\n"
#~ "of logically dividing it to create the space needed to install your new\n"
-#~ "Mandrivalinux system.\n"
+#~ "Mandriva Linux system.\n"
#~ "\n"
#~ "Because the process of partitioning a hard drive is usually irreversible\n"
#~ "and can lead to lost data if there is an existing operating system "
@@ -27905,7 +27918,7 @@ msgstr "Installasie het gefaal!"
#~ "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
#~ "data, provided you have previously defragmented the Windows partition.\n"
#~ "Backing up your data is strongly recommended.. Using this option is\n"
-#~ "recommended if you want to use both Mandrivalinux and Microsoft Windows "
+#~ "recommended if you want to use both Mandriva Linux and Microsoft Windows "
#~ "on\n"
#~ "the same computer.\n"
#~ "\n"
@@ -27915,7 +27928,7 @@ msgstr "Installasie het gefaal!"
#~ "Windows to store your data or to install new software.\n"
#~ "\n"
#~ " * \"%s\": if you want to delete all data and all partitions present on\n"
-#~ "your hard drive and replace them with your new Mandrivalinux system,\n"
+#~ "your hard drive and replace them with your new Mandriva Linux system,\n"
#~ "choose this option. Be careful, because you will not be able to undo "
#~ "your\n"
#~ "choice after you confirm.\n"
@@ -27940,11 +27953,11 @@ msgstr "Installasie het gefaal!"
#~ "refer to the ``Managing Your Partitions'' section in the ``Starter "
#~ "Guide''."
#~ msgstr ""
-#~ "Op hierdie tydstip moet u besluit waar op die hardeskyf u Mandrivalinux\n"
+#~ "Op hierdie tydstip moet u besluit waar op die hardeskyf u Mandriva Linux\n"
#~ "wil installeer. Indien u 'n leë hardeskyf het, of indien 'n bestaande\n"
#~ "bedryfstelsel al die beskikbare spasie gebruik, sal u partisies moet\n"
#~ "skep. Om 'n partisie te skep veroorsaak dat u die hardeskyf logies\n"
-#~ "verdeel, om spasie te skep vir u nuwe Mandrivalinux bedryfstelsel.\n"
+#~ "verdeel, om spasie te skep vir u nuwe Mandriva Linux bedryfstelsel.\n"
#~ "\n"
#~ "Indien u 'n onervare gebruiker is, kan die skep van partisies vreemd en\n"
#~ "intimiderend wees.\n"
@@ -27980,7 +27993,7 @@ msgstr "Installasie het gefaal!"
#~ "geskied\n"
#~ "sonner verlies van data, mits u die partisie gedefragmenteer het.Ons "
#~ "beveel ten sterkste aan dat u 'n rugsteun maak van u data. Hierdie is\n"
-#~ "die beste metode indien u beide Mandrivalinux en Microsoft Windows op "
+#~ "die beste metode indien u beide Mandriva Linux en Microsoft Windows op "
#~ "die\n"
#~ "rekenaar wil gebruik.\n"
#~ "\n"
@@ -27990,7 +28003,7 @@ msgstr "Installasie het gefaal!"
#~ "\n"
#~ " * \"%s\": Indien u alle data op alle partisies op u hardeskyf wil "
#~ "uitwis,\n"
-#~ "en dit dan vervang met Mandrivalinux, kan u hierdie opsie kies.\n"
+#~ "en dit dan vervang met Mandriva Linux, kan u hierdie opsie kies.\n"
#~ "Wees versigtig die opsie is onomkeerbaar!\n"
#~ "\n"
#~ " !! Net weer waarsku: alle data op die skyf sal vernietig word. !! \n"
@@ -28097,7 +28110,7 @@ msgstr "Installasie het gefaal!"
#~ "Click on \"%s\" when you are ready to format the partitions.\n"
#~ "\n"
#~ "Click on \"%s\" if you want to choose another partition for your new\n"
-#~ "Mandrivalinux operating system installation.\n"
+#~ "Mandriva Linux operating system installation.\n"
#~ "\n"
#~ "Click on \"%s\" if you wish to select partitions that will be checked "
#~ "for\n"
@@ -28127,7 +28140,7 @@ msgstr "Installasie het gefaal!"
#~ "getoets moet word."
#~ msgid ""
-#~ "At the time you are installing Mandrivalinux, it is likely that some\n"
+#~ "At the time you are installing Mandriva Linux, it is likely that some\n"
#~ "packages will have been updated since the initial release. Bugs may have\n"
#~ "been fixed, security issues resolved. To allow you to benefit from these\n"
#~ "updates, you are now able to download them from the Internet. Check \"%s"
@@ -28142,7 +28155,7 @@ msgstr "Installasie het gefaal!"
#~ "the\n"
#~ "selected package(s), or \"%s\" to abort."
#~ msgstr ""
-#~ "Teen die tyd wat u Mandrivalinux installeer, is dit hoogs waarskynlik\n"
+#~ "Teen die tyd wat u Mandriva Linux installeer, is dit hoogs waarskynlik\n"
#~ "dat van die pakkette intussen opgedateer is. Foute kom reggestel wees,\n"
#~ "of sekuriteits probleme is dalk opgelos. Om voordeel hieruit te put, kan\n"
#~ "u hulle nou van die Internet aflaai. Merk \"%s\" indien u 'n werkende\n"
@@ -28205,7 +28218,7 @@ msgstr "Installasie het gefaal!"
#~ "\n"
#~ "DrakX now needs to know if you want to perform a new install or an "
#~ "upgrade\n"
-#~ "of an existing Mandrivalinux system:\n"
+#~ "of an existing Mandriva Linux system:\n"
#~ "\n"
#~ " * \"%s\": For the most part, this completely wipes out the old system. "
#~ "If\n"
@@ -28217,21 +28230,21 @@ msgstr "Installasie het gefaal!"
#~ "written.\n"
#~ "\n"
#~ " * \"%s\": this installation class allows you to update the packages\n"
-#~ "currently installed on your Mandrivalinux system. Your current\n"
+#~ "currently installed on your Mandriva Linux system. Your current\n"
#~ "partitioning scheme and user data is not altered. Most of other\n"
#~ "configuration steps remain available, similar to a standard "
#~ "installation.\n"
#~ "\n"
-#~ "Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
+#~ "Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
#~ "running version \"8.1\" or later. Performing an Upgrade on versions "
#~ "prior\n"
-#~ "to Mandrivalinux version \"8.1\" is not recommended."
+#~ "to Mandriva Linux version \"8.1\" is not recommended."
#~ msgstr ""
#~ "Hierdie stap word slegs gedoen indien ou GNU/Linux partisies op die\n"
#~ "rekenaar gevind is.\n"
#~ "\n"
#~ "DrakX moet nou weet of u 'n nuwe installasie of 'n opgradering van 'n\n"
-#~ "bestaande Mandrivalinux wil doen:\n"
+#~ "bestaande Mandriva Linux wil doen:\n"
#~ "\n"
#~ " * \"%s\": Hierdie deel word grootliks gebruik vir 'n hele nuwe "
#~ "installasie.\n"
@@ -28242,7 +28255,7 @@ msgstr "Installasie het gefaal!"
#~ "van u partisies se data wil behou.\n"
#~ "\n"
#~ " * \"%s\": hierdie tipe installasie laat u toe om pakkette op te dateer\n"
-#~ "wat deel uitmaak van u huidige Mandrivalinux installasie. Die partisies\n"
+#~ "wat deel uitmaak van u huidige Mandriva Linux installasie. Die partisies\n"
#~ "en gebruiker se data bly onveranderd. Ander stappe is baie dieselfde as\n"
#~ "'n normale installasie.\n"
#~ "\n"
@@ -28307,7 +28320,8 @@ msgstr "Installasie het gefaal!"
#~ "About UTF-8 (unicode) support: Unicode is a new character encoding meant "
#~ "to\n"
#~ "cover all existing languages. Though full support for it in GNU/Linux is\n"
-#~ "still under development. For that reason, Mandrivalinux will be using it\n"
+#~ "still under development. For that reason, Mandriva Linux will be using "
+#~ "it\n"
#~ "or not depending on the user choices:\n"
#~ "\n"
#~ " * If you choose a languages with a strong legacy encoding (latin1\n"
@@ -28563,7 +28577,7 @@ msgstr "Installasie het gefaal!"
#~ "checking this box.\n"
#~ "\n"
#~ "!! Be aware that if you choose not to install a bootloader (by selecting\n"
-#~ "\"%s\"), you must ensure that you have a way to boot your Mandrivalinux\n"
+#~ "\"%s\"), you must ensure that you have a way to boot your Mandriva Linux\n"
#~ "system! Be sure you know what you are doing before changing any of the\n"
#~ "options. !!\n"
#~ "\n"
@@ -28695,7 +28709,7 @@ msgstr "Installasie het gefaal!"
#~ msgid ""
#~ "Now, it's time to select a printing system for your computer. Other OSs "
#~ "may\n"
-#~ "offer you one, but Mandrivalinux offers two. Each of the printing "
+#~ "offer you one, but Mandriva Linux offers two. Each of the printing "
#~ "systems\n"
#~ "is best suited to particular types of configuration.\n"
#~ "\n"
@@ -28731,7 +28745,7 @@ msgstr "Installasie het gefaal!"
#~ "Center and clicking the expert button."
#~ msgstr ""
#~ "Dit is nou tyd om u drukkerstelsel te kies. Ander bedryfstelsels sal\n"
-#~ "seker net een aan u bied, maar Mandrivalinux gee twee. Elk van hulle\n"
+#~ "seker net een aan u bied, maar Mandriva Linux gee twee. Elk van hulle\n"
#~ "is beter as die ander in sekere gevalle.\n"
#~ "\n"
#~ " * \"%s\" -- wat vir \"print, do not queue\" staan. Kies dit indien u\n"
@@ -29271,9 +29285,9 @@ msgstr "Installasie het gefaal!"
#~ msgstr "\t* Spesiale afslag vir produkte en dienste by \"MandrakeStore\""
#~ msgid ""
-#~ "\t* Find out Mandrivalinux on a bootable CD with <b>Mandriva Move</b>"
+#~ "\t* Find out Mandriva Linux on a bootable CD with <b>Mandriva Move</b>"
#~ msgstr ""
-#~ "\t* Vind uit oor Mandrivalinux op 'n selflaai CD - <b>Mandriva Move</b>"
+#~ "\t* Vind uit oor Mandriva Linux op 'n selflaai CD - <b>Mandriva Move</b>"
#~ msgid ""
#~ "Find all Mandriva products at <b>MandrakeStore</b> -- our full service e-"
@@ -29286,11 +29300,11 @@ msgstr "Installasie het gefaal!"
#~ msgstr "<b>Word 'n lid van die MandrakeClub!</b>"
#~ msgid ""
-#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
+#~ "In the Mandriva Linux menu you will find easy-to-use applications for all "
#~ "tasks:"
#~ msgstr ""
-#~ "Die kieslys in Mandrivalinux het gebruikersvriendelike programme vir alle "
-#~ "behoefdes:"
+#~ "Die kieslys in Mandriva Linux het gebruikersvriendelike programme vir "
+#~ "alle behoefdes:"
#~ msgid ""
#~ "\t* Take charge of your personal data with the integrated personal "
diff --git a/perl-install/share/po/am.po b/perl-install/share/po/am.po
index 708c86f8b..27371b0c5 100644
--- a/perl-install/share/po/am.po
+++ b/perl-install/share/po/am.po
@@ -1,4 +1,4 @@
-# Latest versions of po files are at http://www.mandrakelinux.com/l10n/am.php3
+# Latest versions of po files are at http://www.mandrivalinux.com/l10n/am.php3
# Copyright (C) 2004 Mandriva SA
# Alemayehu Gemeda <alemayehu@gmx.at>, 2004.
#
@@ -1199,7 +1199,7 @@ msgstr "የመመሪያ ገጾች"
#: any.pm:733
#, c-format
msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux can support multiple languages. Select\n"
"the languages you would like to install. They will be available\n"
"when your installation is complete and you restart your system."
msgstr ""
@@ -3438,7 +3438,7 @@ msgstr "የሬዲዮ ድጋፍ አስቻል"
#, c-format
msgid ""
"Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
"terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
"button will reboot your computer."
msgstr ""
@@ -3548,7 +3548,7 @@ msgstr ""
#: help.pm:85
#, c-format
msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
"selected package is located on another CD-ROM, DrakX will eject the current\n"
"CD and ask you to insert the required one. If you do not have the requested\n"
"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3559,11 +3559,12 @@ msgstr ""
#, c-format
msgid ""
"It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
"simpler to manage, they have been placed into groups of similar\n"
"applications.\n"
"\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
"match applications from the various categories, so a ``Workstation''\n"
"installation can still have applications from the ``Server'' category\n"
"installed.\n"
@@ -3670,10 +3671,10 @@ msgid ""
"!! If a server package has been selected, either because you specifically\n"
"chose the individual package or because it was part of a group of packages,\n"
"you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux will automatically start any installed\n"
"services at boot time. Even if they are safe and have no known issues at\n"
"the time the distribution was shipped, it is entirely possible that\n"
-"security holes were discovered after this version of Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
"finalized. If you do not know what a particular service is supposed to do "
"or\n"
"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3782,7 +3783,7 @@ msgstr ""
msgid ""
"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
"on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
"\n"
"You'll see a list of different parameters to change to get an optimal\n"
"graphical display.\n"
@@ -3880,12 +3881,12 @@ msgstr ""
#: help.pm:316
#, c-format
msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\n"
"operating system on your hard drive. If your hard drive is empty or if an\n"
"existing operating system is using all the available space you will have to\n"
"partition the drive. Basically, partitioning a hard drive means to\n"
"logically divide it to create the space needed to install your new\n"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
"\n"
"Because the process of partitioning a hard drive is usually irreversible\n"
"and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -3912,7 +3913,7 @@ msgid ""
"FAT or NTFS partition. Resizing can be performed without the loss of any\n"
"data, provided you've previously defragmented the Windows partition.\n"
"Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
"the same computer.\n"
"\n"
" Before choosing this option, please understand that after this\n"
@@ -3921,7 +3922,8 @@ msgid ""
"to store your data or to install new software.\n"
"\n"
" * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
"this option. Be careful, because you will not be able to undo this "
"operation\n"
"after you confirm.\n"
@@ -4050,7 +4052,7 @@ msgid ""
"Click on \"%s\" when you're ready to format the partitions.\n"
"\n"
"Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
"\n"
"Click on \"%s\" if you wish to select partitions which will be checked for\n"
"bad blocks on the disk."
@@ -4068,7 +4070,7 @@ msgstr "የቀድሞው"
#: help.pm:434
#, c-format
msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
"have been updated since the initial release. Bugs may have been fixed,\n"
"security issues resolved. To allow you to benefit from these updates,\n"
"you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4097,7 +4099,7 @@ msgid ""
"generally obtained at the expense of ease of use.\n"
"\n"
"If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
"Control Center.\n"
"\n"
"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4113,7 +4115,7 @@ msgstr "የደህንነት ተቆጣጣሪ"
#, c-format
msgid ""
"At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
"defined, either from a previous installation of GNU/Linux or by another\n"
"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
"partitions must be defined.\n"
@@ -4199,7 +4201,7 @@ msgstr ""
msgid ""
"More than one Microsoft partition has been detected on your hard drive.\n"
"Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
"\n"
"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
"\"Capacity\".\n"
@@ -4244,7 +4246,7 @@ msgid ""
"found on your machine.\n"
"\n"
"DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
"\n"
" * \"%s\". For the most part, this completely wipes out the old system.\n"
"However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4253,13 +4255,14 @@ msgid ""
"the file system, you should use this option.\n"
"\n"
" * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux system. Your current "
+"partitioning\n"
"scheme and user data will not be altered. Most of the other configuration\n"
"steps remain available and are similar to a standard installation.\n"
"\n"
-"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
msgstr ""
#: help.pm:591
@@ -4300,7 +4303,8 @@ msgid ""
"\n"
"About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
"cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 "
+"will\n"
"depend on the user's choices:\n"
"\n"
" * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4457,7 +4461,7 @@ msgstr ""
#, c-format
msgid ""
"Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
"the printing systems is best suited to particular types of configuration.\n"
"\n"
" * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4478,7 +4482,7 @@ msgid ""
"options and for managing the printer.\n"
"\n"
"If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
"Control Center and clicking on the \"%s\" button."
msgstr ""
@@ -4578,7 +4582,8 @@ msgid ""
"\n"
" * \"%s\": if you wish to configure your Internet or local network access,\n"
"you can do so now. Refer to the printed documentation or use the\n"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to "
+"benefit\n"
"from full in-line help.\n"
"\n"
" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4595,7 +4600,7 @@ msgid ""
" * \"%s\": if you wish to change your bootloader configuration, click this\n"
"button. This should be reserved to advanced users. Refer to the printed\n"
"documentation or the in-line help about bootloader configuration in the\n"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
"\n"
" * \"%s\": through this entry you can fine tune which services will be run\n"
"on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4657,7 +4662,7 @@ msgstr "አገልግሎት"
#, c-format
msgid ""
"Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
"and will not be recoverable!"
msgstr ""
@@ -4965,7 +4970,7 @@ msgstr ""
#, c-format
msgid ""
"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
"installation."
msgstr ""
@@ -5068,13 +5073,13 @@ msgstr "መረቡን በማለያየት ላይ"
msgid ""
"Introduction\n"
"\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
"shall be called the \"Software Products\" hereafter. The Software Products "
"include, but are not \n"
"restricted to, the set of programs, methods, rules and documentation related "
"to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
"\n"
"\n"
"1. License Agreement\n"
@@ -5128,7 +5133,7 @@ msgid ""
"loss) arising out \n"
"of the possession and use of software components or arising out of "
"downloading software components \n"
-"from one of Mandrivalinux sites which are prohibited or restricted in some "
+"from one of Mandriva Linux sites which are prohibited or restricted in some "
"countries by local laws.\n"
"This limited liability applies to, but is not restricted to, the strong "
"cryptography components \n"
@@ -5165,7 +5170,7 @@ msgid ""
"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
"as a whole or in \n"
"parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
"Mandriva S.A. \n"
"\n"
"\n"
@@ -5238,8 +5243,8 @@ msgid ""
"Remove the boot media and press return to reboot.\n"
"\n"
"\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
"consult the Errata available from:\n"
"\n"
"\n"
@@ -5247,14 +5252,14 @@ msgid ""
"\n"
"\n"
"Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
#: install_messages.pm:144
#, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
#: install_steps.pm:246
#, fuzzy, c-format
@@ -5279,7 +5284,7 @@ msgstr ""
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
"this,\n"
"press `F1' when booting on CDROM, then enter `text'."
msgstr ""
@@ -5781,7 +5786,7 @@ msgstr ""
#: install_steps_interactive.pm:821
#, c-format
msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
#: install_steps_interactive.pm:840
@@ -5986,8 +5991,8 @@ msgstr ""
#: install_steps_newt.pm:20
#, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "የMandrivalinux ተከላ %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "የMandriva Linux ተከላ %s"
#. -PO: This string must fit in a 80-char wide text screen
#: install_steps_newt.pm:34
@@ -8546,7 +8551,7 @@ msgstr ""
msgid ""
"drakfirewall configurator\n"
"\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
"For a powerful and dedicated firewall solution, please look to the\n"
"specialized MandrakeSecurity Firewall distribution."
msgstr ""
@@ -12102,8 +12107,8 @@ msgstr ""
#: printer/printerdrake.pm:3929
#, c-format
msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
"\n"
msgstr ""
@@ -13766,18 +13771,18 @@ msgstr "አቁም"
#: share/advertising/01.pl:13
#, fuzzy, c-format
-msgid "<b>What is Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
msgstr "ትርጉሙ &ጅምር ነው"
#: share/advertising/01.pl:15
#, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "ወደ <b>Mandrivalinux</b>! እንኳን ደህና መጡ"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "ወደ <b>Mandriva Linux</b>! እንኳን ደህና መጡ"
#: share/advertising/01.pl:17
#, c-format
msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"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."
@@ -13786,7 +13791,7 @@ msgstr ""
#: share/advertising/01.pl:19
#, c-format
msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"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!"
msgstr ""
@@ -13803,9 +13808,9 @@ msgstr ""
#: share/advertising/02.pl:17
#, c-format
msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"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 Mandrivalinux "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
"contributors."
msgstr ""
@@ -13824,8 +13829,8 @@ msgstr "ማስታወሻ"
#: share/advertising/03.pl:15
#, c-format
msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
msgstr ""
#: share/advertising/03.pl:17
@@ -13851,17 +13856,17 @@ msgstr ""
#: share/advertising/04.pl:15
#, c-format
msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"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 Mandrivalinux world."
+"<b>key role</b> in the Mandriva Linux world."
msgstr ""
#: share/advertising/04.pl:17
#, c-format
msgid ""
"To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"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."
msgstr ""
@@ -13873,7 +13878,7 @@ msgstr ""
#: share/advertising/05.pl:17
#, c-format
msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
"version that Mandriva wants to keep <b>available to everyone</b>."
msgstr ""
@@ -13911,7 +13916,7 @@ msgstr ""
#: share/advertising/06.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
msgstr ""
#: share/advertising/06.pl:17
@@ -13930,7 +13935,7 @@ msgstr ""
#: share/advertising/07.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
msgstr ""
#: share/advertising/07.pl:17
@@ -13948,7 +13953,7 @@ msgstr ""
#: share/advertising/08.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
msgstr ""
#: share/advertising/08.pl:17
@@ -13963,17 +13968,17 @@ msgstr ""
#: share/advertising/09.pl:13
#, fuzzy, c-format
msgid "<b>Mandriva Products</b>"
-msgstr "<b>የMandrivalinux ባለሞያ</b>"
+msgstr "<b>የMandriva Linux ባለሞያ</b>"
#: share/advertising/09.pl:15
#, c-format
msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
msgstr ""
#: share/advertising/09.pl:17
#, c-format
-msgid "The Mandrivalinux products are:"
+msgid "The Mandriva Linux products are:"
msgstr ""
#: share/advertising/09.pl:18
@@ -13994,7 +13999,7 @@ msgstr ""
#: share/advertising/09.pl:21
#, c-format
msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
"the most of your 64-bit processor."
msgstr ""
@@ -14006,21 +14011,21 @@ msgstr ""
#: share/advertising/10.pl:17
#, c-format
msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"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:"
msgstr ""
#: share/advertising/10.pl:18
#, c-format
msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
"bootable CD-ROM."
msgstr ""
#: share/advertising/10.pl:19
#, c-format
msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
"ultra-compact “LaCie Mobile Hard Drive”."
msgstr ""
@@ -14038,17 +14043,19 @@ msgstr ""
#: share/advertising/11.pl:16
#, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
msgstr ""
#: share/advertising/11.pl:17
#, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
msgstr ""
#: share/advertising/11.pl:18
#, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
msgstr ""
#: share/advertising/12.pl:13
@@ -14224,7 +14231,7 @@ msgstr ""
#: share/advertising/18.pl:15
#, c-format
msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
"<b>all of your tasks</b>:"
msgstr ""
@@ -14459,14 +14466,14 @@ msgstr ""
#: share/advertising/25.pl:13
#, fuzzy, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
msgstr "አንቀጹን መሀል ኩልኩል አድርግ"
#: share/advertising/25.pl:15
#, c-format
msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
"your computer."
msgstr ""
@@ -14489,8 +14496,8 @@ msgid ""
"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 "
+"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!"
msgstr ""
@@ -14520,18 +14527,18 @@ msgstr ""
#: share/advertising/27.pl:21
#, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
msgstr ""
#: share/advertising/28.pl:15
#, c-format
msgid "<b>Mandriva Club</b>"
-msgstr "<b>የMandrivalinux ክለብ</b>"
+msgstr "<b>የMandriva Linux ክለብ</b>"
#: share/advertising/28.pl:17
#, c-format
msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
"product.."
msgstr ""
@@ -14545,7 +14552,7 @@ msgstr ""
#, c-format
msgid ""
"\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
msgstr ""
#: share/advertising/28.pl:21
@@ -14557,14 +14564,14 @@ msgstr ""
#: share/advertising/28.pl:22
#, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
msgstr ""
#: share/advertising/28.pl:23
#, c-format
msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
msgstr ""
#: share/advertising/29.pl:13
@@ -14583,7 +14590,7 @@ msgstr ""
#, c-format
msgid ""
"Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
msgstr ""
#: share/advertising/29.pl:18
@@ -14606,33 +14613,33 @@ msgstr ""
#: share/advertising/29.pl:21
#, c-format
msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
msgstr ""
#: share/advertising/30.pl:13
#, c-format
msgid "<b>Mandriva Expert</b>"
-msgstr "<b>የMandrivalinux ባለሞያ</b>"
+msgstr "<b>የMandriva Linux ባለሞያ</b>"
#: share/advertising/30.pl:15
#, c-format
msgid ""
"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
msgstr ""
#: share/advertising/30.pl:17
#, c-format
msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
"a lot of time."
msgstr ""
#: share/advertising/30.pl:19
#, c-format
msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
msgstr ""
#: share/compssUsers.pl:25
@@ -14923,7 +14930,7 @@ msgstr ""
#: share/compssUsers.pl:196
#, fuzzy, c-format
msgid "Mandriva Wizards"
-msgstr "<b>የMandrivalinux ባለሞያ</b>"
+msgstr "<b>የMandriva Linux ባለሞያ</b>"
#: share/compssUsers.pl:197
#, fuzzy, c-format
@@ -14981,8 +14988,8 @@ msgid ""
"\n"
"OPTIONS:\n"
" --help - print this help message.\n"
-" --report - program should be one of mandrakelinux tools\n"
-" --incident - program should be one of mandrakelinux tools"
+" --report - program should be one of Mandriva Linux tools\n"
+" --incident - program should be one of Mandriva Linux tools"
msgstr ""
#: standalone.pm:63
@@ -15018,7 +15025,7 @@ msgstr ""
#, c-format
msgid ""
"[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
"--enable : enable MTS\n"
"--disable : disable MTS\n"
"--start : start MTS\n"
@@ -17519,13 +17526,13 @@ msgstr ""
#: standalone/drakbug:41
#, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
msgstr "አንቀጹን መሀል ኩልኩል አድርግ"
#: standalone/drakbug:46
#, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "የMandrivalinux ቁጥጥር ማእከል"
+msgid "Mandriva Linux Control Center"
+msgstr "የMandriva Linux ቁጥጥር ማእከል"
#: standalone/drakbug:48
#, fuzzy, c-format
@@ -17994,14 +18001,14 @@ msgstr "መረጃ በ%s መጠቀሚያ ፕሮግራም ላይ"
#, c-format
msgid ""
"This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
msgstr ""
#: standalone/drakconnect:1009 standalone/net_applet:61
#, c-format
msgid ""
"You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
msgstr ""
#. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18052,7 +18059,7 @@ msgstr ""
#: standalone/drakedm:36
#, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
msgstr ""
#: standalone/drakedm:37
@@ -18342,9 +18349,9 @@ msgid ""
"\n"
" DUPONT Sebastien (original version)\n"
"\n"
-" CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+" CHAUMETTE Damien <dchaumette@mandriva.com>\n"
"\n"
-" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+" VIGNAUD Thierry <tvignaud@mandriva.com>"
msgstr ""
#: standalone/drakfont:520
@@ -18822,7 +18829,7 @@ msgstr ""
#: standalone/drakhelp:36
#, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
msgstr "አንቀጹን መሀል ኩልኩል አድርግ"
#: standalone/drakhelp:36
@@ -19403,7 +19410,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
#: standalone/draksound:57
@@ -21001,7 +21008,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
#: standalone/harddrake2:24
@@ -21687,7 +21694,7 @@ msgid ""
"This is HardDrake, a %s hardware configuration tool.\n"
"<span foreground=\"royalblue3\">Version:</span> %s\n"
"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
"\n"
msgstr ""
@@ -21796,7 +21803,7 @@ msgstr ""
#: standalone/logdrake:50
#, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
msgstr "/መሣሪያዎች/የነበረው ቀለሞች"
#: standalone/logdrake:51
@@ -22300,7 +22307,7 @@ msgstr "የቅርብ መረብ ማገናኛ"
#, c-format
msgid ""
"Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
msgstr ""
#: standalone/net_monitor:341
diff --git a/perl-install/share/po/ar.po b/perl-install/share/po/ar.po
index 07ef6e2b9..02ff07b6f 100644
--- a/perl-install/share/po/ar.po
+++ b/perl-install/share/po/ar.po
@@ -1302,7 +1302,7 @@ msgstr "خيار اللغة"
#: any.pm:733
#, c-format
msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux can support multiple languages. Select\n"
"the languages you would like to install. They will be available\n"
"when your installation is complete and you restart your system."
msgstr ""
@@ -3693,7 +3693,7 @@ msgstr "تمكين دعم الراديو"
#, c-format
msgid ""
"Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
"terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
"button will reboot your computer."
msgstr ""
@@ -3873,7 +3873,7 @@ msgstr ""
#: help.pm:85
#, c-format
msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
"selected package is located on another CD-ROM, DrakX will eject the current\n"
"CD and ask you to insert the required one. If you do not have the requested\n"
"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3888,11 +3888,12 @@ msgstr ""
#, c-format
msgid ""
"It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
"simpler to manage, they have been placed into groups of similar\n"
"applications.\n"
"\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
"match applications from the various categories, so a ``Workstation''\n"
"installation can still have applications from the ``Server'' category\n"
"installed.\n"
@@ -4052,10 +4053,10 @@ msgid ""
"!! If a server package has been selected, either because you specifically\n"
"chose the individual package or because it was part of a group of packages,\n"
"you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux will automatically start any installed\n"
"services at boot time. Even if they are safe and have no known issues at\n"
"the time the distribution was shipped, it is entirely possible that\n"
-"security holes were discovered after this version of Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
"finalized. If you do not know what a particular service is supposed to do "
"or\n"
"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4239,7 +4240,7 @@ msgstr ""
msgid ""
"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
"on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
"\n"
"You'll see a list of different parameters to change to get an optimal\n"
"graphical display.\n"
@@ -4413,12 +4414,12 @@ msgstr ""
#: help.pm:316
#, c-format
msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\n"
"operating system on your hard drive. If your hard drive is empty or if an\n"
"existing operating system is using all the available space you will have to\n"
"partition the drive. Basically, partitioning a hard drive means to\n"
"logically divide it to create the space needed to install your new\n"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
"\n"
"Because the process of partitioning a hard drive is usually irreversible\n"
"and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4445,7 +4446,7 @@ msgid ""
"FAT or NTFS partition. Resizing can be performed without the loss of any\n"
"data, provided you've previously defragmented the Windows partition.\n"
"Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
"the same computer.\n"
"\n"
" Before choosing this option, please understand that after this\n"
@@ -4454,7 +4455,8 @@ msgid ""
"to store your data or to install new software.\n"
"\n"
" * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
"this option. Be careful, because you will not be able to undo this "
"operation\n"
"after you confirm.\n"
@@ -4674,7 +4676,7 @@ msgid ""
"Click on \"%s\" when you're ready to format the partitions.\n"
"\n"
"Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
"\n"
"Click on \"%s\" if you wish to select partitions which will be checked for\n"
"bad blocks on the disk."
@@ -4713,7 +4715,7 @@ msgstr "السابق "
#: help.pm:434
#, c-format
msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
"have been updated since the initial release. Bugs may have been fixed,\n"
"security issues resolved. To allow you to benefit from these updates,\n"
"you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4753,7 +4755,7 @@ msgid ""
"generally obtained at the expense of ease of use.\n"
"\n"
"If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
"Control Center.\n"
"\n"
"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4782,7 +4784,7 @@ msgstr "مدير الأمن"
#, c-format
msgid ""
"At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
"defined, either from a previous installation of GNU/Linux or by another\n"
"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
"partitions must be defined.\n"
@@ -4940,7 +4942,7 @@ msgstr "التغيير إلى الوضع العادي/وضع الخبير"
msgid ""
"More than one Microsoft partition has been detected on your hard drive.\n"
"Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
"\n"
"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
"\"Capacity\".\n"
@@ -5017,7 +5019,7 @@ msgid ""
"found on your machine.\n"
"\n"
"DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
"\n"
" * \"%s\". For the most part, this completely wipes out the old system.\n"
"However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5026,13 +5028,14 @@ msgid ""
"the file system, you should use this option.\n"
"\n"
" * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux system. Your current "
+"partitioning\n"
"scheme and user data will not be altered. Most of the other configuration\n"
"steps remain available and are similar to a standard installation.\n"
"\n"
-"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
msgstr ""
"يتم تنشيط هذه الخطوة فقط إذا عُثر على تجزيء جنو/لينكس موجود\n"
"على ماكينتك.\n"
@@ -5110,7 +5113,8 @@ msgid ""
"\n"
"About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
"cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 "
+"will\n"
"depend on the user's choices:\n"
"\n"
" * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5394,7 +5398,7 @@ msgstr ""
#, c-format
msgid ""
"Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
"the printing systems is best suited to particular types of configuration.\n"
"\n"
" * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5415,7 +5419,7 @@ msgid ""
"options and for managing the printer.\n"
"\n"
"If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
"Control Center and clicking on the \"%s\" button."
msgstr ""
"الآن، حان وقت اختيار نظام الطباعة لحاسبك. قد توفّر أنظمة التشغيل الأخرى\n"
@@ -5560,7 +5564,8 @@ msgid ""
"\n"
" * \"%s\": if you wish to configure your Internet or local network access,\n"
"you can do so now. Refer to the printed documentation or use the\n"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to "
+"benefit\n"
"from full in-line help.\n"
"\n"
" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5577,7 +5582,7 @@ msgid ""
" * \"%s\": if you wish to change your bootloader configuration, click this\n"
"button. This should be reserved to advanced users. Refer to the printed\n"
"documentation or the in-line help about bootloader configuration in the\n"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
"\n"
" * \"%s\": through this entry you can fine tune which services will be run\n"
"on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5706,7 +5711,7 @@ msgstr "الخدمات"
#, c-format
msgid ""
"Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
"and will not be recoverable!"
msgstr ""
"اختر القرص الصلب الذي تريد محوه لتثبيت تجزيء\n"
@@ -6060,7 +6065,7 @@ msgstr "جاري حساب مساحة تجزيء ويندوز"
#, c-format
msgid ""
"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
"installation."
msgstr ""
"تجزيء ويندوز الخاصّ بك كثير التجزّئات. رجاء أعد تشغيل جهازك إلى ويندوز، شغّل "
@@ -6178,13 +6183,13 @@ msgstr "جاري اغلاق الشبكة"
msgid ""
"Introduction\n"
"\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
"shall be called the \"Software Products\" hereafter. The Software Products "
"include, but are not \n"
"restricted to, the set of programs, methods, rules and documentation related "
"to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
"\n"
"\n"
"1. License Agreement\n"
@@ -6238,7 +6243,7 @@ msgid ""
"loss) arising out \n"
"of the possession and use of software components or arising out of "
"downloading software components \n"
-"from one of Mandrivalinux sites which are prohibited or restricted in some "
+"from one of Mandriva Linux sites which are prohibited or restricted in some "
"countries by local laws.\n"
"This limited liability applies to, but is not restricted to, the strong "
"cryptography components \n"
@@ -6275,7 +6280,7 @@ msgid ""
"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
"as a whole or in \n"
"parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
"Mandriva S.A. \n"
"\n"
"\n"
@@ -6371,7 +6376,7 @@ msgstr ""
"تحتفظ ماندريكسوفت ش.م. بحقّها في تعديل أو تكييف المنتجات البرمجيّة، "
"بحذافيرها \n"
"أو أجزاء معيّنة منها، بشتّى الطّرق ولسائر الأغراض.\n"
-"\"Mandriva\" و \"Mandrivalinux\" والشّعارات المتعلّقة هي علاماتٌ تجاريّة "
+"\"Mandriva\" و \"Mandriva Linux\" والشّعارات المتعلّقة هي علاماتٌ تجاريّة "
"لماندريكسوفت ش.م. \n"
"\n"
"\n"
@@ -6475,8 +6480,8 @@ msgid ""
"Remove the boot media and press return to reboot.\n"
"\n"
"\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
"consult the Errata available from:\n"
"\n"
"\n"
@@ -6484,7 +6489,7 @@ msgid ""
"\n"
"\n"
"Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
msgstr ""
"تهانينا، التثبيت قد انتهى.\n"
"أزل وسيط الإقلاع و اضغط زر الإدخال لإعادة التشغيل.\n"
@@ -6503,8 +6508,8 @@ msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
#: install_messages.pm:144
#, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
#: install_steps.pm:246
#, c-format
@@ -6532,7 +6537,7 @@ msgstr "الانتقال للخطوة `%s'\n"
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
"this,\n"
"press `F1' when booting on CDROM, then enter `text'."
msgstr ""
@@ -7072,7 +7077,7 @@ msgstr ""
#: install_steps_interactive.pm:821
#, c-format
msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "جاري الإتصال بموقع ماندريكلينكس للحصول على قائمة بالمرايا المتوفرة..."
#: install_steps_interactive.pm:840
@@ -7293,7 +7298,7 @@ msgstr ""
#: install_steps_newt.pm:20
#, c-format
-msgid "Mandrivalinux Installation %s"
+msgid "Mandriva Linux Installation %s"
msgstr "تثبيت ماندريكلينكس %s"
#. -PO: This string must fit in a 80-char wide text screen
@@ -9889,7 +9894,7 @@ msgstr "BitTorrent"
msgid ""
"drakfirewall configurator\n"
"\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
"For a powerful and dedicated firewall solution, please look to the\n"
"specialized MandrakeSecurity Firewall distribution."
msgstr ""
@@ -13890,8 +13895,8 @@ msgstr ""
#: printer/printerdrake.pm:3929
#, c-format
msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
"\n"
msgstr ""
"تشغيل Scannerdrake )العتاد/الماسح الضوئي في مركز تحكم ماندريكلينكس) لمشاركة "
@@ -15789,18 +15794,18 @@ msgstr "إيقاف"
#: share/advertising/01.pl:13
#, c-format
-msgid "<b>What is Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
msgstr "<b>ما هو ماندريكلينكس؟</b>"
#: share/advertising/01.pl:15
#, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
msgstr "أهلا بك في <b>ماندريكلينكس</b>!"
#: share/advertising/01.pl:17
#, c-format
msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"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."
@@ -15812,7 +15817,7 @@ msgstr ""
#: share/advertising/01.pl:19
#, c-format
msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"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!"
msgstr ""
"ماندريكلينكس هي توزيعة لينكس <b>الأسهل استخداماً</b> حالياً. إنها أيضاً واحدة "
@@ -15831,9 +15836,9 @@ msgstr "أهلاً بك في <b>عالم المصدر المفتوح</b>!"
#: share/advertising/02.pl:17
#, c-format
msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"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 Mandrivalinux "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
"contributors."
msgstr ""
"ماندريكلينكس هو نظام مخلص لنموذج المصدر المفتوح. هذا يعني أن هذا الإصدار "
@@ -15855,8 +15860,8 @@ msgstr "<b>رخصة GPL</b>"
#: share/advertising/03.pl:15
#, c-format
msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
msgstr ""
"معظم البرامج المرفقة مع هذه التوزيعة وكل أدوات ماندريكلينكس مرخّصة ضمن "
"<b>الرخصة العموميّة الشاملة</b>."
@@ -15889,10 +15894,10 @@ msgstr "<b>انضمّ إلى المجتمع</b>"
#: share/advertising/04.pl:15
#, c-format
msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"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 Mandrivalinux world."
+"<b>key role</b> in the Mandriva Linux world."
msgstr ""
"لدى ماندريكلينكس أحد <b>أكبر المجتمعات</b> من المستخدمين والمطورين. دور "
"مجتمع كهذا هو واسع جداً، بدءً من تقرير العيوب البرمجية ووصولاً إلى تطوير "
@@ -15902,11 +15907,11 @@ msgstr ""
#, c-format
msgid ""
"To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"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."
msgstr ""
"كي <b>تقرأ المزيد</b> حول مجتمعنا الديناميكي، رجاء زُر <b>www.mandrakelinux."
-"com</b> أو مباشرة <b>www.mandrakelinux.com/en/cookerdevel.php3</b> إن وددت "
+"com</b> أو مباشرة <b>www.mandrivalinux.com/en/cookerdevel.php3</b> إن وددت "
"<b>المشاركة</b> في التطوير."
#: share/advertising/05.pl:15
@@ -15917,10 +15922,10 @@ msgstr "<b>نسخة التّنزيل</b>"
#: share/advertising/05.pl:17
#, c-format
msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
"version that Mandriva wants to keep <b>available to everyone</b>."
msgstr ""
-"تقوم الآن بتثبيت <b>Mandrivalinux Download</b>. هذه هي النسخة المجانية التي "
+"تقوم الآن بتثبيت <b>Mandriva Linux Download</b>. هذه هي النسخة المجانية التي "
"تريد ماندريكسوفت إبقائها <b>متوفّرة للجميع</b>."
#: share/advertising/05.pl:19
@@ -15961,8 +15966,8 @@ msgstr "<b>Discovery، سطح مكتب لينكس الأول</b>"
#: share/advertising/06.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "تقوم الآن بتثبيت <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "تقوم الآن بتثبيت <b>Mandriva Linux Discovery</b>."
#: share/advertising/06.pl:17
#, c-format
@@ -15983,8 +15988,8 @@ msgstr "<b>PowerPack، سطح المكتب المُطلق للينكس</b>"
#: share/advertising/07.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "تقوم الآن بتثبيت <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "تقوم الآن بتثبيت <b>Mandriva Linux PowerPack</b>."
#: share/advertising/07.pl:17
#, c-format
@@ -16004,8 +16009,8 @@ msgstr "<b>PowerPack+، الحلّ لأسطح المكتب والخادمات</b
#: share/advertising/08.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "تقوم الآن بتثبيت <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "تقوم الآن بتثبيت <b>Mandriva Linux PowerPack+</b>."
#: share/advertising/08.pl:17
#, c-format
@@ -16027,13 +16032,13 @@ msgstr "<b>منتجات ماندريكسوفت</b>"
#: share/advertising/09.pl:15
#, c-format
msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
msgstr ""
"قامت <b>ماندريكسوفت</b> بتطوير تشكيلة واسعة من منتجات <b>ماندريكلينكس</b>."
#: share/advertising/09.pl:17
#, c-format
-msgid "The Mandrivalinux products are:"
+msgid "The Mandriva Linux products are:"
msgstr "منتجات ماندريكلينكس هي:"
#: share/advertising/09.pl:18
@@ -16054,7 +16059,7 @@ msgstr "\t* <b>PowerPack+</b>، حلّ لينكس لأسطح المكتب وال
#: share/advertising/09.pl:21
#, c-format
msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
"the most of your 64-bit processor."
msgstr ""
"\t* <b>ماندريكلينكس لأنظمة x86-64</b>، حلّ ماندريكلينكس للحصول على أفضل نتيجة "
@@ -16068,7 +16073,7 @@ msgstr "<b>منتجات ماندريكسوفت (منتجات نوماد)</b>"
#: share/advertising/10.pl:17
#, c-format
msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"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:"
msgstr ""
"قامت ماندريكلينكس بتطوير منتجين يسمحان لك باستخدام ماندريكلينكس <b>على أي "
@@ -16077,14 +16082,14 @@ msgstr ""
#: share/advertising/10.pl:18
#, c-format
msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
"bootable CD-ROM."
msgstr "\t* <b>Move</b>، توزيعة ماندريكلينكس تشتغل بالكامل من قرص إقلاع مدمج."
#: share/advertising/10.pl:19
#, c-format
msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
"ultra-compact “LaCie Mobile Hard Drive”."
msgstr ""
"\t* <b>جلوب تروتر</b>، وهي توزيعة ماندريكلينكس مُتثبيتة مسبقاً على “قرص لاسي "
@@ -16105,17 +16110,19 @@ msgstr ""
#: share/advertising/11.pl:16
#, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
msgstr "\t* <b>سطح المكتب المؤسّساتي</b>، وهو سطح مكتب ماندريكلينكس للأعمال."
#: share/advertising/11.pl:17
#, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
msgstr "\t* <b>الخادم المؤسّساتي</b>، وهو حلّ خادم ماندريكلينكس."
#: share/advertising/11.pl:18
#, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
msgstr "\t* <b>الجدار الناري للشبكات المتعدّدة</b>، حلّ الأمن من ماندريكلينكس."
#: share/advertising/12.pl:13
@@ -16313,7 +16320,7 @@ msgstr "<b>استمتع بالتشكيلة الواسعة من التطبيقا�
#: share/advertising/18.pl:15
#, c-format
msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
"<b>all of your tasks</b>:"
msgstr ""
"في قائمة ماندريكلينكس ستجد تطبيقات <b>سهلة الاستخدام</b> ل<b>كل مهامّك</b>:"
@@ -16567,14 +16574,14 @@ msgstr "\t* <b>Postfix</b> و <b>Sendmail</b>: خوادم البريد الأك�
#: share/advertising/25.pl:13
#, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
msgstr "<b>مركز تحكّم ماندريكلينكس</b>"
#: share/advertising/25.pl:15
#, c-format
msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
"your computer."
msgstr ""
"<b>مركز تحكم ماندريكلينكس</b> هي مجموعة أساسيّة من أدوات ماندريكلينكس الخاصّة "
@@ -16602,8 +16609,8 @@ msgid ""
"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 "
+"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!"
msgstr ""
"كسائر ما يتعلّق ببرمجة الحاسبات، البرمجّيات المفتوحة المصدر <b>تتطلّب وقتاً "
@@ -16640,8 +16647,8 @@ msgstr "تمّت <b>إعادة تصميم</b> هذه المنصة لتحسين �
#: share/advertising/27.pl:21
#, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "زُرْنا اليوم على <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "زُرْنا اليوم على <b>store.mandriva.com</b>!"
#: share/advertising/28.pl:15
#, c-format
@@ -16651,7 +16658,7 @@ msgstr "<b>Mandriva Club</b>"
#: share/advertising/28.pl:17
#, c-format
msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
"product.."
msgstr "<b>نادي ماندريك</b> هو <b>المرافق الأمثل</b> لمنتجك ماندريكلينكس."
@@ -16665,7 +16672,7 @@ msgstr "اغتنم فرصة <b>الفوائد القيّمة</b> بالانضم�
#, c-format
msgid ""
"\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
msgstr ""
"\t* <b>حسومات خاصة</b> على المنتجات والخدمات من متجرنا على الخط <b>store."
"mandrakesoft.com</b>."
@@ -16680,14 +16687,14 @@ msgstr ""
#: share/advertising/28.pl:22
#, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
msgstr "\t* الاشتراك في <b>منتديات المستخدمين</b> لماندريكلينكس."
#: share/advertising/28.pl:23
#, c-format
msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
msgstr ""
"\t* <b>وصول مبكّر وممتاز</b>، قبل الإصدار العام، <b>لصور ISO</b> لماندريك "
"لينكس."
@@ -16710,7 +16717,7 @@ msgstr ""
#, c-format
msgid ""
"Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
msgstr ""
"يوفر Mandriva Online تشكيلة واسعة من الخدمات القيّمة <b>للتحديث الميسّر</b> "
"لأنظمة ماندريكلينكس الخاصة بك:"
@@ -16737,7 +16744,7 @@ msgstr "\t* تحديثات <b>مُجدولة</b> مرنة."
#: share/advertising/29.pl:21
#, c-format
msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
msgstr "\t* إدارة <b>كل أنظمة ماندريكلينكس خاصتك</b> باستخدام حساب واحد."
#: share/advertising/30.pl:13
@@ -16749,15 +16756,15 @@ msgstr "<b>Mandriva Expert</b>"
#, c-format
msgid ""
"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
msgstr ""
"هل تتطلّب <b>مساعدة؟</b> قابل خبراء ماندريكسوفت التقنيين على <b>موقع الدعم "
-"الفني الخاص بنا</b> www.mandrakeexpert.com."
+"الفني الخاص بنا</b> www.mandrivaexpert.com."
#: share/advertising/30.pl:17
#, c-format
msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
"a lot of time."
msgstr ""
"بفضل مساعدة <b>خبراء ماندريكلينكس الأكفاء</b>، سوف توفّر الكثير من الوقت."
@@ -16765,8 +16772,8 @@ msgstr ""
#: share/advertising/30.pl:19
#, c-format
msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
msgstr ""
"لأي سؤال متعلق بماندريكلينكس، يمكن شراء الدعم من خلال <b>store.mandrakesoft."
"com</b>."
@@ -17157,8 +17164,8 @@ msgid ""
"\n"
"OPTIONS:\n"
" --help - print this help message.\n"
-" --report - program should be one of mandrakelinux tools\n"
-" --incident - program should be one of mandrakelinux tools"
+" --report - program should be one of Mandriva Linux tools\n"
+" --incident - program should be one of Mandriva Linux tools"
msgstr ""
"[OPTIONS] [PROGRAM_NAME]\n"
"\n"
@@ -17219,7 +17226,7 @@ msgstr ""
#, c-format
msgid ""
"[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
"--enable : enable MTS\n"
"--disable : disable MTS\n"
"--start : start MTS\n"
@@ -20040,12 +20047,12 @@ msgstr ""
#: standalone/drakbug:41
#, c-format
-msgid "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
msgstr "أداة تقرير العيوب في ماندريكلينكس"
#: standalone/drakbug:46
#, c-format
-msgid "Mandrivalinux Control Center"
+msgid "Mandriva Linux Control Center"
msgstr "مركز تحكّم ماندريكلينكس"
#: standalone/drakbug:48
@@ -20536,7 +20543,7 @@ msgstr "يتم تشغيله عند الإقلاع"
#, c-format
msgid ""
"This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
msgstr ""
"لم تتمّ تهيئة الواجهة بعد.\n"
"قم بتشغيل مساعد \"أضف واجهة\" من مركز تحكّم ماندريكلينكس"
@@ -20545,7 +20552,7 @@ msgstr ""
#, c-format
msgid ""
"You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
msgstr ""
"ليست لديك أية وصلة إنترنت مهيئة.\n"
"شغّل مساعد \"%s\" من مركز تحكم ماندريكلينكس"
@@ -20598,7 +20605,7 @@ msgstr "KDM (مدير عرض كيدي("
#: standalone/drakedm:36
#, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
msgstr "MdkKDM (مدير عرض ماندريكلينكس("
#: standalone/drakedm:37
@@ -20902,18 +20909,18 @@ msgid ""
"\n"
" DUPONT Sebastien (original version)\n"
"\n"
-" CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+" CHAUMETTE Damien <dchaumette@mandriva.com>\n"
"\n"
-" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+" VIGNAUD Thierry <tvignaud@mandriva.com>"
msgstr ""
"حقوق النّسخ 2001-2002 لماندريكسوفت \n"
"\n"
"\n"
" DUPONT Sebastien (النّسخة الأصليّة)\n"
"\n"
-" CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+" CHAUMETTE Damien <dchaumette@mandriva.com>\n"
"\n"
-" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+" VIGNAUD Thierry <tvignaud@mandriva.com>"
#: standalone/drakfont:520
#, c-format
@@ -21478,7 +21485,7 @@ msgstr " --doc <link> - رابط بصفحة وب أخرى ( لـWM welc
#: standalone/drakhelp:36
#, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
msgstr "مركز مساعدة ماندريكلينكس"
#: standalone/drakhelp:36
@@ -22127,7 +22134,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
"تعذر العثور على بطاقة صوت على جهازك. الرجاء التأكّد من أن بطاقة الصوت "
"المدعومة من لينكس موصولة بشكل صحيح.\n"
@@ -22136,7 +22143,7 @@ msgstr ""
"يمكنك زيارة قاعدة بيانات العتاد المدعوم الخاصة بنا على:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
#: standalone/draksound:57
#, c-format
@@ -24165,7 +24172,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
"لم يعثر على بطاقة تلفاز على جهازك. الرجاء التأكّد من أن بطاقة الفيديو/التلفاز "
"المدعومة في لينكس موصولة بشكل صحيح.\n"
@@ -24174,7 +24181,7 @@ msgstr ""
"يمكنك زيارة قاعدة بيانات العتاد المدعوم الخاصة بنا على:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
#: standalone/harddrake2:24
#, c-format
@@ -24889,13 +24896,13 @@ msgid ""
"This is HardDrake, a %s hardware configuration tool.\n"
"<span foreground=\"royalblue3\">Version:</span> %s\n"
"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
"\n"
msgstr ""
"هذا هو HardDrake، أداة %s لتهيئة العتاد.\n"
"<span foreground=\"royalblue3\">النّسخة:</span> %s\n"
"<span foreground=\"royalblue3\">المؤلّف:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
"\n"
#: standalone/harddrake2:243
@@ -25004,7 +25011,7 @@ msgstr "تم عمل التغيير، و لكن ليتم تفعيله يجب عل
#: standalone/logdrake:50
#, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
msgstr "سجلات أدوات ماندريكلينكس"
#: standalone/logdrake:51
@@ -25517,7 +25524,7 @@ msgstr "تم الإتصال."
#, c-format
msgid ""
"Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
msgstr ""
"فشل الاتّصال.\n"
"تحقق من تهيئتك في مركز تحكّم ماندريكلينكس."
@@ -26384,15 +26391,15 @@ msgstr "فشل التّثبيت"
#~ msgid "You've not selected any font"
#~ msgstr "لم تقم باختيار أي خط"
-#~ msgid "http://www.mandrakelinux.com/en/101errata.php3"
-#~ msgstr "http://www.mandrakelinux.com/en/101errata.php3"
+#~ msgid "http://www.mandrivalinux.com/en/101errata.php3"
+#~ msgstr "http://www.mandrivalinux.com/en/101errata.php3"
-#~ msgid "The Mandrivalinux 10.1 products are:"
+#~ msgid "The Mandriva Linux 10.1 products are:"
#~ msgstr "منتجات ماندريكلينكس 10.1 هي:"
#~ msgid ""
-#~ "\t* <b>Mandrivalinux 10.1 for x86-64</b>, The Mandrivalinux solution for "
-#~ "making the most of your 64-bit processor."
+#~ "\t* <b>Mandriva Linux 10.1 for x86-64</b>, The Mandriva Linux solution "
+#~ "for making the most of your 64-bit processor."
#~ msgstr ""
#~ "\t* <b>ماندريكلينكس 10.1 لأنظمة x86-64</b>، حلّ ماندريكلينكس للحصول على "
#~ "أفضل نتيجة من معالجات 64بت."
diff --git a/perl-install/share/po/az.po b/perl-install/share/po/az.po
index 6e8fc989b..3d67c5615 100644
--- a/perl-install/share/po/az.po
+++ b/perl-install/share/po/az.po
@@ -1253,11 +1253,11 @@ msgstr "Dil seçkisi"
#: any.pm:733
#, c-format
msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux can support multiple languages. Select\n"
"the languages you would like to install. They will be available\n"
"when your installation is complete and you restart your system."
msgstr ""
-"Mandrivalinux müxtəlif dilləri dəstəkləyir. Qurmaq istədiyiniz\n"
+"Mandriva Linux müxtəlif dilləri dəstəkləyir. Qurmaq istədiyiniz\n"
"dilləri seçin. Onlar qurulum tamamlanandan və sistem yenidən\n"
"başlayandan sonra istifadəyə hazır olacaqlar."
@@ -3654,12 +3654,12 @@ msgstr "radio dəstəyini fəallaşdır"
#, fuzzy, c-format
msgid ""
"Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
"terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
"button will reboot your computer."
msgstr ""
"Davam etmədən əvvəl, diqqətlə lisenziyanın qaydalarını oxumalısınız. O,\n"
-"bütün Mandrivalinux distribusiyasını əhatə edir. Əgər lisenziyadakı bütün\n"
+"bütün Mandriva Linux distribusiyasını əhatə edir. Əgər lisenziyadakı bütün\n"
"qaydalarla razısınızsa, qutusunu \"%s\" işarələyin. Əgər razı deyilsəniz, "
"sadəcə olaraq kompüterinizi bağlayın."
@@ -3849,13 +3849,13 @@ msgstr ""
#: help.pm:85
#, c-format
msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
"selected package is located on another CD-ROM, DrakX will eject the current\n"
"CD and ask you to insert the required one. If you do not have the requested\n"
"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
"installed."
msgstr ""
-"Mandrivalinux qurulumu müxtəlif CD-lər üstündə gəlir. DrakX\n"
+"Mandriva Linux qurulumu müxtəlif CD-lər üstündə gəlir. DrakX\n"
"seçili paketlərin hansı CD'də olduğunu bilir ona görə də lazım olanda\n"
"hazırkı CD-ni çıxardıb sizdən lazım olan CD-ni daxil etməyi istəyəcək.\n"
"Əgər əlinizin altında istənən CD yoxdursa \"%s\" düyməsinə basın və istənən\n"
@@ -3865,11 +3865,12 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
"simpler to manage, they have been placed into groups of similar\n"
"applications.\n"
"\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
"match applications from the various categories, so a ``Workstation''\n"
"installation can still have applications from the ``Server'' category\n"
"installed.\n"
@@ -3921,11 +3922,11 @@ msgid ""
"megabytes."
msgstr ""
"İndi sisteminizə qurmaq istədiyiniz proqramları müəyyən etmə vaxtıdır.\n"
-"Mandrivalinux daxilində minlərcə proqram mövcuddur və idarələrinin\n"
+"Mandriva Linux daxilində minlərcə proqram mövcuddur və idarələrinin\n"
"asan olması üçün onlar bənzər paketlər qruplarına ayrılıblar.\n"
"\n"
"Paketlər sisteminizin xüsusui istifadə sahəsinə görə qruplanıb.\n"
-"Mandrivalinuxda dörd əvvəldən müəyyən edilmiş qurulum növü mövcuddur.\n"
+"Mandriva Linuxda dörd əvvəldən müəyyən edilmiş qurulum növü mövcuddur.\n"
"Yalnız siz bu qrupları yenə də qarışdıra bilərsiniz və istədiyiniz əlavə.\n"
"proqramları seçə bilərsiniz. Misal üçün ''İş Stansiyası'' qurulumu\n"
"``İnkişaf'' qurulumundakı proqramları daxil edə bilər.\n"
@@ -4021,10 +4022,10 @@ msgid ""
"!! If a server package has been selected, either because you specifically\n"
"chose the individual package or because it was part of a group of packages,\n"
"you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux will automatically start any installed\n"
"services at boot time. Even if they are safe and have no known issues at\n"
"the time the distribution was shipped, it is entirely possible that\n"
-"security holes were discovered after this version of Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
"finalized. If you do not know what a particular service is supposed to do "
"or\n"
"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4056,7 +4057,8 @@ msgstr ""
"verici\n"
"seçilsə, sizə bu vericini həqiqətən də qurmaq istədiyinizi soruşan və "
"sizdən\n"
-"təsdiq istəyən pəncərə göstəriləcək. Əsas olaraq Mandrivalinux bütün qurulu\n"
+"təsdiq istəyən pəncərə göstəriləcək. Əsas olaraq Mandriva Linux bütün "
+"qurulu\n"
"olan xidmətləri açılışda fəal edir. Distribusiyanın çıxdığı vaxt onların "
"bilinən heç bir\n"
"xətası ya da təhlükəli yanı olmasa da, mümkündür ki, müəyyən vaxt sonra\n"
@@ -4067,7 +4069,7 @@ msgstr ""
"xidmət sisteminizə qurulacaq və sisteminizin açılışında fəal hala "
"gətiriləcək.\n"
"Qeyd: Xidmətlərin açılışda fəal olub olmamasını qurulum bitdikdən sonra da\n"
-"Mandrivalinux İdarə Mərkəzindən quraşdıra bilərsiniz!!\n"
+"Mandriva Linux İdarə Mərkəzindən quraşdıra bilərsiniz!!\n"
"\n"
"\"%s\" seçimi, bir proqramı seçdiyiniz zaman qurulum proqramının o proqram "
"ilə\n"
@@ -4221,7 +4223,7 @@ msgstr ""
msgid ""
"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
"on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
"\n"
"You'll see a list of different parameters to change to get an optimal\n"
"graphical display.\n"
@@ -4276,7 +4278,7 @@ msgid ""
"not successful in getting the display configured."
msgstr ""
"X (X Pəncərə Sistemi) GNU/Linuks qrafiki ara üzünün qəlbidir.\n"
-"Mandrivalinuxla bərabər gələn qrafiki mühitlərin hamısı (KDE, \n"
+"Mandriva Linuxla bərabər gələn qrafiki mühitlərin hamısı (KDE, \n"
"GNOME, AfterStep, WindowMaker, vs.) buna bağlıdır.\n"
"\n"
"Optimal görünüşü almaq üçün sizə dəyişdiriləcək fərqli parametrlər\n"
@@ -4396,12 +4398,12 @@ msgstr ""
#: help.pm:316
#, fuzzy, c-format
msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\n"
"operating system on your hard drive. If your hard drive is empty or if an\n"
"existing operating system is using all the available space you will have to\n"
"partition the drive. Basically, partitioning a hard drive means to\n"
"logically divide it to create the space needed to install your new\n"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
"\n"
"Because the process of partitioning a hard drive is usually irreversible\n"
"and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4428,7 +4430,7 @@ msgid ""
"FAT or NTFS partition. Resizing can be performed without the loss of any\n"
"data, provided you've previously defragmented the Windows partition.\n"
"Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
"the same computer.\n"
"\n"
" Before choosing this option, please understand that after this\n"
@@ -4437,7 +4439,8 @@ msgid ""
"to store your data or to install new software.\n"
"\n"
" * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
"this option. Be careful, because you will not be able to undo this "
"operation\n"
"after you confirm.\n"
@@ -4457,10 +4460,10 @@ msgid ""
"experience. For more instructions on how to use the DiskDrake utility,\n"
"refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
msgstr ""
-"Bu nöqtədə Mandrivalinuxi sabit diskinizdə haraya quracağınıza\n"
+"Bu nöqtədə Mandriva Linuxi sabit diskinizdə haraya quracağınıza\n"
"qərar verəcəksiniz. Əgər diskiniz boş isə və ya bir başqa sistem\n"
-"bütün yeri doldurmuş isə, o zaman diskinizdə Mandrivalinux üçün\n"
-"yer açmalısınız. Bölmələndirmə əsasən diskinizdə Mandrivalinuxu\n"
+"bütün yeri doldurmuş isə, o zaman diskinizdə Mandriva Linux üçün\n"
+"yer açmalısınız. Bölmələndirmə əsasən diskinizdə Mandriva Linuxu\n"
"qurmaqməntiqi sürücülər yaratmaqdan ibarətdir.\n"
"\n"
"Ümumiyyətlə bölmələndirmənin təsiri geri dönülməzdir və mə'lumat\n"
@@ -4495,7 +4498,7 @@ msgstr ""
"'Scandisk' və\n"
"'Defraq' əmrlərinin icra edilməsinir. Eyni zamanda mə'lumatlarınızın ehtiyat "
"nüsxəsini almayı\n"
-"da qətiyyən unutmayın. Kompüteriniz üstündə həm Mandrivalinux həm də "
+"da qətiyyən unutmayın. Kompüteriniz üstündə həm Mandriva Linux həm də "
"Microsoft\n"
"Windows ƏS'lərini işlətmək istəyirsinizsə bu seçənəyi seçin. Unutmayın ki "
"Microsoft\n"
@@ -4508,7 +4511,7 @@ msgstr ""
"bölməniz əvvəlkindən daha kiçik olacaq.\n"
"\n"
" * \"%s\": əgər sisteminizdəki bütün mövcud bölmələri silmək və yerinə\n"
-"Mandrivalinux sistemini qurmaq istəyirsinizsə bu seçənəyi seçin.\n"
+"Mandriva Linux sistemini qurmaq istəyirsinizsə bu seçənəyi seçin.\n"
"Diqqətli olun, ona görə ki seçiminizi təsdiqlədikdən sonra geri ala "
"bilməyəcəksiniz.\n"
"\n"
@@ -4670,7 +4673,7 @@ msgid ""
"Click on \"%s\" when you're ready to format the partitions.\n"
"\n"
"Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
"\n"
"Click on \"%s\" if you wish to select partitions which will be checked for\n"
"bad blocks on the disk."
@@ -4693,7 +4696,7 @@ msgstr ""
"\n"
"Bölmələri şəkilləndirməyə hazır olanda \"%s\" düyməsini basın.\n"
"\n"
-"Yeni Mandrivalinux sisteminizi qurmaq üçün başqa bölmə seçmək\n"
+"Yeni Mandriva Linux sisteminizi qurmaq üçün başqa bölmə seçmək\n"
"istəyirsinizsə \"%s\" düyməsinə basın.\n"
"\n"
"Üstündəki xəsərli blokların yoxlanmasını istədiyiniz bölmələri seçmək\n"
@@ -4711,7 +4714,7 @@ msgstr "Əvvəlki"
#: help.pm:434
#, fuzzy, c-format
msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
"have been updated since the initial release. Bugs may have been fixed,\n"
"security issues resolved. To allow you to benefit from these updates,\n"
"you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4723,7 +4726,7 @@ msgid ""
"will appear: review the selection, and press \"%s\" to retrieve and install\n"
"the selected package(s), or \"%s\" to abort."
msgstr ""
-"Mandrivalinuxu qurduğunuz vaxtda çox güman ki bə'zi paketlər \n"
+"Mandriva Linuxu qurduğunuz vaxtda çox güman ki bə'zi paketlər \n"
"ilk çıxışlarından sonra yenilənmiş ola bilər. Bunlarla bir çox xəta "
"düzəldilmiş\n"
"ya da təhlükəsizlik qüvvətləndirilmiş ola bilər. Bu yeniləmələrdən istifadə\n"
@@ -4753,7 +4756,7 @@ msgid ""
"generally obtained at the expense of ease of use.\n"
"\n"
"If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
"Control Center.\n"
"\n"
"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4777,7 +4780,7 @@ msgstr "Təhlükəsizlik İdarəçisi"
#, fuzzy, c-format
msgid ""
"At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
"defined, either from a previous installation of GNU/Linux or by another\n"
"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
"partitions must be defined.\n"
@@ -4847,7 +4850,7 @@ msgid ""
"may find it a useful place to store a spare kernel and ramdisk images for\n"
"emergency boot situations."
msgstr ""
-"Bu nöqtədə siz Mandrivalinux yüklənəcək bölmə(lər)i seçməlisiniz. Əgər\n"
+"Bu nöqtədə siz Mandriva Linux yüklənəcək bölmə(lər)i seçməlisiniz. Əgər\n"
"bölmələr əvvəldən mövcuddursa (sistemdə əvvəllər qurulu olan GNU/Linuks \n"
"bölmələri və ya başqa bölmələndirmə vasitələri ilə hazırladığınız "
"bölmələr),\n"
@@ -4942,7 +4945,7 @@ msgstr "Normal modla mütəxəssis modu arasında keç"
msgid ""
"More than one Microsoft partition has been detected on your hard drive.\n"
"Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
"\n"
"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
"\"Capacity\".\n"
@@ -4971,7 +4974,7 @@ msgid ""
"disk or partition is called \"C:\")."
msgstr ""
"Sürücünüzdə bir və ya daha çox Microsoft bölməsi tapıldı.\n"
-"Xahiş edirik, Mandrivalinuxi qurmaq üçün onlardan hansını\n"
+"Xahiş edirik, Mandriva Linuxi qurmaq üçün onlardan hansını\n"
"yenidən ölçüləndirmək istədiyinizi seçin.\n"
"\n"
"Hər bölmə bu cür sıralanıb; \"Linuks adı\",\"Windows adı\"\n"
@@ -5020,7 +5023,7 @@ msgid ""
"found on your machine.\n"
"\n"
"DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
"\n"
" * \"%s\". For the most part, this completely wipes out the old system.\n"
"However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5029,18 +5032,19 @@ msgid ""
"the file system, you should use this option.\n"
"\n"
" * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux system. Your current "
+"partitioning\n"
"scheme and user data will not be altered. Most of the other configuration\n"
"steps remain available and are similar to a standard installation.\n"
"\n"
-"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
msgstr ""
"Bu addım, yalnız sisteminizdə daha əvvəldən qurulu olan GNU/Linuks bölməsi\n"
"tapılanda fəal olur.\n"
"\n"
-"DrakX indi mövcud Mandrivalinux sisteminizi yeniləmək mi, yoxsa yenidən\n"
+"DrakX indi mövcud Mandriva Linux sisteminizi yeniləmək mi, yoxsa yenidən\n"
"qurmaq mı istədiyinizi bilməlidir.\n"
"\n"
" * \"%s\": Bu seçim köhnə sistemi tamamilə siləcək. Əgər sabit "
@@ -5050,13 +5054,13 @@ msgstr ""
"bu seçimi seçin. Yalnız, bölmələndirmə sxeminizdən aslı olaraq bə'zi mövcud\n"
"mə'lumatlarınızın üstündən yazılmasının qabağını ala bilərsiniz.\n"
"\n"
-" * \"%s\": Hazırkı Mandrivalinux sisteminizdə qurulu olan paketləri "
+" * \"%s\": Hazırkı Mandriva Linux sisteminizdə qurulu olan paketləri "
"yeniləmə\n"
"imkanı verir. Qurulum hazırkı bölmələmə sxemi və istifadəçi mə'lumat və "
"sənədlərinə\n"
"dəyməyəcək və dəyişdirməyəcək. Digər qurulum addımlarının çoxu isə standart\n"
"qurulumdakının eynisi olacaq. Bu seçimi \"8.1\" versiyasından əvvəlki "
-"Mandrivalinuxlarda\n"
+"Mandriva Linuxlarda\n"
"tədbiq etmək uyğun görülmür."
#: help.pm:591
@@ -5115,7 +5119,8 @@ msgid ""
"\n"
"About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
"cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 "
+"will\n"
"depend on the user's choices:\n"
"\n"
" * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5369,7 +5374,7 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
"the printing systems is best suited to particular types of configuration.\n"
"\n"
" * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5390,12 +5395,12 @@ msgid ""
"options and for managing the printer.\n"
"\n"
"If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
"Control Center and clicking on the \"%s\" button."
msgstr ""
"İndi kompüteriniz üçün çap sistemini seçmə vaxtı gəldi. Digər ƏS'ləri sizə "
"bir\n"
-"dənəsini təqdim edə bilərlər, yalnız Mandrivalinux ikisini təqdim edir.\n"
+"dənəsini təqdim edə bilərlər, yalnız Mandriva Linux ikisini təqdim edir.\n"
"Hər çap sistemi xüsusi quraşdırma növləri üçün uyğundur.\n"
"\n"
" * \"%s\" -- bu seçim``çap et, növbəyə alma'' mə'nasına gəlir.\n"
@@ -5412,8 +5417,8 @@ msgstr ""
"emulyasiya etmək istəyirsinizsə, \"cups-lpd \" demonunu başlatdığınıza\n"
"əmin oun. .\"%s\" eyni zamanda çapçının quraşdırılması və idarəsi və çap\n"
"üçün qrafiki ara üzlərə də sahibdir. \n"
-"Əgər indi birisini seçib sonra çap sistemini bəyənməzsəniz, onu "
-"Mandrivalinux\n"
+"Əgər indi birisini seçib sonra çap sistemini bəyənməzsəniz, onu Mandriva "
+"Linux\n"
"İdarə Mərkəzindəki PrinterDrake bölməsindəki mütəxəssis düyməsi vasitəsiylə\n"
"dəyişdirə bilərsiniz."
@@ -5531,7 +5536,8 @@ msgid ""
"\n"
" * \"%s\": if you wish to configure your Internet or local network access,\n"
"you can do so now. Refer to the printed documentation or use the\n"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to "
+"benefit\n"
"from full in-line help.\n"
"\n"
" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5548,7 +5554,7 @@ msgid ""
" * \"%s\": if you wish to change your bootloader configuration, click this\n"
"button. This should be reserved to advanced users. Refer to the printed\n"
"documentation or the in-line help about bootloader configuration in the\n"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
"\n"
" * \"%s\": through this entry you can fine tune which services will be run\n"
"on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5674,10 +5680,10 @@ msgstr "Xidmətlər"
#, fuzzy, c-format
msgid ""
"Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
"and will not be recoverable!"
msgstr ""
-"Yeni Mandrivalinux'izi qurmaq üçün silmək istədiyiniz sürücünü seçin.\n"
+"Yeni Mandriva Linux'izi qurmaq üçün silmək istədiyiniz sürücünü seçin.\n"
"Diqqətli olun, sürücüdəki bütün mə'lumatlar silinəcək\n"
"və geri gəlməyəcək!"
@@ -6024,11 +6030,11 @@ msgstr "Windows bölməsin böyüklüyü hesablanır"
#, c-format
msgid ""
"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
"installation."
msgstr ""
"Windows bölümünüz çox dağınıqdır. Daxiş edirik, əvvəlcə kompüterinizi "
-"Windows ilə açın, ''defrag'' vasitəsini işlədin, sonra Mandrivalinux "
+"Windows ilə açın, ''defrag'' vasitəsini işlədin, sonra Mandriva Linux "
"qurulumunu yenidən başladın."
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6142,13 +6148,13 @@ msgstr "Şəbəkə dayandırılır"
msgid ""
"Introduction\n"
"\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
"shall be called the \"Software Products\" hereafter. The Software Products "
"include, but are not \n"
"restricted to, the set of programs, methods, rules and documentation related "
"to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
"\n"
"\n"
"1. License Agreement\n"
@@ -6202,7 +6208,7 @@ msgid ""
"loss) arising out \n"
"of the possession and use of software components or arising out of "
"downloading software components \n"
-"from one of Mandrivalinux sites which are prohibited or restricted in some "
+"from one of Mandriva Linux sites which are prohibited or restricted in some "
"countries by local laws.\n"
"This limited liability applies to, but is not restricted to, the strong "
"cryptography components \n"
@@ -6239,7 +6245,7 @@ msgid ""
"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
"as a whole or in \n"
"parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
"Mandriva S.A. \n"
"\n"
"\n"
@@ -6266,7 +6272,7 @@ msgstr ""
"include, but are not \n"
"restricted to, the set of programs, methods, rules and documentation related "
"to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
"\n"
"\n"
"1. Lisenziya Müqaviləsi\n"
@@ -6320,7 +6326,7 @@ msgstr ""
"loss) arising out \n"
"of the possession and use of software components or arising out of "
"downloading software components \n"
-"from one of Mandrivalinux sites which are prohibited or restricted in some "
+"from one of Mandriva Linux sites which are prohibited or restricted in some "
"countries by local laws.\n"
"This limited liability applies to, but is not restricted to, the strong "
"cryptography components \n"
@@ -6357,7 +6363,7 @@ msgstr ""
"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
"as a whole or in \n"
"parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
"Mandriva S.A. \n"
"\n"
"\n"
@@ -6463,8 +6469,8 @@ msgid ""
"Remove the boot media and press return to reboot.\n"
"\n"
"\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
"consult the Errata available from:\n"
"\n"
"\n"
@@ -6472,28 +6478,28 @@ msgid ""
"\n"
"\n"
"Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
msgstr ""
"Təbrik edirik, qurulum başa çatdı.\n"
"Cdrom və disketi çıxartdıqtan sonra Enter'ə basaraq kompüterinizi\n"
"yenidən başladın.\n"
"\n"
"\n"
-"Mandrivalinux'in bu buraxılışındakı yamaqlar haqqında \n"
+"Mandriva Linux'in bu buraxılışındakı yamaqlar haqqında \n"
"mə'lumat almaq üçün bu ünvana baxın: \n"
"\n"
"%s\n"
"\n"
"\n"
"Sisteminizin qurğuları haqqında daha geniş mə'lumatı Rəsmi\n"
-"Mandrivalinux İstifadəçi Kitabcığının qurulum sonrası bölməsində\n"
+"Mandriva Linux İstifadəçi Kitabcığının qurulum sonrası bölməsində\n"
"tapa bilərsiniz."
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
#: install_messages.pm:144
#, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
#: install_steps.pm:246
#, c-format
@@ -6522,7 +6528,7 @@ msgstr "Başlanğıc addımı `%s'\n"
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
"this,\n"
"press `F1' when booting on CDROM, then enter `text'."
msgstr ""
@@ -7064,9 +7070,9 @@ msgstr ""
#: install_steps_interactive.pm:821
#, c-format
msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
-"Mövcud əkslərin siyahısını almaq üçün Mandrivalinux səhifəsi ilə təmas "
+"Mövcud əkslərin siyahısını almaq üçün Mandriva Linux səhifəsi ilə təmas "
"qurulur..."
#: install_steps_interactive.pm:840
@@ -7286,8 +7292,8 @@ msgstr ""
#: install_steps_newt.pm:20
#, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux Qurulumu %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux Qurulumu %s"
#. -PO: This string must fit in a 80-char wide text screen
#: install_steps_newt.pm:34
@@ -9873,13 +9879,13 @@ msgstr ""
msgid ""
"drakfirewall configurator\n"
"\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
"For a powerful and dedicated firewall solution, please look to the\n"
"specialized MandrakeSecurity Firewall distribution."
msgstr ""
"drakfirewall quraşdırıcısı\n"
"\n"
-"Bu, Mandrivalinux sisteminiz üçün şəxsi bir atəş divarını quraşdıracaq.\n"
+"Bu, Mandriva Linux sisteminiz üçün şəxsi bir atəş divarını quraşdıracaq.\n"
"Daha güclü və e'tibarlı sistem üçün xahiş edirik, xüsusi MandrakeSecurity\n"
"Firewall buraxılışı ilə maraqlanın."
@@ -12517,7 +12523,7 @@ msgstr ""
"ümumiyyətlə \"Fayl\" menyusunda yer alır).\n"
"\n"
"Əgər çapçı ilə əlaqəli hər hansı bir qurğu yerinə gətirmək, ya da yeni çapçı "
-"əlavə etmək / çapçı silmək istəyirsinizsə, Mandrivalinux İdarə Mərkəzindəki "
+"əlavə etmək / çapçı silmək istəyirsinizsə, Mandriva Linux İdarə Mərkəzindəki "
"\"Avadanlıq\" bölməsində yer alan in the \"Çapçı\" düyməsini istifadə edin."
#: printer/printerdrake.pm:1207 printer/printerdrake.pm:1437
@@ -13835,8 +13841,8 @@ msgstr ""
#: printer/printerdrake.pm:3929
#, c-format
msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
"\n"
msgstr ""
@@ -14108,10 +14114,10 @@ msgid ""
"also using the %s Control Center, section \"Hardware\"/\"Printer\""
msgstr ""
"Qurulum sırasında edilən şəbəkə quraşdırılması indi başladıla bilməz. Xahiş "
-"dirik, sistem açılandan sonra şəbəkənin işlədiyini yoxlayın və Mandrivalinux "
-"İdarə Mərkəzindəki Şəbəkə və İnternet bölməsindən qurğuları düzəldin, və "
-"ondan sonra yenə də Mandrivalinux İdarə Mərkəzindəki \"Avadanlıq\"/\"Çapçı\" "
-"bölməsindən çapçınızı qurun."
+"dirik, sistem açılandan sonra şəbəkənin işlədiyini yoxlayın və Mandriva "
+"Linux İdarə Mərkəzindəki Şəbəkə və İnternet bölməsindən qurğuları düzəldin, "
+"və ondan sonra yenə də Mandriva Linux İdarə Mərkəzindəki \"Avadanlıq\"/"
+"\"Çapçı\" bölməsindən çapçınızı qurun."
#: printer/printerdrake.pm:4196
#, c-format
@@ -15736,18 +15742,18 @@ msgstr "Dayandır"
#: share/advertising/01.pl:13
#, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Mandrivalinux Nədir?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Mandriva Linux Nədir?</b>"
#: share/advertising/01.pl:15
#, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "<b>Mandrivalinux</b> Xoş Gəldiniz!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "<b>Mandriva Linux</b> Xoş Gəldiniz!"
#: share/advertising/01.pl:17
#, c-format
msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"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."
@@ -15756,7 +15762,7 @@ msgstr ""
#: share/advertising/01.pl:19
#, c-format
msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"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!"
msgstr ""
@@ -15773,9 +15779,9 @@ msgstr "Açıq Mənbə Dünyasına Xoş Gəldiniz!"
#: share/advertising/02.pl:17
#, c-format
msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"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 Mandrivalinux "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
"contributors."
msgstr ""
@@ -15794,8 +15800,8 @@ msgstr "<b>Qeyd</b>"
#: share/advertising/03.pl:15
#, c-format
msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
msgstr ""
#: share/advertising/03.pl:17
@@ -15816,34 +15822,34 @@ msgstr ""
#: share/advertising/04.pl:13
#, fuzzy, c-format
msgid "<b>Join the Community</b>"
-msgstr "<b>Mandrivalinux cəmiyyətinə qoşulun!</b>"
+msgstr "<b>Mandriva Linux cəmiyyətinə qoşulun!</b>"
#: share/advertising/04.pl:15
#, c-format
msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"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 Mandrivalinux world."
+"<b>key role</b> in the Mandriva Linux world."
msgstr ""
#: share/advertising/04.pl:17
#, c-format
msgid ""
"To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"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."
msgstr ""
#: share/advertising/05.pl:15
#, fuzzy, c-format
msgid "<b>Download Version</b>"
-msgstr "Bu Mandrivalinux <b>Endirmə buraxılışıdır</b>."
+msgstr "Bu Mandriva Linux <b>Endirmə buraxılışıdır</b>."
#: share/advertising/05.pl:17
#, c-format
msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
"version that Mandriva wants to keep <b>available to everyone</b>."
msgstr ""
@@ -15881,7 +15887,7 @@ msgstr ""
#: share/advertising/06.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
msgstr ""
#: share/advertising/06.pl:17
@@ -15900,7 +15906,7 @@ msgstr ""
#: share/advertising/07.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
msgstr ""
#: share/advertising/07.pl:17
@@ -15918,7 +15924,7 @@ msgstr ""
#: share/advertising/08.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
msgstr ""
#: share/advertising/08.pl:17
@@ -15938,13 +15944,13 @@ msgstr "<b>Mandriva Store</b>"
#: share/advertising/09.pl:15
#, c-format
msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
msgstr ""
#: share/advertising/09.pl:17
#, fuzzy, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux Yeniləmələri Appleti"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux Yeniləmələri Appleti"
#: share/advertising/09.pl:18
#, c-format
@@ -15964,7 +15970,7 @@ msgstr ""
#: share/advertising/09.pl:21
#, c-format
msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
"the most of your 64-bit processor."
msgstr ""
@@ -15976,21 +15982,21 @@ msgstr ""
#: share/advertising/10.pl:17
#, c-format
msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"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:"
msgstr ""
#: share/advertising/10.pl:18
#, c-format
msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
"bootable CD-ROM."
msgstr ""
#: share/advertising/10.pl:19
#, c-format
msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
"ultra-compact “LaCie Mobile Hard Drive”."
msgstr ""
@@ -16008,17 +16014,19 @@ msgstr ""
#: share/advertising/11.pl:16
#, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
msgstr ""
#: share/advertising/11.pl:17
#, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
msgstr ""
#: share/advertising/11.pl:18
#, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
msgstr ""
#: share/advertising/12.pl:13
@@ -16194,7 +16202,7 @@ msgstr ""
#: share/advertising/18.pl:15
#, c-format
msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
"<b>all of your tasks</b>:"
msgstr ""
@@ -16435,14 +16443,14 @@ msgstr ""
#: share/advertising/25.pl:13
#, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux İdarə Mərkəzi</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux İdarə Mərkəzi</b>"
#: share/advertising/25.pl:15
#, c-format
msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
"your computer."
msgstr ""
@@ -16465,8 +16473,8 @@ msgid ""
"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 "
+"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!"
msgstr ""
@@ -16496,8 +16504,8 @@ msgstr ""
#: share/advertising/27.pl:21
#, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Bugün <b>store.mandrakesoft.com</b> ünvanını ziyarət edin"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Bugün <b>store.mandriva.com</b> ünvanını ziyarət edin"
#: share/advertising/28.pl:15
#, c-format
@@ -16507,7 +16515,7 @@ msgstr "<b>Mandriva Club</b>"
#: share/advertising/28.pl:17
#, c-format
msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
"product.."
msgstr ""
@@ -16521,7 +16529,7 @@ msgstr ""
#, c-format
msgid ""
"\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
msgstr ""
#: share/advertising/28.pl:21
@@ -16533,14 +16541,14 @@ msgstr ""
#: share/advertising/28.pl:22
#, fuzzy, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
msgstr "\t* <b>Kopete</b> ilə onlayn söhbətdə yer alın"
#: share/advertising/28.pl:23
#, c-format
msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
msgstr ""
#: share/advertising/29.pl:13
@@ -16559,7 +16567,7 @@ msgstr ""
#, c-format
msgid ""
"Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
msgstr ""
#: share/advertising/29.pl:18
@@ -16582,7 +16590,7 @@ msgstr ""
#: share/advertising/29.pl:21
#, c-format
msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
msgstr ""
#: share/advertising/30.pl:13
@@ -16594,21 +16602,21 @@ msgstr "<b>Mandriva Expert</b>"
#, c-format
msgid ""
"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
msgstr ""
#: share/advertising/30.pl:17
#, c-format
msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
"a lot of time."
msgstr ""
#: share/advertising/30.pl:19
#, c-format
msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
msgstr ""
#: share/compssUsers.pl:25
@@ -16988,8 +16996,8 @@ msgid ""
"\n"
"OPTIONS:\n"
" --help - print this help message.\n"
-" --report - program should be one of mandrakelinux tools\n"
-" --incident - program should be one of mandrakelinux tools"
+" --report - program should be one of Mandriva Linux tools\n"
+" --incident - program should be one of Mandriva Linux tools"
msgstr ""
"[SEÇİMLƏR] [PROQRAM_ADI]\n"
"\n"
@@ -17042,7 +17050,7 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
"--enable : enable MTS\n"
"--disable : disable MTS\n"
"--start : start MTS\n"
@@ -19862,13 +19870,13 @@ msgstr ""
#: standalone/drakbug:41
#, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux Xəta Raportlama Vasitəsi"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux Xəta Raportlama Vasitəsi"
#: standalone/drakbug:46
#, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux İdarə Mərkəzi"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux İdarə Mərkəzi"
#: standalone/drakbug:48
#, c-format
@@ -20353,7 +20361,7 @@ msgstr "Açılışda başladılır"
#, fuzzy, c-format
msgid ""
"This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
msgstr ""
"BU ara üz hələlik quraşdırılmayıb.\n"
"Ana pəncərədə quraşdırma sehirbazını işə salın"
@@ -20362,7 +20370,7 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
msgstr ""
"BU ara üz hələlik quraşdırılmayıb.\n"
"Ana pəncərədə quraşdırma sehirbazını işə salın"
@@ -20415,7 +20423,7 @@ msgstr ""
#: standalone/drakedm:36
#, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
msgstr ""
#: standalone/drakedm:37
@@ -20717,18 +20725,18 @@ msgid ""
"\n"
" DUPONT Sebastien (original version)\n"
"\n"
-" CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+" CHAUMETTE Damien <dchaumette@mandriva.com>\n"
"\n"
-" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+" VIGNAUD Thierry <tvignaud@mandriva.com>"
msgstr ""
"Müəllif Hüququ (C) 2001-2002 Mandriva \n"
"\n"
"\n"
" DUPONT Sebastien (orijinal buraxılış)\n"
"\n"
-" CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+" CHAUMETTE Damien <dchaumette@mandriva.com>\n"
"\n"
-" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+" VIGNAUD Thierry <tvignaud@mandriva.com>"
#: standalone/drakfont:520
#, fuzzy, c-format
@@ -21283,8 +21291,8 @@ msgstr ""
#: standalone/drakhelp:36
#, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinux İdarə Mərkəzi"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linux İdarə Mərkəzi"
#: standalone/drakhelp:36
#, c-format
@@ -21938,7 +21946,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
"Sisteminizdə səs kartı aşkar edilməyib. Xahiş edirik, Linuks dəstəkli səs "
"kartının düzgün taxıldığını yoxlayın.\n"
@@ -21947,7 +21955,7 @@ msgstr ""
"Avadanlıq mə'lumat bazamızı bu ünvanda ziyarət edə bilərisiniz:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
#: standalone/draksound:57
#, fuzzy, c-format
@@ -23573,7 +23581,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
"Sisteminizdə heç bit Televiziya Kartı aşkar edilmədi. Xahiş edirik, Linuks "
"dəstəkli Televiziya Kartının düzgün taxıldığını yoxlayın.\n"
@@ -23582,7 +23590,7 @@ msgstr ""
"Avadanlıq mə'lumat bazamızı bu ünvandan ziyarət edə bilərsiniz:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
#: standalone/harddrake2:24
#, c-format
@@ -24284,13 +24292,13 @@ msgid ""
"This is HardDrake, a %s hardware configuration tool.\n"
"<span foreground=\"royalblue3\">Version:</span> %s\n"
"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
"\n"
msgstr ""
-"Bu HardDrake'dir, Mandrivalinux avadanlıq quraşdırma vasitəsi.\n"
+"Bu HardDrake'dir, Mandriva Linux avadanlıq quraşdırma vasitəsi.\n"
"<span foreground=\"royalblue3\">Buraxılış:</span> %s\n"
"<span foreground=\"royalblue3\">Müəllif:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
"\n"
#: standalone/harddrake2:243
@@ -24398,8 +24406,8 @@ msgstr "Dəyişikliklər edildi, ancaq effektiv olmaq üçün yenidən giriş ed
#: standalone/logdrake:50
#, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinux Vasitələrinin İzahatı"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linux Vasitələrinin İzahatı"
#: standalone/logdrake:51
#, c-format
@@ -24912,10 +24920,10 @@ msgstr "Bağlantı tamamlandı."
#, c-format
msgid ""
"Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
msgstr ""
"Bağlantı iflas etdi.\n"
-"Mandrivalinux İdarə Mərkəzindən qurğularınızı yoxlayın."
+"Mandriva Linux İdarə Mərkəzindən qurğularınızı yoxlayın."
#: standalone/net_monitor:341
#, c-format
@@ -25152,7 +25160,7 @@ msgstr "Quraşdırılmış darayıcıların siyahısı yenidən yaradılır ..."
#: standalone/scannerdrake:101
#, fuzzy, c-format
msgid "The %s is not supported by this version of %s."
-msgstr "%s Mandrivalinuxun bu buraxılışı tərəfindən dəstəklənmir."
+msgstr "%s Mandriva Linuxun bu buraxılışı tərəfindən dəstəklənmir."
#: standalone/scannerdrake:104
#, c-format
@@ -25193,7 +25201,7 @@ msgstr ""
#: standalone/scannerdrake:144
#, fuzzy, c-format
msgid "The %s is not supported under Linux."
-msgstr "%s Mandrivalinuxun bu buraxılışı tərəfindən dəstəklənmir."
+msgstr "%s Mandriva Linuxun bu buraxılışı tərəfindən dəstəklənmir."
#: standalone/scannerdrake:171 standalone/scannerdrake:185
#, c-format
@@ -25294,7 +25302,7 @@ msgid ""
"You can launch printerdrake from the %s Control Center in Hardware section."
msgstr ""
"%s printerdrake tərəfindən quraşdırılmalıdır.\n"
-"Printerdrake'ni Mandrivalinux İdarə Mərkəzindəki Avadanlıq bölməsindən işə "
+"Printerdrake'ni Mandriva Linux İdarə Mərkəzindəki Avadanlıq bölməsindən işə "
"sala bilərsiniz."
#: standalone/scannerdrake:308 standalone/scannerdrake:315
diff --git a/perl-install/share/po/be.po b/perl-install/share/po/be.po
index 68f40007b..7888f045c 100644
--- a/perl-install/share/po/be.po
+++ b/perl-install/share/po/be.po
@@ -1226,7 +1226,7 @@ msgstr "Выбар мовы"
#: any.pm:733
#, c-format
msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux can support multiple languages. Select\n"
"the languages you would like to install. They will be available\n"
"when your installation is complete and you restart your system."
msgstr "Вы можаце абраць іншыя мовы, якія будуць даступны пасля ўсталявання"
@@ -3476,7 +3476,7 @@ msgstr ""
#, c-format
msgid ""
"Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
"terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
"button will reboot your computer."
msgstr ""
@@ -3586,7 +3586,7 @@ msgstr ""
#: help.pm:85
#, c-format
msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
"selected package is located on another CD-ROM, DrakX will eject the current\n"
"CD and ask you to insert the required one. If you do not have the requested\n"
"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3597,11 +3597,12 @@ msgstr ""
#, c-format
msgid ""
"It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
"simpler to manage, they have been placed into groups of similar\n"
"applications.\n"
"\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
"match applications from the various categories, so a ``Workstation''\n"
"installation can still have applications from the ``Server'' category\n"
"installed.\n"
@@ -3708,10 +3709,10 @@ msgid ""
"!! If a server package has been selected, either because you specifically\n"
"chose the individual package or because it was part of a group of packages,\n"
"you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux will automatically start any installed\n"
"services at boot time. Even if they are safe and have no known issues at\n"
"the time the distribution was shipped, it is entirely possible that\n"
-"security holes were discovered after this version of Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
"finalized. If you do not know what a particular service is supposed to do "
"or\n"
"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3820,7 +3821,7 @@ msgstr ""
msgid ""
"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
"on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
"\n"
"You'll see a list of different parameters to change to get an optimal\n"
"graphical display.\n"
@@ -3918,12 +3919,12 @@ msgstr ""
#: help.pm:316
#, c-format
msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\n"
"operating system on your hard drive. If your hard drive is empty or if an\n"
"existing operating system is using all the available space you will have to\n"
"partition the drive. Basically, partitioning a hard drive means to\n"
"logically divide it to create the space needed to install your new\n"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
"\n"
"Because the process of partitioning a hard drive is usually irreversible\n"
"and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -3950,7 +3951,7 @@ msgid ""
"FAT or NTFS partition. Resizing can be performed without the loss of any\n"
"data, provided you've previously defragmented the Windows partition.\n"
"Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
"the same computer.\n"
"\n"
" Before choosing this option, please understand that after this\n"
@@ -3959,7 +3960,8 @@ msgid ""
"to store your data or to install new software.\n"
"\n"
" * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
"this option. Be careful, because you will not be able to undo this "
"operation\n"
"after you confirm.\n"
@@ -4088,7 +4090,7 @@ msgid ""
"Click on \"%s\" when you're ready to format the partitions.\n"
"\n"
"Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
"\n"
"Click on \"%s\" if you wish to select partitions which will be checked for\n"
"bad blocks on the disk."
@@ -4106,7 +4108,7 @@ msgstr "прылада"
#: help.pm:434
#, c-format
msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
"have been updated since the initial release. Bugs may have been fixed,\n"
"security issues resolved. To allow you to benefit from these updates,\n"
"you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4135,7 +4137,7 @@ msgid ""
"generally obtained at the expense of ease of use.\n"
"\n"
"If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
"Control Center.\n"
"\n"
"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4151,7 +4153,7 @@ msgstr "Сістэмнае адміністраваньне"
#, c-format
msgid ""
"At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
"defined, either from a previous installation of GNU/Linux or by another\n"
"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
"partitions must be defined.\n"
@@ -4237,7 +4239,7 @@ msgstr "Звычайны рэжым"
msgid ""
"More than one Microsoft partition has been detected on your hard drive.\n"
"Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
"\n"
"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
"\"Capacity\".\n"
@@ -4282,7 +4284,7 @@ msgid ""
"found on your machine.\n"
"\n"
"DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
"\n"
" * \"%s\". For the most part, this completely wipes out the old system.\n"
"However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4291,13 +4293,14 @@ msgid ""
"the file system, you should use this option.\n"
"\n"
" * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux system. Your current "
+"partitioning\n"
"scheme and user data will not be altered. Most of the other configuration\n"
"steps remain available and are similar to a standard installation.\n"
"\n"
-"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
msgstr ""
#: help.pm:591
@@ -4338,7 +4341,8 @@ msgid ""
"\n"
"About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
"cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 "
+"will\n"
"depend on the user's choices:\n"
"\n"
" * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4495,7 +4499,7 @@ msgstr ""
#, c-format
msgid ""
"Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
"the printing systems is best suited to particular types of configuration.\n"
"\n"
" * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4516,7 +4520,7 @@ msgid ""
"options and for managing the printer.\n"
"\n"
"If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
"Control Center and clicking on the \"%s\" button."
msgstr ""
@@ -4616,7 +4620,8 @@ msgid ""
"\n"
" * \"%s\": if you wish to configure your Internet or local network access,\n"
"you can do so now. Refer to the printed documentation or use the\n"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to "
+"benefit\n"
"from full in-line help.\n"
"\n"
" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4633,7 +4638,7 @@ msgid ""
" * \"%s\": if you wish to change your bootloader configuration, click this\n"
"button. This should be reserved to advanced users. Refer to the printed\n"
"documentation or the in-line help about bootloader configuration in the\n"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
"\n"
" * \"%s\": through this entry you can fine tune which services will be run\n"
"on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4695,7 +4700,7 @@ msgstr "Сэрвісы"
#, c-format
msgid ""
"Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
"and will not be recoverable!"
msgstr ""
@@ -5018,7 +5023,7 @@ msgstr "Выкарыстоўваць незанятую прастору на р
#, c-format
msgid ""
"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
"installation."
msgstr ""
"Ваш раздзел з Windows занадта фрагментаваны. \n"
@@ -5125,13 +5130,13 @@ msgstr "Адлучэнне ад сеткі"
msgid ""
"Introduction\n"
"\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
"shall be called the \"Software Products\" hereafter. The Software Products "
"include, but are not \n"
"restricted to, the set of programs, methods, rules and documentation related "
"to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
"\n"
"\n"
"1. License Agreement\n"
@@ -5185,7 +5190,7 @@ msgid ""
"loss) arising out \n"
"of the possession and use of software components or arising out of "
"downloading software components \n"
-"from one of Mandrivalinux sites which are prohibited or restricted in some "
+"from one of Mandriva Linux sites which are prohibited or restricted in some "
"countries by local laws.\n"
"This limited liability applies to, but is not restricted to, the strong "
"cryptography components \n"
@@ -5222,7 +5227,7 @@ msgid ""
"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
"as a whole or in \n"
"parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
"Mandriva S.A. \n"
"\n"
"\n"
@@ -5295,8 +5300,8 @@ msgid ""
"Remove the boot media and press return to reboot.\n"
"\n"
"\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
"consult the Errata available from:\n"
"\n"
"\n"
@@ -5304,14 +5309,14 @@ msgid ""
"\n"
"\n"
"Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
#: install_messages.pm:144
#, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
#: install_steps.pm:246
#, c-format
@@ -5340,12 +5345,12 @@ msgstr "Пераход на крок ‛%s’\n"
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
"this,\n"
"press `F1' when booting on CDROM, then enter `text'."
msgstr ""
"У Вашай сістэме маецца недахоп рэсурсаў, таму магчымы праблемы\n"
-"пры ўсталяванні Mandrivalinux. У гэтым выпадку паспрабуйце тэкставую\n"
+"пры ўсталяванні Mandriva Linux. У гэтым выпадку паспрабуйце тэкставую\n"
"праграму ўсталявання. Для гэтага націсніце ‛F1’ у час загрузкі, а потым\n"
"набярыце ‛text’ і націсніце <ENTER>."
@@ -5862,7 +5867,7 @@ msgstr ""
#: install_steps_interactive.pm:821
#, fuzzy, c-format
msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "Сувязь з люрам для атрымання спісу даступных пакетаў"
#: install_steps_interactive.pm:840
@@ -6071,8 +6076,8 @@ msgstr ""
#: install_steps_newt.pm:20
#, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Усталяванне Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Усталяванне Mandriva Linux %s"
#. -PO: This string must fit in a 80-char wide text screen
#: install_steps_newt.pm:34
@@ -8640,7 +8645,7 @@ msgstr ""
msgid ""
"drakfirewall configurator\n"
"\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
"For a powerful and dedicated firewall solution, please look to the\n"
"specialized MandrakeSecurity Firewall distribution."
msgstr ""
@@ -12214,8 +12219,8 @@ msgstr ""
#: printer/printerdrake.pm:3929
#, c-format
msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
"\n"
msgstr ""
@@ -13942,18 +13947,18 @@ msgstr "Спыніць"
#: share/advertising/01.pl:13
#, c-format
-msgid "<b>What is Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
msgstr ""
#: share/advertising/01.pl:15
#, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Сардэчна запрашаем у <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Сардэчна запрашаем у <b>Mandriva Linux</b>!"
#: share/advertising/01.pl:17
#, c-format
msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"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."
@@ -13962,7 +13967,7 @@ msgstr ""
#: share/advertising/01.pl:19
#, c-format
msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"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!"
msgstr ""
@@ -13979,9 +13984,9 @@ msgstr ""
#: share/advertising/02.pl:17
#, c-format
msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"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 Mandrivalinux "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
"contributors."
msgstr ""
@@ -14000,8 +14005,8 @@ msgstr ""
#: share/advertising/03.pl:15
#, c-format
msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
msgstr ""
#: share/advertising/03.pl:17
@@ -14027,17 +14032,17 @@ msgstr ""
#: share/advertising/04.pl:15
#, c-format
msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"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 Mandrivalinux world."
+"<b>key role</b> in the Mandriva Linux world."
msgstr ""
#: share/advertising/04.pl:17
#, c-format
msgid ""
"To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"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."
msgstr ""
@@ -14049,7 +14054,7 @@ msgstr ""
#: share/advertising/05.pl:17
#, c-format
msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
"version that Mandriva wants to keep <b>available to everyone</b>."
msgstr ""
@@ -14087,7 +14092,7 @@ msgstr ""
#: share/advertising/06.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
msgstr ""
#: share/advertising/06.pl:17
@@ -14106,7 +14111,7 @@ msgstr ""
#: share/advertising/07.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
msgstr ""
#: share/advertising/07.pl:17
@@ -14124,7 +14129,7 @@ msgstr ""
#: share/advertising/08.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
msgstr ""
#: share/advertising/08.pl:17
@@ -14144,12 +14149,12 @@ msgstr "Цэнтар кіраваньня"
#: share/advertising/09.pl:15
#, c-format
msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
msgstr ""
#: share/advertising/09.pl:17
#, c-format
-msgid "The Mandrivalinux products are:"
+msgid "The Mandriva Linux products are:"
msgstr ""
#: share/advertising/09.pl:18
@@ -14170,7 +14175,7 @@ msgstr ""
#: share/advertising/09.pl:21
#, c-format
msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
"the most of your 64-bit processor."
msgstr ""
@@ -14182,21 +14187,21 @@ msgstr ""
#: share/advertising/10.pl:17
#, c-format
msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"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:"
msgstr ""
#: share/advertising/10.pl:18
#, c-format
msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
"bootable CD-ROM."
msgstr ""
#: share/advertising/10.pl:19
#, c-format
msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
"ultra-compact “LaCie Mobile Hard Drive”."
msgstr ""
@@ -14214,17 +14219,19 @@ msgstr ""
#: share/advertising/11.pl:16
#, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
msgstr ""
#: share/advertising/11.pl:17
#, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
msgstr ""
#: share/advertising/11.pl:18
#, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
msgstr ""
#: share/advertising/12.pl:13
@@ -14400,7 +14407,7 @@ msgstr ""
#: share/advertising/18.pl:15
#, c-format
msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
"<b>all of your tasks</b>:"
msgstr ""
@@ -14635,14 +14642,14 @@ msgstr ""
#: share/advertising/25.pl:13
#, fuzzy, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
msgstr "Цэнтар кіраваньня"
#: share/advertising/25.pl:15
#, c-format
msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
"your computer."
msgstr ""
@@ -14665,8 +14672,8 @@ msgid ""
"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 "
+"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!"
msgstr ""
@@ -14696,7 +14703,7 @@ msgstr ""
#: share/advertising/27.pl:21
#, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
msgstr ""
#: share/advertising/28.pl:15
@@ -14707,7 +14714,7 @@ msgstr "Цэнтар кіраваньня"
#: share/advertising/28.pl:17
#, c-format
msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
"product.."
msgstr ""
@@ -14721,7 +14728,7 @@ msgstr ""
#, c-format
msgid ""
"\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
msgstr ""
#: share/advertising/28.pl:21
@@ -14733,14 +14740,14 @@ msgstr ""
#: share/advertising/28.pl:22
#, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
msgstr ""
#: share/advertising/28.pl:23
#, c-format
msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
msgstr ""
#: share/advertising/29.pl:13
@@ -14759,7 +14766,7 @@ msgstr ""
#, c-format
msgid ""
"Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
msgstr ""
#: share/advertising/29.pl:18
@@ -14782,7 +14789,7 @@ msgstr ""
#: share/advertising/29.pl:21
#, c-format
msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
msgstr ""
#: share/advertising/30.pl:13
@@ -14794,21 +14801,21 @@ msgstr "Цэнтар кіраваньня"
#, c-format
msgid ""
"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
msgstr ""
#: share/advertising/30.pl:17
#, c-format
msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
"a lot of time."
msgstr ""
#: share/advertising/30.pl:19
#, c-format
msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
msgstr ""
#: share/compssUsers.pl:25
@@ -15184,8 +15191,8 @@ msgid ""
"\n"
"OPTIONS:\n"
" --help - print this help message.\n"
-" --report - program should be one of mandrakelinux tools\n"
-" --incident - program should be one of mandrakelinux tools"
+" --report - program should be one of Mandriva Linux tools\n"
+" --incident - program should be one of Mandriva Linux tools"
msgstr ""
#: standalone.pm:63
@@ -15221,7 +15228,7 @@ msgstr ""
#, c-format
msgid ""
"[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
"--enable : enable MTS\n"
"--disable : disable MTS\n"
"--start : start MTS\n"
@@ -17723,12 +17730,12 @@ msgstr ""
#: standalone/drakbug:41
#, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Дастасаваньне для кіраваньня карыстальнікамі Mandrivalinux"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Дастасаваньне для кіраваньня карыстальнікамі Mandriva Linux"
#: standalone/drakbug:46
#, fuzzy, c-format
-msgid "Mandrivalinux Control Center"
+msgid "Mandriva Linux Control Center"
msgstr "Цэнтар кіраваньня"
#: standalone/drakbug:48
@@ -18200,14 +18207,14 @@ msgstr ""
#, c-format
msgid ""
"This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
msgstr ""
#: standalone/drakconnect:1009 standalone/net_applet:61
#, c-format
msgid ""
"You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
msgstr ""
#. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18258,7 +18265,7 @@ msgstr ""
#: standalone/drakedm:36
#, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
msgstr ""
#: standalone/drakedm:37
@@ -18548,9 +18555,9 @@ msgid ""
"\n"
" DUPONT Sebastien (original version)\n"
"\n"
-" CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+" CHAUMETTE Damien <dchaumette@mandriva.com>\n"
"\n"
-" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+" VIGNAUD Thierry <tvignaud@mandriva.com>"
msgstr ""
#: standalone/drakfont:520
@@ -19049,7 +19056,7 @@ msgstr ""
#: standalone/drakhelp:36
#, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
msgstr "Цэнтар кіраваньня"
#: standalone/drakhelp:36
@@ -19636,7 +19643,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
#: standalone/draksound:57
@@ -21234,7 +21241,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
#: standalone/harddrake2:24
@@ -21920,7 +21927,7 @@ msgid ""
"This is HardDrake, a %s hardware configuration tool.\n"
"<span foreground=\"royalblue3\">Version:</span> %s\n"
"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
"\n"
msgstr ""
@@ -22029,7 +22036,7 @@ msgstr ""
#: standalone/logdrake:50
#, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
msgstr "Цэнтар кіраваньня"
#: standalone/logdrake:51
@@ -22533,7 +22540,7 @@ msgstr "Імя злучэння"
#, c-format
msgid ""
"Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
msgstr ""
#: standalone/net_monitor:341
diff --git a/perl-install/share/po/bg.po b/perl-install/share/po/bg.po
index c076c93f2..b55e11422 100644
--- a/perl-install/share/po/bg.po
+++ b/perl-install/share/po/bg.po
@@ -1245,11 +1245,11 @@ msgstr "ръчно"
#: any.pm:733
#, c-format
msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux can support multiple languages. Select\n"
"the languages you would like to install. They will be available\n"
"when your installation is complete and you restart your system."
msgstr ""
-"Mandrivalinux може да подържа много езици. Изберете\n"
+"Mandriva Linux може да подържа много езици. Изберете\n"
"езиците които искате ад инсталирате. Те ще бъдат налични след\n"
"като завърши инсталацията и вие престартирате системата."
@@ -3564,13 +3564,13 @@ msgstr "разрешава подръжка на радио"
#, fuzzy, c-format
msgid ""
"Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
"terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
"button will reboot your computer."
msgstr ""
"Преди да продължите, трябва внимателно да прочетете условията на лиценза. "
"Той\n"
-"покрива цялата Mandrivalinux дистрибуция, и, ако сте съгласни с всички "
+"покрива цялата Mandriva Linux дистрибуция, и, ако сте съгласни с всички "
"условия\n"
"в него, сложете отметка на \"%s\".Ако не сте съгласни,просто спрете "
"компютъра си."
@@ -3757,13 +3757,13 @@ msgstr ""
#: help.pm:85
#, fuzzy, c-format
msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
"selected package is located on another CD-ROM, DrakX will eject the current\n"
"CD and ask you to insert the required one. If you do not have the requested\n"
"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
"installed."
msgstr ""
-"Инсталацията на Mandrivalinux е разположена на няколко CDROM-а. DrakX\n"
+"Инсталацията на Mandriva Linux е разположена на няколко CDROM-а. DrakX\n"
"знае дали избран пакет не се намира на друг CDROM,така че ще извади "
"текущото\n"
"CD и ще ви остави да вкарате това, от което има нужда."
@@ -3772,11 +3772,12 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
"simpler to manage, they have been placed into groups of similar\n"
"applications.\n"
"\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
"match applications from the various categories, so a ``Workstation''\n"
"installation can still have applications from the ``Server'' category\n"
"installed.\n"
@@ -3828,7 +3829,7 @@ msgid ""
"megabytes."
msgstr ""
"Сега е моментът да определите кои програми искате да бъдат инсталирани на\n"
-"системата ви. В Mandrivalinux дистрибуцията има хиляди пакети, но не е\n"
+"системата ви. В Mandriva Linux дистрибуцията има хиляди пакети, но не е\n"
"задължително да ги знаете наизуст.\n"
"\n"
"Ако извършвате стандартна инстлация от CDROM, първо ще бъдете попитани кои\n"
@@ -3924,10 +3925,10 @@ msgid ""
"!! If a server package has been selected, either because you specifically\n"
"chose the individual package or because it was part of a group of packages,\n"
"you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux will automatically start any installed\n"
"services at boot time. Even if they are safe and have no known issues at\n"
"the time the distribution was shipped, it is entirely possible that\n"
-"security holes were discovered after this version of Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
"finalized. If you do not know what a particular service is supposed to do "
"or\n"
"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3963,10 +3964,11 @@ msgstr ""
"\n"
"!! Ако е избран сървърен пакет, било то умишлено или защото е част от цяла\n"
"група, ще бъдете помолени за потвърждение, че наистина искате този сървър\n"
-"да бъде инсталиран. В Mandrivalinux, всички сървъри тръгват по подразбиране\n"
+"да бъде инсталиран. В Mandriva Linux, всички сървъри тръгват по "
+"подразбиране\n"
"при зареждане.Даже ако са сигурни и нямат известни проблеми, когато\n"
"дистрибуцията се разпространява, може да се случи така, че да се появят\n"
-"дупки в сигурността, след като версията на Mandrivalinux е завършена. Ако\n"
+"дупки в сигурността, след като версията на Mandriva Linux е завършена. Ако\n"
"не знаете за какво служи определена услуга или защо е инсталирана, цъкнете\n"
"\"Не\". С цъкане на \"Да\" ще инсталирате изброени услуги и те ще бъдат\n"
"стартирани автоматично по подразбиране. !!\n"
@@ -4090,7 +4092,7 @@ msgstr ""
msgid ""
"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
"on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
"\n"
"You'll see a list of different parameters to change to get an optimal\n"
"graphical display.\n"
@@ -4193,12 +4195,12 @@ msgstr ""
#: help.pm:316
#, fuzzy, c-format
msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\n"
"operating system on your hard drive. If your hard drive is empty or if an\n"
"existing operating system is using all the available space you will have to\n"
"partition the drive. Basically, partitioning a hard drive means to\n"
"logically divide it to create the space needed to install your new\n"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
"\n"
"Because the process of partitioning a hard drive is usually irreversible\n"
"and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4225,7 +4227,7 @@ msgid ""
"FAT or NTFS partition. Resizing can be performed without the loss of any\n"
"data, provided you've previously defragmented the Windows partition.\n"
"Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
"the same computer.\n"
"\n"
" Before choosing this option, please understand that after this\n"
@@ -4234,7 +4236,8 @@ msgid ""
"to store your data or to install new software.\n"
"\n"
" * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
"this option. Be careful, because you will not be able to undo this "
"operation\n"
"after you confirm.\n"
@@ -4256,12 +4259,12 @@ msgid ""
msgstr ""
"В този момент трябва изберете къде на твърдия си диска да инсталирате "
"вашата\n"
-"Mandrivalinux операционна система. Ако твърдият ви диск е празен или друга\n"
+"Mandriva Linux операционна система. Ако твърдият ви диск е празен или друга\n"
"операционна система използва цялото пространство, ще трябва да го "
"разделите.\n"
"Казано простичко, разделянето на твърдия диск се състои в логическо "
"разделяне\n"
-"цел да се създаде място за инсталация на новата Mandrivalinux система.\n"
+"цел да се създаде място за инсталация на новата Mandriva Linux система.\n"
"\n"
"Тъй като процесът на разделяне обикновено е необратим, разделянето може да\n"
"изглежда плашещ и стряскащ, ако сте неопитен потребител. Слава Богу, има\n"
@@ -4270,7 +4273,7 @@ msgstr ""
"с ръководството и не бързайте.\n"
"\n"
"Ако пускате инсталацията в Експертен режим, ще бъдете въведени в DiskDrake,\n"
-"разделящия инструмент на Mandrivalinux, който ви позволява да донастроите\n"
+"разделящия инструмент на Mandriva Linux, който ви позволява да донастроите\n"
"дяловете си. Вижте главата DiskDrake от ръководството. От инсталационния\n"
"интерфейс можете да използвате магьосниците, като натиснете бутона\n"
"\"Магьосник\" на диалога.\n"
@@ -4298,7 +4301,7 @@ msgstr ""
"решенията \"Изтрий целия диск\" или \"Екпертен режим\") или да промените\n"
"големината на Microsoft Windows дяла. Промяната на големината може да бъде\n"
"извършена без загуба на данни. Това решение се препоръчва, ако искате\n"
-"едновременно Mandrivalinux и Microsoft Windows на един и същи компютър.\n"
+"едновременно Mandriva Linux и Microsoft Windows на един и същи компютър.\n"
"\n"
" Преди да изберете тази опция, моля, разберете, че след тази процедура,\n"
"големината на Microsoft Windows дяла ще бъде по-малка, отколкото преди "
@@ -4308,7 +4311,7 @@ msgstr ""
"инсталира на нов софтуер.\n"
"\n"
" * \"%s\": ако искате да изтриете всички данни и дялове, които\n"
-"съществуват на вашия твърд диск и да ги замените с новата Mandrivalinux\n"
+"съществуват на вашия твърд диск и да ги замените с новата Mandriva Linux\n"
"система, изберете тази опция. Бъдете внимателни с това решения, защото няма\n"
"да можете да върнете обратно избора си, след като потвърдите.\n"
"\n"
@@ -4467,7 +4470,7 @@ msgid ""
"Click on \"%s\" when you're ready to format the partitions.\n"
"\n"
"Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
"\n"
"Click on \"%s\" if you wish to select partitions which will be checked for\n"
"bad blocks on the disk."
@@ -4497,7 +4500,7 @@ msgstr ""
"\n"
"Цъкнете \"Отказ\", ако искате да изберете други дялове за инсталация на "
"новата\n"
-"си Mandrivalinux операционна система.\n"
+"си Mandriva Linux операционна система.\n"
"\n"
"Цъкнете \"Напредничав\", ако искате да изберете дялове, които да бъдат\n"
"проверени за лоши блокове от диска."
@@ -4514,7 +4517,7 @@ msgstr "Предишен"
#: help.pm:434
#, c-format
msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
"have been updated since the initial release. Bugs may have been fixed,\n"
"security issues resolved. To allow you to benefit from these updates,\n"
"you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4543,7 +4546,7 @@ msgid ""
"generally obtained at the expense of ease of use.\n"
"\n"
"If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
"Control Center.\n"
"\n"
"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4570,7 +4573,7 @@ msgstr "Администратор по защита:"
#, fuzzy, c-format
msgid ""
"At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
"defined, either from a previous installation of GNU/Linux or by another\n"
"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
"partitions must be defined.\n"
@@ -4642,7 +4645,7 @@ msgid ""
msgstr ""
"В този момент трябва да изберете кой дялове да бъдат използвани за "
"инсталация\n"
-"на вашата Mandrivalinux система. Ако дяловете вече са определени, дали от\n"
+"на вашата Mandriva Linux система. Ако дяловете вече са определени, дали от\n"
"предишна инсталация на GNU/Linux или от друг инструмент за разделяне, "
"можете\n"
"да използвате съществуващите далове. В противен случай трябва да определите\n"
@@ -4722,7 +4725,7 @@ msgstr "Премини в нормален/експертен режим"
msgid ""
"More than one Microsoft partition has been detected on your hard drive.\n"
"Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
"\n"
"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
"\"Capacity\".\n"
@@ -4753,7 +4756,7 @@ msgstr ""
"Беше засечен повече от един Microsoft Windows дял\n"
"на твърдия ви диска. Изберете този, чиято дължина искате да промените, за "
"да\n"
-"инсталирате Mandrivalinux операционна система.\n"
+"инсталирате Mandriva Linux операционна система.\n"
"\n"
"\n"
"За информация, всеки дял е изброен както следва: \"Linux име\", \"Windows име"
@@ -4801,7 +4804,7 @@ msgid ""
"found on your machine.\n"
"\n"
"DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
"\n"
" * \"%s\". For the most part, this completely wipes out the old system.\n"
"However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4810,13 +4813,14 @@ msgid ""
"the file system, you should use this option.\n"
"\n"
" * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux system. Your current "
+"partitioning\n"
"scheme and user data will not be altered. Most of the other configuration\n"
"steps remain available and are similar to a standard installation.\n"
"\n"
-"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
msgstr ""
#: help.pm:591
@@ -4878,7 +4882,8 @@ msgid ""
"\n"
"About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
"cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 "
+"will\n"
"depend on the user's choices:\n"
"\n"
" * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5060,7 +5065,7 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
"the printing systems is best suited to particular types of configuration.\n"
"\n"
" * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5081,7 +5086,7 @@ msgid ""
"options and for managing the printer.\n"
"\n"
"If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
"Control Center and clicking on the \"%s\" button."
msgstr ""
"Дойде времето да изберете система за печат за вашия компютър.Другите\n"
@@ -5210,7 +5215,8 @@ msgid ""
"\n"
" * \"%s\": if you wish to configure your Internet or local network access,\n"
"you can do so now. Refer to the printed documentation or use the\n"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to "
+"benefit\n"
"from full in-line help.\n"
"\n"
" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5227,7 +5233,7 @@ msgid ""
" * \"%s\": if you wish to change your bootloader configuration, click this\n"
"button. This should be reserved to advanced users. Refer to the printed\n"
"documentation or the in-line help about bootloader configuration in the\n"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
"\n"
" * \"%s\": through this entry you can fine tune which services will be run\n"
"on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5289,11 +5295,11 @@ msgstr "Услуги"
#, fuzzy, c-format
msgid ""
"Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
"and will not be recoverable!"
msgstr ""
"Изберете твърдия диск, който искате да изтриете, за да\n"
-"инсталирам новия ви Mandrivalinux дял. Внимание, всички данни на него ще "
+"инсталирам новия ви Mandriva Linux дял. Внимание, всички данни на него ще "
"бъдат загубени\n"
"и няма да могат да се възстановят."
@@ -5645,7 +5651,7 @@ msgstr "Изчислява свободното място на Windows дял"
#, c-format
msgid ""
"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
"installation."
msgstr ""
"Вашият Windows дял е много фрагментиран, моля първо стартирайте ''defrag''"
@@ -5759,13 +5765,13 @@ msgstr "Изключване на мрежата"
msgid ""
"Introduction\n"
"\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
"shall be called the \"Software Products\" hereafter. The Software Products "
"include, but are not \n"
"restricted to, the set of programs, methods, rules and documentation related "
"to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
"\n"
"\n"
"1. License Agreement\n"
@@ -5819,7 +5825,7 @@ msgid ""
"loss) arising out \n"
"of the possession and use of software components or arising out of "
"downloading software components \n"
-"from one of Mandrivalinux sites which are prohibited or restricted in some "
+"from one of Mandriva Linux sites which are prohibited or restricted in some "
"countries by local laws.\n"
"This limited liability applies to, but is not restricted to, the strong "
"cryptography components \n"
@@ -5856,7 +5862,7 @@ msgid ""
"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
"as a whole or in \n"
"parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
"Mandriva S.A. \n"
"\n"
"\n"
@@ -5877,13 +5883,13 @@ msgid ""
msgstr ""
"Въведение\n"
"\n"
-"Операционната система и различните компоненти достъпни в Mandrivalinux "
+"Операционната система и различните компоненти достъпни в Mandriva Linux "
"дистрибуцията по-долу ще се\n"
"наричат \"Софтуерен Продукти\". Софтуерните Продукти включват, но не се "
"ограничават само до, набора\n"
"програми, методи, правила и документация отнасяща се до операционната "
"система и различните\n"
-"компоненти на Mandrivalinux дистрибуцията.\n"
+"компоненти на Mandriva Linux дистрибуцията.\n"
"\n"
"\n"
"1. Лицензионен договор\n"
@@ -5934,7 +5940,7 @@ msgstr ""
"съдебно решение или каквато и да е друга произлизащи от това загуби) "
"произтичащи от притежаването\n"
"и употребата на софтуерни компоненти и от изтеглянето на софтуерни "
-"компоненти от сайтовете на Mandrivalinux,\n"
+"компоненти от сайтовете на Mandriva Linux,\n"
"които са забранени в някои страни от местното законодателство.\n"
"Тази ограничена отговорност се отнася до, но не само за, мощните "
"криптографски компоненти включени\n"
@@ -5971,7 +5977,7 @@ msgstr ""
"Mandriva S.A. запазва правото си да модифицира и пригодява Софтуерния "
"Продукт, като цяло или на\n"
"части, по всякакъв начин и с всякакви цели.\n"
-"\"Mandriva\", \"Mandrivalinux\" и свързаните логота са запазена марка на "
+"\"Mandriva\", \"Mandriva Linux\" и свързаните логота са запазена марка на "
"Mandriva S.A.\n"
"\n"
"\n"
@@ -6076,8 +6082,8 @@ msgid ""
"Remove the boot media and press return to reboot.\n"
"\n"
"\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
"consult the Errata available from:\n"
"\n"
"\n"
@@ -6085,13 +6091,13 @@ msgid ""
"\n"
"\n"
"Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
msgstr ""
"Поздравления, инсталацията е преключена.\n"
"Премахнете стартовото устройство и натисене Enter за да рестартирайте.\n"
"\n"
"\n"
-"За информация относно поправки, на тази версия на Mandrivalinux,\n"
+"За информация относно поправки, на тази версия на Mandriva Linux,\n"
"се консултирайте с Errata, на адрес : \n"
"\n"
"\n"
@@ -6099,13 +6105,13 @@ msgstr ""
"\n"
"\n"
"Информация за настройване на системата ви можете да намерите в\n"
-"слединсталационната глава от Official Mandrivalinux User's Guide."
+"слединсталационната глава от Official Mandriva Linux User's Guide."
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
#: install_messages.pm:144
#, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
#: install_steps.pm:246
#, c-format
@@ -6134,12 +6140,12 @@ msgstr "Навлизам в етап `%s'\n"
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
"this,\n"
"press `F1' when booting on CDROM, then enter `text'."
msgstr ""
"Вашата система е с малки ресурси. Може да имате проблеми с инсталирането\n"
-"на Mandrivalinux. Ако се появи проблем опитайте с текстовата инсалация. "
+"на Mandriva Linux. Ако се появи проблем опитайте с текстовата инсалация. "
"Зацелта,\n"
"натиснете 'F1', когато стартирате от CDROM и въведете 'теьт'."
@@ -6669,9 +6675,9 @@ msgstr ""
#: install_steps_interactive.pm:821
#, c-format
msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
-"Свързване с Mandrivalinux web сайт за получаване на списъка с налични "
+"Свързване с Mandriva Linux web сайт за получаване на списъка с налични "
"огледални сървъри..."
#: install_steps_interactive.pm:840
@@ -6892,8 +6898,8 @@ msgstr ""
#: install_steps_newt.pm:20
#, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Инсталация на Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Инсталация на Mandriva Linux %s"
#. -PO: This string must fit in a 80-char wide text screen
#: install_steps_newt.pm:34
@@ -9473,13 +9479,13 @@ msgstr ""
msgid ""
"drakfirewall configurator\n"
"\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
"For a powerful and dedicated firewall solution, please look to the\n"
"specialized MandrakeSecurity Firewall distribution."
msgstr ""
"Настройчик за малка защитна стена\n"
"\n"
-"Това настройва персонална защитна стена за тази Mandrivalinux машина.\n"
+"Това настройва персонална защитна стена за тази Mandriva Linux машина.\n"
"За мощно постветено на защитата решение, моле, погледнете специализираната\n"
"MandrakeSecurity Firewall дистрибуция."
@@ -13268,8 +13274,8 @@ msgstr ""
#: printer/printerdrake.pm:3929
#, c-format
msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
"\n"
msgstr ""
@@ -15064,18 +15070,18 @@ msgstr "Стоп"
#: share/advertising/01.pl:13
#, c-format
-msgid "<b>What is Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
msgstr ""
#: share/advertising/01.pl:15
#, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Добре дошли в <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Добре дошли в <b>Mandriva Linux</b>!"
#: share/advertising/01.pl:17
#, c-format
msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"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."
@@ -15084,7 +15090,7 @@ msgstr ""
#: share/advertising/01.pl:19
#, c-format
msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"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!"
msgstr ""
@@ -15101,9 +15107,9 @@ msgstr "Добре дошли в света на Отвореният Изход
#: share/advertising/02.pl:17
#, c-format
msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"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 Mandrivalinux "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
"contributors."
msgstr ""
@@ -15122,8 +15128,8 @@ msgstr ""
#: share/advertising/03.pl:15
#, c-format
msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
msgstr ""
#: share/advertising/03.pl:17
@@ -15149,17 +15155,17 @@ msgstr ""
#: share/advertising/04.pl:15
#, c-format
msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"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 Mandrivalinux world."
+"<b>key role</b> in the Mandriva Linux world."
msgstr ""
#: share/advertising/04.pl:17
#, c-format
msgid ""
"To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"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."
msgstr ""
@@ -15171,7 +15177,7 @@ msgstr ""
#: share/advertising/05.pl:17
#, c-format
msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
"version that Mandriva wants to keep <b>available to everyone</b>."
msgstr ""
@@ -15209,7 +15215,7 @@ msgstr ""
#: share/advertising/06.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
msgstr ""
#: share/advertising/06.pl:17
@@ -15228,7 +15234,7 @@ msgstr ""
#: share/advertising/07.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
msgstr ""
#: share/advertising/07.pl:17
@@ -15246,7 +15252,7 @@ msgstr ""
#: share/advertising/08.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
msgstr ""
#: share/advertising/08.pl:17
@@ -15261,17 +15267,17 @@ msgstr ""
#: share/advertising/09.pl:13
#, fuzzy, c-format
msgid "<b>Mandriva Products</b>"
-msgstr "Контролен център на Mandrivalinux"
+msgstr "Контролен център на Mandriva Linux"
#: share/advertising/09.pl:15
#, c-format
msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
msgstr ""
#: share/advertising/09.pl:17
#, c-format
-msgid "The Mandrivalinux products are:"
+msgid "The Mandriva Linux products are:"
msgstr ""
#: share/advertising/09.pl:18
@@ -15292,7 +15298,7 @@ msgstr ""
#: share/advertising/09.pl:21
#, c-format
msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
"the most of your 64-bit processor."
msgstr ""
@@ -15304,21 +15310,21 @@ msgstr ""
#: share/advertising/10.pl:17
#, c-format
msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"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:"
msgstr ""
#: share/advertising/10.pl:18
#, c-format
msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
"bootable CD-ROM."
msgstr ""
#: share/advertising/10.pl:19
#, c-format
msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
"ultra-compact “LaCie Mobile Hard Drive”."
msgstr ""
@@ -15336,17 +15342,19 @@ msgstr ""
#: share/advertising/11.pl:16
#, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
msgstr ""
#: share/advertising/11.pl:17
#, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
msgstr ""
#: share/advertising/11.pl:18
#, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
msgstr ""
#: share/advertising/12.pl:13
@@ -15522,7 +15530,7 @@ msgstr ""
#: share/advertising/18.pl:15
#, c-format
msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
"<b>all of your tasks</b>:"
msgstr ""
@@ -15757,14 +15765,14 @@ msgstr ""
#: share/advertising/25.pl:13
#, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Контролен център на Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Контролен център на Mandriva Linux</b>"
#: share/advertising/25.pl:15
#, c-format
msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
"your computer."
msgstr ""
@@ -15787,15 +15795,15 @@ msgid ""
"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 "
+"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!"
msgstr ""
#: share/advertising/27.pl:13
#, fuzzy, c-format
msgid "<b>Online Store</b>"
-msgstr "Контролен център на Mandrivalinux"
+msgstr "Контролен център на Mandriva Linux"
#: share/advertising/27.pl:15
#, c-format
@@ -15818,7 +15826,7 @@ msgstr ""
#: share/advertising/27.pl:21
#, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
msgstr ""
#: share/advertising/28.pl:15
@@ -15829,7 +15837,7 @@ msgstr "<b>Мандрейклинукс Клуб</b>"
#: share/advertising/28.pl:17
#, c-format
msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
"product.."
msgstr ""
@@ -15843,7 +15851,7 @@ msgstr ""
#, c-format
msgid ""
"\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
msgstr ""
#: share/advertising/28.pl:21
@@ -15855,14 +15863,14 @@ msgstr ""
#: share/advertising/28.pl:22
#, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
msgstr ""
#: share/advertising/28.pl:23
#, c-format
msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
msgstr ""
#: share/advertising/29.pl:13
@@ -15881,7 +15889,7 @@ msgstr ""
#, c-format
msgid ""
"Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
msgstr ""
#: share/advertising/29.pl:18
@@ -15904,7 +15912,7 @@ msgstr ""
#: share/advertising/29.pl:21
#, c-format
msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
msgstr ""
#: share/advertising/30.pl:13
@@ -15916,21 +15924,21 @@ msgstr "<b>МандрейкЕксперт</b>"
#, c-format
msgid ""
"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
msgstr ""
#: share/advertising/30.pl:17
#, c-format
msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
"a lot of time."
msgstr ""
#: share/advertising/30.pl:19
#, c-format
msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
msgstr ""
#: share/compssUsers.pl:25
@@ -16215,7 +16223,7 @@ msgstr "Webmin Обслужване"
#: share/compssUsers.pl:187
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
-msgstr "Конфигурация на Терминален Сървър в Mandrivalinux"
+msgstr "Конфигурация на Терминален Сървър в Mandriva Linux"
#: share/compssUsers.pl:191
#, fuzzy, c-format
@@ -16230,7 +16238,7 @@ msgstr ""
#: share/compssUsers.pl:196
#, fuzzy, c-format
msgid "Mandriva Wizards"
-msgstr "Контролен център на Mandrivalinux"
+msgstr "Контролен център на Mandriva Linux"
#: share/compssUsers.pl:197
#, fuzzy, c-format
@@ -16288,8 +16296,8 @@ msgid ""
"\n"
"OPTIONS:\n"
" --help - print this help message.\n"
-" --report - program should be one of mandrakelinux tools\n"
-" --incident - program should be one of mandrakelinux tools"
+" --report - program should be one of Mandriva Linux tools\n"
+" --incident - program should be one of Mandriva Linux tools"
msgstr ""
#: standalone.pm:63
@@ -16325,7 +16333,7 @@ msgstr ""
#, c-format
msgid ""
"[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
"--enable : enable MTS\n"
"--disable : disable MTS\n"
"--start : start MTS\n"
@@ -16448,7 +16456,7 @@ msgstr ""
#: standalone/drakTermServ:211 standalone/drakTermServ:214
#, fuzzy, c-format
msgid "Terminal Server Configuration"
-msgstr "Конфигурация на Терминален Сървър в Mandrivalinux"
+msgstr "Конфигурация на Терминален Сървър в Mandriva Linux"
#: standalone/drakTermServ:220
#, c-format
@@ -16593,7 +16601,7 @@ msgstr ""
#: standalone/drakTermServ:509
#, fuzzy, c-format
msgid "Terminal Server Overview"
-msgstr "Конфигурация на Терминален Сървър в Mandrivalinux"
+msgstr "Конфигурация на Терминален Сървър в Mandriva Linux"
#: standalone/drakTermServ:510
#, c-format
@@ -18872,13 +18880,13 @@ msgstr ""
#: standalone/drakbug:41
#, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Контролен център на Mandrivalinux"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Контролен център на Mandriva Linux"
#: standalone/drakbug:46
#, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Контролен център на Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Контролен център на Mandriva Linux"
#: standalone/drakbug:48
#, c-format
@@ -19356,14 +19364,14 @@ msgstr "Пуснат при стартиране"
#, c-format
msgid ""
"This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
msgstr ""
#: standalone/drakconnect:1009 standalone/net_applet:61
#, fuzzy, c-format
msgid ""
"You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
msgstr ""
"Нямате Internet връзка.\n"
"Създайте такава, като цъкнете на 'Настрой'"
@@ -19416,7 +19424,7 @@ msgstr ""
#: standalone/drakedm:36
#, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
msgstr ""
#: standalone/drakedm:37
@@ -19711,9 +19719,9 @@ msgid ""
"\n"
" DUPONT Sebastien (original version)\n"
"\n"
-" CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+" CHAUMETTE Damien <dchaumette@mandriva.com>\n"
"\n"
-" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+" VIGNAUD Thierry <tvignaud@mandriva.com>"
msgstr ""
#: standalone/drakfont:520
@@ -20218,8 +20226,8 @@ msgstr ""
#: standalone/drakhelp:36
#, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Контролен център на Mandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Контролен център на Mandriva Linux"
#: standalone/drakhelp:36
#, c-format
@@ -20810,7 +20818,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
#: standalone/draksound:57
@@ -22427,7 +22435,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
#: standalone/harddrake2:24
@@ -23118,13 +23126,13 @@ msgid ""
"This is HardDrake, a %s hardware configuration tool.\n"
"<span foreground=\"royalblue3\">Version:</span> %s\n"
"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
"\n"
msgstr ""
"Това е HardDrake, хардуерен конфигурационен инструмент на %s.\n"
"<span foreground=\"royalblue3\">Версия:</span> %s\n"
"<span foreground=\"royalblue3\">Автор:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
"\n"
#: standalone/harddrake2:243
@@ -23232,7 +23240,7 @@ msgstr "Промените са запазени, но за да бъдат еф
#: standalone/logdrake:50
#, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
msgstr "Самостоятелни инструменти"
#: standalone/logdrake:51
@@ -23741,10 +23749,10 @@ msgstr "Връзката е установена."
#, c-format
msgid ""
"Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
msgstr ""
"Връзката пропадна.\n"
-"Проверете си конфигурацията в Контролен център на Mandrivalinux."
+"Проверете си конфигурацията в Контролен център на Mandriva Linux."
#: standalone/net_monitor:341
#, c-format
@@ -23979,7 +23987,7 @@ msgstr ""
#: standalone/scannerdrake:101
#, fuzzy, c-format
msgid "The %s is not supported by this version of %s."
-msgstr "%s не се подържа от тази версия на Mandrivalinux."
+msgstr "%s не се подържа от тази версия на Mandriva Linux."
#: standalone/scannerdrake:104
#, c-format
@@ -24019,7 +24027,7 @@ msgstr ""
#: standalone/scannerdrake:144
#, fuzzy, c-format
msgid "The %s is not supported under Linux."
-msgstr "%s не се подържа от тази версия на Mandrivalinux."
+msgstr "%s не се подържа от тази версия на Mandriva Linux."
#: standalone/scannerdrake:171 standalone/scannerdrake:185
#, c-format
@@ -24737,16 +24745,17 @@ msgstr "Инсталацията провалена"
#~ msgstr "Грешка при отваряне на %s за запис: %s"
#~ msgid ""
-#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandriva Linux hardware configuration tool.\n"
#~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
#~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
#~ "\n"
#~ msgstr ""
-#~ "Това е HardDrake, хардуерен конфигурационен инструмент на Mandrivalinux.\n"
+#~ "Това е HardDrake, хардуерен конфигурационен инструмент на Mandriva "
+#~ "Linux.\n"
#~ "<span foreground=\"royalblue3\">Версия:</span> %s\n"
#~ "<span foreground=\"royalblue3\">Автор:</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
#~ "\n"
#, fuzzy
@@ -25243,7 +25252,7 @@ msgstr "Инсталацията провалена"
#~ "Verify your configuration in the Mandrake Control Center."
#~ msgstr ""
#~ "Връзката пропадна.\n"
-#~ "Проверете си конфигурацията в Контролен център на Mandrivalinux."
+#~ "Проверете си конфигурацията в Контролен център на Mandriva Linux."
#~ msgid "The package %s is needed. Install it?"
#~ msgstr "Пакет %s е необходим. Да го инсталирам?"
diff --git a/perl-install/share/po/bn.po b/perl-install/share/po/bn.po
index c9b9fb87f..d2b62ae46 100644
--- a/perl-install/share/po/bn.po
+++ b/perl-install/share/po/bn.po
@@ -1312,11 +1312,11 @@ msgstr "পছন্দনীয় ভাষা"
#: any.pm:733
#, c-format
msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux can support multiple languages. Select\n"
"the languages you would like to install. They will be available\n"
"when your installation is complete and you restart your system."
msgstr ""
-"Mandrivalinux বাভিন্ন ভাষা সমর্থন করে।\n"
+"Mandriva Linux বাভিন্ন ভাষা সমর্থন করে।\n"
"আপনি যেই ভাষাটি ইনস্টল করতে চান তা পছন্দ করুন।\n"
"ইনস্টল শেষে রি-স্টার্ট করার পরে সেই ভাষাগুলি উপলব্ধ হবে।"
@@ -3733,7 +3733,7 @@ msgstr "রেডিও সাপোর্ট সক্রিয় করো"
#, c-format
msgid ""
"Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
"terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
"button will reboot your computer."
msgstr ""
@@ -3924,7 +3924,7 @@ msgstr ""
#: help.pm:85
#, c-format
msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
"selected package is located on another CD-ROM, DrakX will eject the current\n"
"CD and ask you to insert the required one. If you do not have the requested\n"
"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3942,11 +3942,12 @@ msgstr ""
#, c-format
msgid ""
"It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
"simpler to manage, they have been placed into groups of similar\n"
"applications.\n"
"\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
"match applications from the various categories, so a ``Workstation''\n"
"installation can still have applications from the ``Server'' category\n"
"installed.\n"
@@ -3998,11 +3999,11 @@ msgid ""
"megabytes."
msgstr ""
"এখন আপনাকে নির্বাচন করতে হবে আপনি কোন কোন প্রোগ্রাম সিস্টেমে ইনস্টল করতে চান।\n"
-"Mandrivalinux এর জন্য কয়েক হাজার প্যাকেজ রয়েছে, এবং ব্যাবস্থাপনার সুবিধার্থে "
+"Mandriva Linux এর জন্য কয়েক হাজার প্যাকেজ রয়েছে, এবং ব্যাবস্থাপনার সুবিধার্থে "
"সেগুলোকে\n"
"অ্যাপ্লিকেশনের ধরন অনুযায়ী ভাগ করা হয়েছে।\n"
"\n"
-"Mandrivalinux সব প্যাকেজগ্রুপসমূহ চারটি শ্রেণীতে ভাগ করে। আপনি বিভিন্ন শ্রেণীর\n"
+"Mandriva Linux সব প্যাকেজগ্রুপসমূহ চারটি শ্রেণীতে ভাগ করে। আপনি বিভিন্ন শ্রেণীর\n"
"অ্যাপ্লিকেশনমিলিয়ে ও মিশিয়ে ইনস্টল করতে পারেন, যেমন একটি ``Workstation''\n"
"ইনস্টলেশনে আপনি ''Server'' শ্রেণী থেকে অ্যাপ্লিকেশন ইনস্টল\n"
"করতে পারেন।\n"
@@ -4110,10 +4111,10 @@ msgid ""
"!! If a server package has been selected, either because you specifically\n"
"chose the individual package or because it was part of a group of packages,\n"
"you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux will automatically start any installed\n"
"services at boot time. Even if they are safe and have no known issues at\n"
"the time the distribution was shipped, it is entirely possible that\n"
-"security holes were discovered after this version of Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
"finalized. If you do not know what a particular service is supposed to do "
"or\n"
"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4252,7 +4253,7 @@ msgstr ""
msgid ""
"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
"on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
"\n"
"You'll see a list of different parameters to change to get an optimal\n"
"graphical display.\n"
@@ -4372,12 +4373,12 @@ msgstr ""
#: help.pm:316
#, c-format
msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\n"
"operating system on your hard drive. If your hard drive is empty or if an\n"
"existing operating system is using all the available space you will have to\n"
"partition the drive. Basically, partitioning a hard drive means to\n"
"logically divide it to create the space needed to install your new\n"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
"\n"
"Because the process of partitioning a hard drive is usually irreversible\n"
"and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4404,7 +4405,7 @@ msgid ""
"FAT or NTFS partition. Resizing can be performed without the loss of any\n"
"data, provided you've previously defragmented the Windows partition.\n"
"Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
"the same computer.\n"
"\n"
" Before choosing this option, please understand that after this\n"
@@ -4413,7 +4414,8 @@ msgid ""
"to store your data or to install new software.\n"
"\n"
" * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
"this option. Be careful, because you will not be able to undo this "
"operation\n"
"after you confirm.\n"
@@ -4543,7 +4545,7 @@ msgid ""
"Click on \"%s\" when you're ready to format the partitions.\n"
"\n"
"Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
"\n"
"Click on \"%s\" if you wish to select partitions which will be checked for\n"
"bad blocks on the disk."
@@ -4562,7 +4564,7 @@ msgstr ""
"\n"
"পার্টিশন ফরম্যাট শুরু করতে \"%s\" চাপুন।\n"
"\n"
-"আপনার নতুন Mandrivalinux অপারেটিং সিস্টেম ইনস্টেশনের জন্য আপনি যদি অন্য একটি "
+"আপনার নতুন Mandriva Linux অপারেটিং সিস্টেম ইনস্টেশনের জন্য আপনি যদি অন্য একটি "
"পার্টিশন নির্বাচন করতে, তবে \"%s\" ক্লিক করুন।\n"
"\n"
"যদি আপনি পার্টিশনের জন্য ডিস্কের খারাপ ব্লক সনাক্ত করাতে চান তাহলে \"%s\" ক্লিক "
@@ -4582,7 +4584,7 @@ msgstr "পূর্ববর্তী"
#: help.pm:434
#, c-format
msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
"have been updated since the initial release. Bugs may have been fixed,\n"
"security issues resolved. To allow you to benefit from these updates,\n"
"you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4594,7 +4596,7 @@ msgid ""
"will appear: review the selection, and press \"%s\" to retrieve and install\n"
"the selected package(s), or \"%s\" to abort."
msgstr ""
-"আপনি যখন Mandrivalinux ইনস্টল করবেন, সম্ভবত প্রথম রিলিজ থেকে কিছু\n"
+"আপনি যখন Mandriva Linux ইনস্টল করবেন, সম্ভবত প্রথম রিলিজ থেকে কিছু\n"
"প্যাকেজ আপডেট হয়ে গেছে। কোন সাধারন বা নিরাপত্তা ত্রুটি সমাধান করা হয়েছে।\n"
"আপনাকে এই সুবিধাগুলি দেয়ার লক্ষ্যে এই আপডেটগুলো ইন্টারনেট থেকে ডাউনলোড\n"
"করার সুযোগ দেয়া হয়েছে। যদি আপনার সক্রিয় ইন্টারনেট সংযোগ থাকে, \"%s\" চেক\n"
@@ -4624,7 +4626,7 @@ msgid ""
"generally obtained at the expense of ease of use.\n"
"\n"
"If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
"Control Center.\n"
"\n"
"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4636,7 +4638,7 @@ msgstr ""
"হয়। নিরাপত্তা যত বেশী, ব্যবহারের স্বাচ্ছন্দ্য তত কমে যায়।\n"
"\n"
"আপনি যদি নিশ্চিত না হন কোন অপশনটি রাখবেন তবে ডিফল্ট অপশনটিই রাখুন।\n"
-"পরবর্তীতে আপনি এটি draksec টুল (যেটি Mandrivalinux নিয়ন্ত্রন কেন্দ্রের একটি অংশ)\n"
+"পরবর্তীতে আপনি এটি draksec টুল (যেটি Mandriva Linux নিয়ন্ত্রন কেন্দ্রের একটি অংশ)\n"
"দিয়ে পরিবর্তন করতে পারবেন।\n"
"\n"
"\"%s\" ক্ষেত্রটিতে যিনি নিরাপত্তার দায়িত্বে নিয়োজিত তার ই-মেইল অ্যাড্রেস দিন।\n"
@@ -4652,7 +4654,7 @@ msgstr "সিকিউরিটি এ্যডমিনিস্ট্রে�
#, c-format
msgid ""
"At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
"defined, either from a previous installation of GNU/Linux or by another\n"
"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
"partitions must be defined.\n"
@@ -4722,7 +4724,7 @@ msgid ""
"may find it a useful place to store a spare kernel and ramdisk images for\n"
"emergency boot situations."
msgstr ""
-"এই সময়ে আপনাকে Mandrivalinux যে পার্টিশনে ইনস্টল হবে তা নির্বাচন\n"
+"এই সময়ে আপনাকে Mandriva Linux যে পার্টিশনে ইনস্টল হবে তা নির্বাচন\n"
"করতে হবে। যদি আগে থেকেই পার্টিশন তৈরী থাকে, (GNU/Linux এর পুর্বের\n"
"কোন ইনস্টলেশনের কারনে বা অন্য কোন পার্টিশন টুল দিয়ে তৈরী করা) আপনি\n"
"সেগুলো ব্যবহার করতে পারেন। অন্যথায় হার্ডড্রাইভ পার্টিশন তৈরী করতে হবে।\n"
@@ -4805,7 +4807,7 @@ msgstr "সাধারণ/দক্ষ মোডের মধ্যে পর�
msgid ""
"More than one Microsoft partition has been detected on your hard drive.\n"
"Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
"\n"
"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
"\"Capacity\".\n"
@@ -4854,7 +4856,7 @@ msgid ""
"found on your machine.\n"
"\n"
"DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
"\n"
" * \"%s\". For the most part, this completely wipes out the old system.\n"
"However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4863,13 +4865,14 @@ msgid ""
"the file system, you should use this option.\n"
"\n"
" * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux system. Your current "
+"partitioning\n"
"scheme and user data will not be altered. Most of the other configuration\n"
"steps remain available and are similar to a standard installation.\n"
"\n"
-"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
msgstr ""
# সাম
@@ -4928,7 +4931,8 @@ msgid ""
"\n"
"About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
"cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 "
+"will\n"
"depend on the user's choices:\n"
"\n"
" * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5089,7 +5093,7 @@ msgstr ""
#, c-format
msgid ""
"Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
"the printing systems is best suited to particular types of configuration.\n"
"\n"
" * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5110,11 +5114,11 @@ msgid ""
"options and for managing the printer.\n"
"\n"
"If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
"Control Center and clicking on the \"%s\" button."
msgstr ""
"এখন সময় আপনার কম্পিউটারের জন্য একটি প্রিন্টিং সিস্টেম নির্বাচন করার। অনান্য\n"
-"অপারেটিং সিস্টেম আপনাকে একটি অপশন দিতে পারে কিন্তু Mandrivalinux দেবে দুটি।\n"
+"অপারেটিং সিস্টেম আপনাকে একটি অপশন দিতে পারে কিন্তু Mandriva Linux দেবে দুটি।\n"
"প্রিন্টিং সিস্টেমগুলো বিভিন্ন কনফিগারেশনের জন্য প্রযোজ্য।\n"
"\n"
" * \"%s\" -- অর্থ হচ্ছে \"প্রিন্ট করো, সারিতে রাখবেনা\". এটি নির্বাচন করুন যদি "
@@ -5141,7 +5145,7 @@ msgstr ""
"ইন্টারফেস রয়েছে।\n"
"\n"
"আপনার বাছাইকৃত প্রিন্টিং সিস্টেমটি যদি আপনার পরে পছন্দ না হয়,\n"
-"তবে আপনি Mandrivalinux নিয়ন্ত্রন কেন্দ্র থেকে PrinterDrake চালিয়ে ও \"%s\" বাটন "
+"তবে আপনি Mandriva Linux নিয়ন্ত্রন কেন্দ্র থেকে PrinterDrake চালিয়ে ও \"%s\" বাটন "
"ক্লিক\n"
"করে তা বদল করতে পারেন।"
@@ -5262,7 +5266,8 @@ msgid ""
"\n"
" * \"%s\": if you wish to configure your Internet or local network access,\n"
"you can do so now. Refer to the printed documentation or use the\n"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to "
+"benefit\n"
"from full in-line help.\n"
"\n"
" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5279,7 +5284,7 @@ msgid ""
" * \"%s\": if you wish to change your bootloader configuration, click this\n"
"button. This should be reserved to advanced users. Refer to the printed\n"
"documentation or the in-line help about bootloader configuration in the\n"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
"\n"
" * \"%s\": through this entry you can fine tune which services will be run\n"
"on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5341,7 +5346,7 @@ msgstr "সার্ভিস সমূহ"
#, c-format
msgid ""
"Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
"and will not be recoverable!"
msgstr ""
"হার্ড ড্রাইভ বেছে নিন যেটি আপনি আপনার নতুন ম্যানড্রেকলিনাক্স পার্টিশন ইনস্টল করার "
@@ -5701,7 +5706,7 @@ msgstr "আপনার উইন্ডোজের পার্টিশনে�
#, c-format
msgid ""
"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
"installation."
msgstr ""
"আপনার উইন্ডোজের পার্টিশনটি প্রচন্ড অসম। অনুগ্রহ করে আপনার কম্পিউটারটি উইন্ডোজে রি-বুট "
@@ -5818,13 +5823,13 @@ msgstr "নেটওয়ার্ককে বন্ধ করা হচ্ছে
msgid ""
"Introduction\n"
"\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
"shall be called the \"Software Products\" hereafter. The Software Products "
"include, but are not \n"
"restricted to, the set of programs, methods, rules and documentation related "
"to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
"\n"
"\n"
"1. License Agreement\n"
@@ -5878,7 +5883,7 @@ msgid ""
"loss) arising out \n"
"of the possession and use of software components or arising out of "
"downloading software components \n"
-"from one of Mandrivalinux sites which are prohibited or restricted in some "
+"from one of Mandriva Linux sites which are prohibited or restricted in some "
"countries by local laws.\n"
"This limited liability applies to, but is not restricted to, the strong "
"cryptography components \n"
@@ -5915,7 +5920,7 @@ msgid ""
"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
"as a whole or in \n"
"parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
"Mandriva S.A. \n"
"\n"
"\n"
@@ -5993,8 +5998,8 @@ msgid ""
"Remove the boot media and press return to reboot.\n"
"\n"
"\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
"consult the Errata available from:\n"
"\n"
"\n"
@@ -6002,7 +6007,7 @@ msgid ""
"\n"
"\n"
"Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
msgstr ""
"অভিনন্দন, ইনস্টলেশন পুরোপুরিভাবে হয়ে গেছে।\n"
"দ্নবুট মিডিয়া সরিয়ে ফেলুন, এবং পুনরায় চালু করার জন্য return চাপুন।\n"
@@ -6021,8 +6026,8 @@ msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
#: install_messages.pm:144
#, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
#: install_steps.pm:246
#, c-format
@@ -6051,7 +6056,7 @@ msgstr "`%s' স্টেপে প্রবেশ করছি\n"
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
"this,\n"
"press `F1' when booting on CDROM, then enter `text'."
msgstr ""
@@ -6603,8 +6608,8 @@ msgstr ""
#: install_steps_interactive.pm:821
#, c-format
msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
-msgstr "উপস্থিত মিররের তালিকার জন্য Mandrivalinux-এ সংযুক্ত করা হচ্ছে..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr "উপস্থিত মিররের তালিকার জন্য Mandriva Linux-এ সংযুক্ত করা হচ্ছে..."
#: install_steps_interactive.pm:840
#, c-format
@@ -6826,8 +6831,8 @@ msgstr ""
#: install_steps_newt.pm:20
#, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux ইনস্টলেশন %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux ইনস্টলেশন %s"
# -PO: This string must fit in a 80-char wide text screen
#. -PO: This string must fit in a 80-char wide text screen
@@ -9443,7 +9448,7 @@ msgstr "বিটTorrent"
msgid ""
"drakfirewall configurator\n"
"\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
"For a powerful and dedicated firewall solution, please look to the\n"
"specialized MandrakeSecurity Firewall distribution."
msgstr ""
@@ -13564,11 +13569,11 @@ msgstr ""
#: printer/printerdrake.pm:3929
#, c-format
msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
"\n"
msgstr ""
-"আপনার স্ক্যানারটি নেটওয়ার্ক শেয়ার করার জন্য Scannerdrake (Mandrivalinux নিয়ন্ত্রণ "
+"আপনার স্ক্যানারটি নেটওয়ার্ক শেয়ার করার জন্য Scannerdrake (Mandriva Linux নিয়ন্ত্রণ "
"কেন্দ্র হার্ডওয়্যার/স্ক্যানার) চালান।\n"
"\n"
@@ -15580,24 +15585,24 @@ msgstr "বন্ধ"
#: share/advertising/01.pl:13
#, c-format
-msgid "<b>What is Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
msgstr "<b>ম্যানড্রেককলিনাক্স কি?</b>"
#: share/advertising/01.pl:15
#, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
msgstr "<b>ম্যানড্রেককলিনাক্স</b>-এ আপনাকে স্বাগতম!"
# সাম
#: share/advertising/01.pl:17
#, c-format
msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"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."
msgstr ""
-"Mandrivalinux একটি <b>লিনাক্স ডিস্ট্রিবিউশন</b> যা গঠিত হয়েছে সিস্টেম মূল অংশ বা "
+"Mandriva Linux একটি <b>লিনাক্স ডিস্ট্রিবিউশন</b> যা গঠিত হয়েছে সিস্টেম মূল অংশ বা "
"<b>অপারেটিং সিস্টেম</b> (লিনাক্স কার্নেল এর উপর ভিত্তি করে) এবং <b>বিভিন্ন অনেক "
"অ্যাপ্লিকেশন</b> দিয়ে যা কিনা আপনার সম্ভাব্য সব চাহিদা পূরন করে।"
@@ -15605,11 +15610,11 @@ msgstr ""
#: share/advertising/01.pl:19
#, c-format
msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"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!"
msgstr ""
-"Mandrivalinux আজকের সবচেয়ে <b>ব্যবহারকারীর বন্ধুসূলভ</b> লিনাক্স ডিস্ট্রিবিউশন। এটি "
-"পৃথিবীর সবচেয়ে <b>বহুল-ব্যবহৃত</b> লিনাক্স ডিস্ট্রিবিউশনের মধ্যে অন্যতম!"
+"Mandriva Linux আজকের সবচেয়ে <b>ব্যবহারকারীর বন্ধুসূলভ</b> লিনাক্স ডিস্ট্রিবিউশন। "
+"এটি পৃথিবীর সবচেয়ে <b>বহুল-ব্যবহৃত</b> লিনাক্স ডিস্ট্রিবিউশনের মধ্যে অন্যতম!"
#: share/advertising/02.pl:13
#, c-format
@@ -15626,12 +15631,12 @@ msgstr "<b>উন্মুক্ত সোর্সের পৃথিবী</b>
#: share/advertising/02.pl:17
#, c-format
msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"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 Mandrivalinux "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
"contributors."
msgstr ""
-"Mandrivalinux উন্মুক্ত সোর্স মডেলে প্রতিশ্রুতিবদ্ধ। এর অর্থ, এই নতুন রিলিজটি "
+"Mandriva Linux উন্মুক্ত সোর্স মডেলে প্রতিশ্রুতিবদ্ধ। এর অর্থ, এই নতুন রিলিজটি "
"<b>Mandriva এর ডেভেলপমেন্ট টিম</b> এবং <b>বিশ্বব্যাপী কমিউনিটির</b> "
"<b>সহযোগিতার</b> ফসল।"
@@ -15652,8 +15657,8 @@ msgstr "<b>জি-পি-এল</b>"
#: share/advertising/03.pl:15
#, c-format
msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
msgstr ""
"ডিস্ট্রিবিউশন এবং ম্যানড্রেকলিনাক্স টুলসমূহের বেশিরভাগ সফ্‌টওয়্যার <b>General Public "
"License</b> এর অধীনে লাইসেন্সকৃত।"
@@ -15689,25 +15694,26 @@ msgstr "<b>কমিউনিটিতে যোগ দিন</b>"
#: share/advertising/04.pl:15
#, c-format
msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"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 Mandrivalinux world."
+"<b>key role</b> in the Mandriva Linux world."
msgstr ""
-"Mandrivalinux এর আছে ব্যবহারকারী ও ডেভেলপারদের <b>সবচেয়ে বড় কমিউনিটি</b> গুলোর "
-"একটি। এই কমিউনিটির কার্যক্রমও অনেক বিস্তৃত, ত্রুটি রিপোর্ট করা থেকে নতুন অ্যাপলিকেশন "
-"তৈরী পর্যন্ত। এ কমিউনিটি Mandrivalinux এর ভুবনে অপরিহার্য ভুমিকা পালন করে।"
+"Mandriva Linux এর আছে ব্যবহারকারী ও ডেভেলপারদের <b>সবচেয়ে বড় কমিউনিটি</b> "
+"গুলোর একটি। এই কমিউনিটির কার্যক্রমও অনেক বিস্তৃত, ত্রুটি রিপোর্ট করা থেকে নতুন "
+"অ্যাপলিকেশন তৈরী পর্যন্ত। এ কমিউনিটি Mandriva Linux এর ভুবনে অপরিহার্য ভুমিকা পালন "
+"করে।"
# সাম
#: share/advertising/04.pl:17
#, c-format
msgid ""
"To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"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."
msgstr ""
-"এই সক্রিয় কমিউনিটি সম্পর্কে <b>আরও জানতে</b>, দেখুন <b>www.mandrakelinux.com</b> "
-"অথবা সরাসরি <b>www.mandrakelinux.com/en/cookerdevel.php3</b> যদি আপনি "
+"এই সক্রিয় কমিউনিটি সম্পর্কে <b>আরও জানতে</b>, দেখুন <b>www.mandrivalinux.com</b> "
+"অথবা সরাসরি <b>www.mandrivalinux.com/en/cookerdevel.php3</b> যদি আপনি "
"ডেভেলপমেন্টে <b>সম্পৃক্ত</b> হতে চান।"
#: share/advertising/05.pl:15
@@ -15719,10 +15725,10 @@ msgstr "<b>ডাউনলোড সংস্করণ</b>"
#: share/advertising/05.pl:17
#, c-format
msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
"version that Mandriva wants to keep <b>available to everyone</b>."
msgstr ""
-"আপনি এখন <b>Mandrivalinux ডাউনলোড</b> ইনস্টল করছেন। এটি একটি ফ্রী ভার্সন যা "
+"আপনি এখন <b>Mandriva Linux ডাউনলোড</b> ইনস্টল করছেন। এটি একটি ফ্রী ভার্সন যা "
"কিনা Mandriva <b>সবার জন্য সহজলভ্য</b> রাখতে চায়।"
# সাম
@@ -15767,7 +15773,7 @@ msgstr "<b>আবিষ্কার করুন, আপনার প্রথ�
#: share/advertising/06.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
msgstr "আপনি এখন <b>ম্যানড্রেকলিনাস্ক আবিষ্কার</b> ইনস্টল করছেন।"
# সাম:
@@ -15792,7 +15798,7 @@ msgstr "<b>পাওয়ারপ্যাক, চূড়ান্ত লিনা
#: share/advertising/07.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
msgstr "আপনি এখন <b>ম্যানড্রেকলিনাক্স পাওয়ারপ্যাক</b> ইনস্টল করছেন।"
# সাম
@@ -15815,7 +15821,7 @@ msgstr "<b>পাওয়ারপ্যাক+, ডেস্কটপ এবং �
#: share/advertising/08.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
msgstr "আপনি এখন <b>ম্যানড্রেকলিনাক্স পাওয়ারপ্যা++</b> ইনস্টল করছেন।"
# সাম
@@ -15841,14 +15847,14 @@ msgstr "<b>Mandriva পণ্যসমূহ</b>"
#: share/advertising/09.pl:15
#, c-format
msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
msgstr "<b>ম্যানড্রেকসফ্‌ট</b> <b>ম্যানড্রেকলিনাক্স</b> প্রচুর প্রোডাক্ট তৈরী করেছে।"
# সাম
#: share/advertising/09.pl:17
#, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux এর পণ্যসমূহ হলো:"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux এর পণ্যসমূহ হলো:"
#: share/advertising/09.pl:18
#, c-format
@@ -15869,11 +15875,11 @@ msgstr "\t* <b>পাওয়ারপ্যাক+</b>, ডেস্কটপ এ
#: share/advertising/09.pl:21
#, c-format
msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
"the most of your 64-bit processor."
msgstr ""
-"\t* <b>x86-64 এর জন্য Mandrivalinux</b>, আপনার ৬৪‌-বিট প্রোসেসরের সব সম্ভবনাকে "
-"কাজে লাগানোর Mandrivalinux সমাধান। "
+"\t* <b>x86-64 এর জন্য Mandriva Linux</b>, আপনার ৬৪‌-বিট প্রোসেসরের সব সম্ভবনাকে "
+"কাজে লাগানোর Mandriva Linux সমাধান। "
# সাম
#: share/advertising/10.pl:15
@@ -15885,31 +15891,31 @@ msgstr "<b>Mandriva পণ্যসমূহ (Nomad পণ্যসমূহ)</b
#: share/advertising/10.pl:17
#, c-format
msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"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:"
msgstr ""
"Mandriva দুটি পণ্য তৈরী করেছে যা আপনাকে ইনস্টল করা ছাড়াই <b>যেকোন কম্পিউটারে</b> "
-"Mandrivalinux ব্যবহার করার সুযোগ দেবে। "
+"Mandriva Linux ব্যবহার করার সুযোগ দেবে। "
# সাম
# bootable = ?
#: share/advertising/10.pl:18
#, c-format
msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
"bootable CD-ROM."
msgstr ""
-"\t* <b>মুভ</b>, একটি Mandrivalinux ডিস্ট্রিবিউশন সম্পূর্ণভাবে একটি বুট CD-ROM থেকে "
+"\t* <b>মুভ</b>, একটি Mandriva Linux ডিস্ট্রিবিউশন সম্পূর্ণভাবে একটি বুট CD-ROM থেকে "
"চলতে পারে।"
# সাম: ultra-compact = ?
#: share/advertising/10.pl:19
#, c-format
msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
"ultra-compact “LaCie Mobile Hard Drive”."
msgstr ""
-"\t* <b>GlobeTrotter</b>, একটি Mandrivalinux ডিস্ট্রিবিউশন যা কিনা আলট্রা‌-"
+"\t* <b>GlobeTrotter</b>, একটি Mandriva Linux ডিস্ট্রিবিউশন যা কিনা আলট্রা‌-"
"কমপ্যাক্ট “LaCie মোবাইল হার্ড ড্রাইভ” এ পূর্ব-ইনস্টলকৃত।"
#: share/advertising/11.pl:13
@@ -15929,22 +15935,24 @@ msgstr ""
# সাম: Corporate = প্রাতিষ্ঠানিক লিখলাম...সিওর না।
#: share/advertising/11.pl:16
#, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
msgstr ""
-"\t* <b>কর্পোরেট ডেস্কটপ</b>, ব্যবসা প্রতিষ্ঠানের উপযুক্ত Mandrivalinux ডেস্কটপ।"
+"\t* <b>কর্পোরেট ডেস্কটপ</b>, ব্যবসা প্রতিষ্ঠানের উপযুক্ত Mandriva Linux ডেস্কটপ।"
# সাম
# প্রাতিষ্ঠানিক
#: share/advertising/11.pl:17
#, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>কর্পোরেট সার্ভার</b>, Mandrivalinux সার্ভার সমাধান।"
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>কর্পোরেট সার্ভার</b>, Mandriva Linux সার্ভার সমাধান।"
# সাম
#: share/advertising/11.pl:18
#, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
-msgstr "\t* <b>একাধিক-নেটওয়ার্ক ফায়ারওয়াল</b>, Mandrivalinux নিরাপত্তা সমাধান।"
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr "\t* <b>একাধিক-নেটওয়ার্ক ফায়ারওয়াল</b>, Mandriva Linux নিরাপত্তা সমাধান।"
#: share/advertising/12.pl:13
#, c-format
@@ -16163,7 +16171,7 @@ msgstr "<b>অ্যাপ্লিকেশনের বিশাল সীম�
#: share/advertising/18.pl:15
#, c-format
msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
"<b>all of your tasks</b>:"
msgstr ""
"ম্যানড্রেকলিনাক্স মেনু'তে <b>আপনার সকল কাজসমূহ</b> এর জন্য আপনি </b>সহজে-ব্যবহার্য</"
@@ -16448,7 +16456,7 @@ msgstr ""
#: share/advertising/25.pl:13
#, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
msgstr "<b>ম্যান্ড্রেক-লিনাক্স নিয়ন্ত্রণ কেন্দ্র</b>"
# সাম
@@ -16456,11 +16464,11 @@ msgstr "<b>ম্যান্ড্রেক-লিনাক্স নিয়ন�
#: share/advertising/25.pl:15
#, c-format
msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
"your computer."
msgstr ""
-"<b>Mandrivalinux নিয়ন্ত্রণ কেন্দ্র</b> একটি Mandrivalinux-সম্পর্কিত মৌলিক "
+"<b>Mandriva Linux নিয়ন্ত্রণ কেন্দ্র</b> একটি Mandriva Linux-সম্পর্কিত মৌলিক "
"ইউটিলিটির সমষ্টি যা কিনা আপনার কম্পিউটারের কনফিগারেশন সহজ করে তোলে। "
# সাম
@@ -16489,12 +16497,12 @@ msgid ""
"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 "
+"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!"
msgstr ""
"সব কম্পিউটার প্রোগ্রামিং এর মতই, উন্মুক্ত সোর্স সফ্টওয়্যার ডেভেলপমেন্টেও প্রয়োজন <b>সময় "
-"এবং লোকবল</b>। উন্মুক্ত সোর্স ধারনাটির সমর্থনে এবং <b>Mandrivalinux উন্নততর করার "
+"এবং লোকবল</b>। উন্মুক্ত সোর্স ধারনাটির সমর্থনে এবং <b>Mandriva Linux উন্নততর করার "
"উদ্দেশ্যে</b> Mandriva মূল্য সংযোজিত পণ্য ও সেবা বিক্রয় করে থাকে। আপনি যদি এই "
"প্রচেষ্টায় সাহায্য করতে চান তবে <b>অনুগ্রহ করে</b> আমাদের যেকোন পণ্য বা সেবা ক্রয় "
"করুন!"
@@ -16531,8 +16539,8 @@ msgstr ""
#: share/advertising/27.pl:21
#, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "আজ <b>store.mandrakesoft.com</b> এ থেমে যান!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "আজ <b>store.mandriva.com</b> এ থেমে যান!"
#: share/advertising/28.pl:15
#, c-format
@@ -16542,7 +16550,7 @@ msgstr "<b>ম্যানড্রেকক্লাব</b>"
#: share/advertising/28.pl:17
#, c-format
msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
"product.."
msgstr "<b>ম্যানড্রেকক্লাব</b> আপনার ম্যানড্রেকলিনাক্স প্রোডাক্টের <b>সঠিক সংগী</b>.."
@@ -16556,9 +16564,9 @@ msgstr "ম্যানড্রেকক্লাবে যোগ দিয়ে
#, c-format
msgid ""
"\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
msgstr ""
-"\t* আমাদের অনলাইন <b>store.mandrakesoft.com</b> স্টোরের প্রোডাক্টসমূহ এবং "
+"\t* আমাদের অনলাইন <b>store.mandriva.com</b> স্টোরের প্রোডাক্টসমূহ এবং "
"সার্ভিসসমূহে<b>বিশেষ মূল্যহ্রাস</b>।"
#: share/advertising/28.pl:21
@@ -16572,17 +16580,17 @@ msgstr ""
#: share/advertising/28.pl:22
#, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
msgstr "\t* ম্যানড্রেকলিনাক্স <b>ব্যবহারকারীদের ফোরাম</b> এ অংশগ্রহণ।"
# সাম
#: share/advertising/28.pl:23
#, c-format
msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
msgstr ""
-"\t* Mandrivalinux <b>ISO ইমেজগুলো</b>, <b>নির্ধারিত সময়ের পূর্বেই</b>, পাওয়ার "
+"\t* Mandriva Linux <b>ISO ইমেজগুলো</b>, <b>নির্ধারিত সময়ের পূর্বেই</b>, পাওয়ার "
"বিশেষ সুবিধা।"
#: share/advertising/29.pl:13
@@ -16603,7 +16611,7 @@ msgstr ""
#, c-format
msgid ""
"Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
msgstr ""
"ম্যানড্রেকঅনলাইন আপনার ম্যানড্রেকলিনাক্স সিস্টেমের জন্য <b>সহজে আপডেট</b> এর জন্য "
"বিশাল সীমানার গুরুত্বপূর্ণ সার্ভিস:"
@@ -16630,7 +16638,7 @@ msgstr "\t* নমনীয় <b>রুটিনমাফিক</b> আপডে�
#: share/advertising/29.pl:21
#, c-format
msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
msgstr ""
"\t* একটি অ্যাকাউন্ট দিয়ে <b>আপনার সম্পূর্ণ ম্যানড্রেকলিনাক্স সিস্টেমের</b> ম্যানেজমেন্ট।"
@@ -16643,16 +16651,16 @@ msgstr "<b>Mandriva Expert</b>"
#, c-format
msgid ""
"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
msgstr ""
-"আপনার কি কোন <b>সহযোগিতা</b> প্রয়োজন? www.mandrakeexpert.com এর <b>আমাদের "
+"আপনার কি কোন <b>সহযোগিতা</b> প্রয়োজন? www.mandrivaexpert.com এর <b>আমাদের "
"প্রযুক্তিগত সহায়তা প্লাটফর্ম</b> এ ম্যানড্রেকসফ্‌টের অভিজ্ঞ প্রযুক্তিবিদদের সাথে যোগাযোগ "
"করুন।"
#: share/advertising/30.pl:17
#, c-format
msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
"a lot of time."
msgstr ""
"<b>যোগ্যতাসম্পন্ন অভিজ্ঞ ম্যানড্রেকলিনাক্স ব্যবহারকারীদের</b> সাহায্যের জন্য ধন্যবাদ, "
@@ -16661,11 +16669,11 @@ msgstr ""
#: share/advertising/30.pl:19
#, c-format
msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
msgstr ""
-"ম্যানড্রেকলিনাক্স সম্পর্কিত কোন প্রশ্নের জন্য, আপনাকে <b>store.mandrakesoft.com</b> "
-"থেকে সকল প্রকার সহায়তা নিতে হবে।"
+"ম্যানড্রেকলিনাক্স সম্পর্কিত কোন প্রশ্নের জন্য, আপনাকে <b>store.mandriva.com</b> থেকে "
+"সকল প্রকার সহায়তা নিতে হবে।"
#: share/compssUsers.pl:25
#, c-format
@@ -17066,8 +17074,8 @@ msgid ""
"\n"
"OPTIONS:\n"
" --help - print this help message.\n"
-" --report - program should be one of mandrakelinux tools\n"
-" --incident - program should be one of mandrakelinux tools"
+" --report - program should be one of Mandriva Linux tools\n"
+" --incident - program should be one of Mandriva Linux tools"
msgstr ""
"[অপশনসমূহ] [প্রোগ্রামের নাম]\n"
"\n"
@@ -17128,12 +17136,12 @@ msgstr ""
" : এবং ghostscript এর জন্য gs।"
# সাম
-# Mandrivalinux Terminal
+# Mandriva Linux Terminal
#: standalone.pm:84
#, c-format
msgid ""
"[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
"--enable : enable MTS\n"
"--disable : disable MTS\n"
"--start : start MTS\n"
@@ -17147,7 +17155,7 @@ msgid ""
"IP, nbi image name)"
msgstr ""
"[OPTIONS]...\n"
-"Mandrivalinux টার্মিনাল সার্ভার কনফিগারকারী\n"
+"Mandriva Linux টার্মিনাল সার্ভার কনফিগারকারী\n"
"--enable :MTS সক্রিয় করো\n"
"--disable : MTS নিষ্ক্রিয় করো\n"
"--start : MTS চালু করো\n"
@@ -19952,12 +19960,12 @@ msgstr ""
#: standalone/drakbug:41
#, c-format
-msgid "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
msgstr "ম্যানড্রেকলিনাক্স ত্রুটি রিপোর্টকারী টুল"
#: standalone/drakbug:46
#, c-format
-msgid "Mandrivalinux Control Center"
+msgid "Mandriva Linux Control Center"
msgstr "ম্যানড্রেকলিনাক্স নিয়ন্ত্রন (control) সেন্টার"
#: standalone/drakbug:48
@@ -20455,7 +20463,7 @@ msgstr "বুট হওয়ার সময় সচল হয়"
#, c-format
msgid ""
"This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
msgstr ""
"এই ইন্টারফেস এখনো কন্‌ফিগার করা হয়নি।\n"
"ম্যানড্রেকলিনাক্স নিয়ন্ত্রক কেন্দ্র থেকে সহকারী \"ইন্টারফেস যুক্ত করো\" চালান"
@@ -20465,10 +20473,10 @@ msgstr ""
#, c-format
msgid ""
"You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
msgstr ""
"আপনার সিস্টেমে কোন ইন্টারনেট সংযোগ কনফিগার করা নেই।\n"
-"অনুগ্রহপূর্বক Mandrivalinux নিয়ন্ত্রণকেন্দ্র থেকে \"%s\" চালান।"
+"অনুগ্রহপূর্বক Mandriva Linux নিয়ন্ত্রণকেন্দ্র থেকে \"%s\" চালান।"
#. -PO: here "Add Connection" should be translated the same was as in control-center
#: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20519,7 +20527,7 @@ msgstr "KDM (কেডিই ডিসপ্লে ম্যানেজার)"
#: standalone/drakedm:36
#, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
msgstr "MdkKDM (ম্যানড্রেকলিনাক্স ডিসপ্লে ম্যানেজার)"
#: standalone/drakedm:37
@@ -20828,18 +20836,18 @@ msgid ""
"\n"
" DUPONT Sebastien (original version)\n"
"\n"
-" CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+" CHAUMETTE Damien <dchaumette@mandriva.com>\n"
"\n"
-" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+" VIGNAUD Thierry <tvignaud@mandriva.com>"
msgstr ""
"স্বত্বাধিকারী (C) ২০০১-২০০২ ম্যানড্রেকসফ্‌ট কর্তৃক \n"
"\n"
"\n"
" ডুপন্ট সেবাস্তিয়ান (মূল সংস্করণ)\n"
"\n"
-" চওমেট্টে ডেমিয়েন <dchaumette@mandrakesoft.com>\n"
+" চওমেট্টে ডেমিয়েন <dchaumette@mandriva.com>\n"
"\n"
-" ভিগ্‌নড থিয়েরী <tvignaud@mandrakesoft.com>"
+" ভিগ্‌নড থিয়েরী <tvignaud@mandriva.com>"
#: standalone/drakfont:520
#, c-format
@@ -21416,8 +21424,8 @@ msgstr " --doc <link> - অন্য ওয়েব পেজে সং�
# সাম
#: standalone/drakhelp:36
#, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinux সাহায্যকেন্দ্র"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linux সাহায্যকেন্দ্র"
#: standalone/drakhelp:36
#, c-format
@@ -22080,7 +22088,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
"আপনার মেশিনে কোন সাউন্ডকার্ড পাওয়া যায়নি। অনুগ্রহ করে ভালভাবে দেখুন একটি লিনাক্স-"
"সমর্থিত সাউন্ডকার্ড সঠিকভাবে লাগানো আছে।\n"
@@ -22089,7 +22097,7 @@ msgstr ""
"আপনি আমাদের হার্ডওয়ার ডাটাবেজে ঘুরে আসতে পারেন:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
#: standalone/draksound:57
#, c-format
@@ -24079,7 +24087,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
"আপনি মেশিনে কোন টিভি কার্ড পাওয়া যায় নি। অনুগ্রহ করে পরীক্ষা করুন যে লিনাক্স-"
"সমর্থিত ভিডিও/টিভি কার্ড সঠিকভাবে সংযুক্ত আছে।\n"
@@ -24088,7 +24096,7 @@ msgstr ""
"আপনি আমাদের হার্ডওয়্যার ডাটাবেজে ঘুরে আসতে পারেন:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
#: standalone/harddrake2:24
#, c-format
@@ -24816,13 +24824,13 @@ msgid ""
"This is HardDrake, a %s hardware configuration tool.\n"
"<span foreground=\"royalblue3\">Version:</span> %s\n"
"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
"\n"
msgstr ""
"এটা হচ্ছে HardDrake, %s এর একটি হার্ডওয়্যার কনফিগারেশন টুল।\n"
"<span foreground=\"royalblue3\">সংস্করণ:</span> %s\n"
"<span foreground=\"royalblue3\">লেখক:</span> থিয়েরি ভিগ্‌নদ &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
"\n"
#: standalone/harddrake2:243
@@ -24933,8 +24941,8 @@ msgstr ""
#: standalone/logdrake:50
#, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinux টুলসমুহের লগ"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linux টুলসমুহের লগ"
# ##যন্ত্রপাতি
# Logdrake-এর কোন বাংলা হবে বলে আমার মনে হয়না।
@@ -25475,7 +25483,7 @@ msgstr "সংযোগ সম্পন্ন হয়েছে।"
#, c-format
msgid ""
"Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
msgstr ""
"কানেকশন হয়নি।\n"
"ম্যান্ড্রেক-লিনাক্স কন্ট্রোল প্যানেলে আপনার কনফিগারেশন যাচাই করুন।"
@@ -26379,5 +26387,5 @@ msgstr "ইনস্টলেশন ব্যর্থ হয়েছে"
#~ msgid "You've not selected any font"
#~ msgstr "আপনি কোন ফন্ট বেছে নেন নি"
-#~ msgid "http://www.mandrakelinux.com/en/101errata.php3"
-#~ msgstr "http://www.mandrakelinux.com/en/101errata.php3"
+#~ msgid "http://www.mandrivalinux.com/en/101errata.php3"
+#~ msgstr "http://www.mandrivalinux.com/en/101errata.php3"
diff --git a/perl-install/share/po/br.po b/perl-install/share/po/br.po
index 117c11d19..001601269 100644
--- a/perl-install/share/po/br.po
+++ b/perl-install/share/po/br.po
@@ -1,6 +1,6 @@
# DrakX e Brezhoneg.
# Copyright (C) 1999-2003 Mandriva
-# Thierry Vignaud <tvignaud@mandrakesoft.com>, 1999-2005
+# Thierry Vignaud <tvignaud@mandriva.com>, 1999-2005
# Jañ-Mai Drapier <jan-mai.drapier@mail.dotcom.fr>, 1999-2000
#
msgid ""
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: DrakX 10.2\n"
"POT-Creation-Date: 2005-04-21 14:27+0200\n"
"PO-Revision-Date: 2005-04-21 14:54+0200\n"
-"Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
+"Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
"Language-Team: Brezhoneg <ofisk@wanadoo.fr>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -1230,7 +1230,7 @@ msgstr "Diba ho yezh"
#: any.pm:733
#, c-format
msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux can support multiple languages. Select\n"
"the languages you would like to install. They will be available\n"
"when your installation is complete and you restart your system."
msgstr "Gallout a rit dibab yezhoù all hag a vo hegerz goude staliañ"
@@ -3504,7 +3504,7 @@ msgstr ""
#, c-format
msgid ""
"Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
"terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
"button will reboot your computer."
msgstr ""
@@ -3614,7 +3614,7 @@ msgstr ""
#: help.pm:85
#, c-format
msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
"selected package is located on another CD-ROM, DrakX will eject the current\n"
"CD and ask you to insert the required one. If you do not have the requested\n"
"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3625,11 +3625,12 @@ msgstr ""
#, c-format
msgid ""
"It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
"simpler to manage, they have been placed into groups of similar\n"
"applications.\n"
"\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
"match applications from the various categories, so a ``Workstation''\n"
"installation can still have applications from the ``Server'' category\n"
"installed.\n"
@@ -3736,10 +3737,10 @@ msgid ""
"!! If a server package has been selected, either because you specifically\n"
"chose the individual package or because it was part of a group of packages,\n"
"you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux will automatically start any installed\n"
"services at boot time. Even if they are safe and have no known issues at\n"
"the time the distribution was shipped, it is entirely possible that\n"
-"security holes were discovered after this version of Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
"finalized. If you do not know what a particular service is supposed to do "
"or\n"
"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3856,7 +3857,7 @@ msgstr ""
msgid ""
"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
"on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
"\n"
"You'll see a list of different parameters to change to get an optimal\n"
"graphical display.\n"
@@ -3954,12 +3955,12 @@ msgstr ""
#: help.pm:316
#, c-format
msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\n"
"operating system on your hard drive. If your hard drive is empty or if an\n"
"existing operating system is using all the available space you will have to\n"
"partition the drive. Basically, partitioning a hard drive means to\n"
"logically divide it to create the space needed to install your new\n"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
"\n"
"Because the process of partitioning a hard drive is usually irreversible\n"
"and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -3986,7 +3987,7 @@ msgid ""
"FAT or NTFS partition. Resizing can be performed without the loss of any\n"
"data, provided you've previously defragmented the Windows partition.\n"
"Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
"the same computer.\n"
"\n"
" Before choosing this option, please understand that after this\n"
@@ -3995,7 +3996,8 @@ msgid ""
"to store your data or to install new software.\n"
"\n"
" * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
"this option. Be careful, because you will not be able to undo this "
"operation\n"
"after you confirm.\n"
@@ -4124,7 +4126,7 @@ msgid ""
"Click on \"%s\" when you're ready to format the partitions.\n"
"\n"
"Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
"\n"
"Click on \"%s\" if you wish to select partitions which will be checked for\n"
"bad blocks on the disk."
@@ -4142,7 +4144,7 @@ msgstr "Diaraog"
#: help.pm:434
#, c-format
msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
"have been updated since the initial release. Bugs may have been fixed,\n"
"security issues resolved. To allow you to benefit from these updates,\n"
"you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4171,7 +4173,7 @@ msgid ""
"generally obtained at the expense of ease of use.\n"
"\n"
"If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
"Control Center.\n"
"\n"
"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4187,7 +4189,7 @@ msgstr "Melestradur an surentez"
#, c-format
msgid ""
"At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
"defined, either from a previous installation of GNU/Linux or by another\n"
"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
"partitions must be defined.\n"
@@ -4273,7 +4275,7 @@ msgstr "Tremen er mod boas/mailh"
msgid ""
"More than one Microsoft partition has been detected on your hard drive.\n"
"Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
"\n"
"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
"\"Capacity\".\n"
@@ -4318,7 +4320,7 @@ msgid ""
"found on your machine.\n"
"\n"
"DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
"\n"
" * \"%s\". For the most part, this completely wipes out the old system.\n"
"However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4327,13 +4329,14 @@ msgid ""
"the file system, you should use this option.\n"
"\n"
" * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux system. Your current "
+"partitioning\n"
"scheme and user data will not be altered. Most of the other configuration\n"
"steps remain available and are similar to a standard installation.\n"
"\n"
-"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
msgstr ""
#: help.pm:591
@@ -4374,7 +4377,8 @@ msgid ""
"\n"
"About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
"cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 "
+"will\n"
"depend on the user's choices:\n"
"\n"
" * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4533,7 +4537,7 @@ msgstr ""
#, c-format
msgid ""
"Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
"the printing systems is best suited to particular types of configuration.\n"
"\n"
" * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4554,7 +4558,7 @@ msgid ""
"options and for managing the printer.\n"
"\n"
"If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
"Control Center and clicking on the \"%s\" button."
msgstr ""
@@ -4654,7 +4658,8 @@ msgid ""
"\n"
" * \"%s\": if you wish to configure your Internet or local network access,\n"
"you can do so now. Refer to the printed documentation or use the\n"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to "
+"benefit\n"
"from full in-line help.\n"
"\n"
" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4671,7 +4676,7 @@ msgid ""
" * \"%s\": if you wish to change your bootloader configuration, click this\n"
"button. This should be reserved to advanced users. Refer to the printed\n"
"documentation or the in-line help about bootloader configuration in the\n"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
"\n"
" * \"%s\": through this entry you can fine tune which services will be run\n"
"on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4733,7 +4738,7 @@ msgstr "Servijerioù"
#, c-format
msgid ""
"Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
"and will not be recoverable!"
msgstr ""
@@ -5056,7 +5061,7 @@ msgstr "Emaon o jediñ ment ar barzhadur Windows"
#, c-format
msgid ""
"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
"installation."
msgstr ""
@@ -5170,13 +5175,13 @@ msgstr "O tizenaouiñ ar rouedad"
msgid ""
"Introduction\n"
"\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
"shall be called the \"Software Products\" hereafter. The Software Products "
"include, but are not \n"
"restricted to, the set of programs, methods, rules and documentation related "
"to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
"\n"
"\n"
"1. License Agreement\n"
@@ -5230,7 +5235,7 @@ msgid ""
"loss) arising out \n"
"of the possession and use of software components or arising out of "
"downloading software components \n"
-"from one of Mandrivalinux sites which are prohibited or restricted in some "
+"from one of Mandriva Linux sites which are prohibited or restricted in some "
"countries by local laws.\n"
"This limited liability applies to, but is not restricted to, the strong "
"cryptography components \n"
@@ -5267,7 +5272,7 @@ msgid ""
"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
"as a whole or in \n"
"parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
"Mandriva S.A. \n"
"\n"
"\n"
@@ -5340,8 +5345,8 @@ msgid ""
"Remove the boot media and press return to reboot.\n"
"\n"
"\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
"consult the Errata available from:\n"
"\n"
"\n"
@@ -5349,13 +5354,13 @@ msgid ""
"\n"
"\n"
"Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
msgstr ""
"Gourc'hemennoù, peurc'hraet eo ar staliadur.\n"
"Lamit ar bladenn loc'hañ ha gwaskit enkas evit adloc'hañ.\n"
"\n"
"\n"
-"Evit titouroù war palastroù hegerz evit stumm-mañ Mandrivalinux,\n"
+"Evit titouroù war palastroù hegerz evit stumm-mañ Mandriva Linux,\n"
"sellit ouzh ar Errata war : \n"
"\n"
"\n"
@@ -5363,13 +5368,13 @@ msgstr ""
"\n"
"\n"
"Titouroù war gefluniañ ho reizhiad a zo hegerz e rannbennad Goude\n"
-"Staliañ Sturier ofisiel an Arveriad Mandrivalinux."
+"Staliañ Sturier ofisiel an Arveriad Mandriva Linux."
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
#: install_messages.pm:144
#, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
#: install_steps.pm:246
#, c-format
@@ -5394,7 +5399,7 @@ msgstr "O kregiñ gant al lankad `%s'\n"
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
"this,\n"
"press `F1' when booting on CDROM, then enter `text'."
msgstr ""
@@ -5912,9 +5917,9 @@ msgstr ""
#: install_steps_interactive.pm:821
#, c-format
msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
-"O taremprediñ al lec'hienn Mandrivalinux evit kaout roll ar pakadoù "
+"O taremprediñ al lec'hienn Mandriva Linux evit kaout roll ar pakadoù "
"hegerz ..."
#: install_steps_interactive.pm:840
@@ -6124,8 +6129,8 @@ msgstr ""
#: install_steps_newt.pm:20
#, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Staliadur Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Staliadur Mandriva Linux %s"
#. -PO: This string must fit in a 80-char wide text screen
#: install_steps_newt.pm:34
@@ -8698,7 +8703,7 @@ msgstr "BitTorrent"
msgid ""
"drakfirewall configurator\n"
"\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
"For a powerful and dedicated firewall solution, please look to the\n"
"specialized MandrakeSecurity Firewall distribution."
msgstr ""
@@ -12295,8 +12300,8 @@ msgstr ""
#: printer/printerdrake.pm:3929
#, c-format
msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
"\n"
msgstr ""
@@ -14043,18 +14048,18 @@ msgstr "Plaenaozañ"
#: share/advertising/01.pl:13
#, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Petra eo Mandrivalinux ?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Petra eo Mandriva Linux ?</b>"
#: share/advertising/01.pl:15
#, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Degemer e <b>Mandrivalinux</b> !"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Degemer e <b>Mandriva Linux</b> !"
#: share/advertising/01.pl:17
#, c-format
msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"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."
@@ -14063,7 +14068,7 @@ msgstr ""
#: share/advertising/01.pl:19
#, c-format
msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"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!"
msgstr ""
@@ -14080,9 +14085,9 @@ msgstr "Degemer er <b>bed dieub</b> !"
#: share/advertising/02.pl:17
#, c-format
msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"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 Mandrivalinux "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
"contributors."
msgstr ""
@@ -14101,8 +14106,8 @@ msgstr "<b>Ar GPL</b>"
#: share/advertising/03.pl:15
#, c-format
msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
msgstr ""
#: share/advertising/03.pl:17
@@ -14128,17 +14133,17 @@ msgstr ""
#: share/advertising/04.pl:15
#, c-format
msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"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 Mandrivalinux world."
+"<b>key role</b> in the Mandriva Linux world."
msgstr ""
#: share/advertising/04.pl:17
#, c-format
msgid ""
"To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"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."
msgstr ""
@@ -14150,7 +14155,7 @@ msgstr ""
#: share/advertising/05.pl:17
#, c-format
msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
"version that Mandriva wants to keep <b>available to everyone</b>."
msgstr ""
@@ -14188,7 +14193,7 @@ msgstr ""
#: share/advertising/06.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
msgstr ""
#: share/advertising/06.pl:17
@@ -14207,7 +14212,7 @@ msgstr ""
#: share/advertising/07.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
msgstr ""
#: share/advertising/07.pl:17
@@ -14225,7 +14230,7 @@ msgstr ""
#: share/advertising/08.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
msgstr ""
#: share/advertising/08.pl:17
@@ -14245,13 +14250,13 @@ msgstr "<b>Mandriva Store</b>"
#: share/advertising/09.pl:15
#, c-format
msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
msgstr ""
#: share/advertising/09.pl:17
#, fuzzy, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux Control Center"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux Control Center"
#: share/advertising/09.pl:18
#, c-format
@@ -14271,7 +14276,7 @@ msgstr ""
#: share/advertising/09.pl:21
#, c-format
msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
"the most of your 64-bit processor."
msgstr ""
@@ -14283,21 +14288,21 @@ msgstr ""
#: share/advertising/10.pl:17
#, c-format
msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"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:"
msgstr ""
#: share/advertising/10.pl:18
#, c-format
msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
"bootable CD-ROM."
msgstr ""
#: share/advertising/10.pl:19
#, c-format
msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
"ultra-compact “LaCie Mobile Hard Drive”."
msgstr ""
@@ -14315,17 +14320,19 @@ msgstr ""
#: share/advertising/11.pl:16
#, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
msgstr ""
#: share/advertising/11.pl:17
#, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
msgstr ""
#: share/advertising/11.pl:18
#, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
msgstr ""
#: share/advertising/12.pl:13
@@ -14501,7 +14508,7 @@ msgstr ""
#: share/advertising/18.pl:15
#, c-format
msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
"<b>all of your tasks</b>:"
msgstr ""
@@ -14736,14 +14743,14 @@ msgstr ""
#: share/advertising/25.pl:13
#, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Kreizenn ren Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Kreizenn ren Mandriva Linux</b>"
#: share/advertising/25.pl:15
#, c-format
msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
"your computer."
msgstr ""
@@ -14766,8 +14773,8 @@ msgid ""
"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 "
+"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!"
msgstr ""
@@ -14797,7 +14804,7 @@ msgstr ""
#: share/advertising/27.pl:21
#, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
msgstr ""
#: share/advertising/28.pl:15
@@ -14808,7 +14815,7 @@ msgstr "<b>Mandriva Online</b>"
#: share/advertising/28.pl:17
#, c-format
msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
"product.."
msgstr ""
@@ -14822,7 +14829,7 @@ msgstr ""
#, c-format
msgid ""
"\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
msgstr ""
#: share/advertising/28.pl:21
@@ -14834,14 +14841,14 @@ msgstr ""
#: share/advertising/28.pl:22
#, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
msgstr ""
#: share/advertising/28.pl:23
#, c-format
msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
msgstr ""
#: share/advertising/29.pl:13
@@ -14860,7 +14867,7 @@ msgstr ""
#, c-format
msgid ""
"Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
msgstr ""
#: share/advertising/29.pl:18
@@ -14883,7 +14890,7 @@ msgstr ""
#: share/advertising/29.pl:21
#, c-format
msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
msgstr ""
#: share/advertising/30.pl:13
@@ -14895,21 +14902,21 @@ msgstr "<b>Mandriva Store</b>"
#, c-format
msgid ""
"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
msgstr ""
#: share/advertising/30.pl:17
#, c-format
msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
"a lot of time."
msgstr ""
#: share/advertising/30.pl:19
#, c-format
msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
msgstr ""
#: share/compssUsers.pl:25
@@ -15258,8 +15265,8 @@ msgid ""
"\n"
"OPTIONS:\n"
" --help - print this help message.\n"
-" --report - program should be one of mandrakelinux tools\n"
-" --incident - program should be one of mandrakelinux tools"
+" --report - program should be one of Mandriva Linux tools\n"
+" --incident - program should be one of Mandriva Linux tools"
msgstr ""
#: standalone.pm:63
@@ -15295,7 +15302,7 @@ msgstr ""
#, c-format
msgid ""
"[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
"--enable : enable MTS\n"
"--disable : disable MTS\n"
"--start : start MTS\n"
@@ -17815,13 +17822,13 @@ msgstr ""
#: standalone/drakbug:41
#, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux Control Center"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux Control Center"
#: standalone/drakbug:46
#, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Kreizenn ren Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Kreizenn ren Mandriva Linux"
#: standalone/drakbug:48
#, c-format
@@ -18299,14 +18306,14 @@ msgstr ""
#, c-format
msgid ""
"This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
msgstr ""
#: standalone/drakconnect:1009 standalone/net_applet:61
#, c-format
msgid ""
"You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
msgstr ""
#. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18357,7 +18364,7 @@ msgstr ""
#: standalone/drakedm:36
#, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
msgstr ""
#: standalone/drakedm:37
@@ -18647,9 +18654,9 @@ msgid ""
"\n"
" DUPONT Sebastien (original version)\n"
"\n"
-" CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+" CHAUMETTE Damien <dchaumette@mandriva.com>\n"
"\n"
-" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+" VIGNAUD Thierry <tvignaud@mandriva.com>"
msgstr ""
#: standalone/drakfont:520
@@ -19129,8 +19136,8 @@ msgstr ""
#: standalone/drakhelp:36
#, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Kreizenn sikourMandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Kreizenn sikourMandriva Linux"
#: standalone/drakhelp:36
#, c-format
@@ -19711,7 +19718,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
#: standalone/draksound:57
@@ -21309,7 +21316,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
#: standalone/harddrake2:24
@@ -21995,7 +22002,7 @@ msgid ""
"This is HardDrake, a %s hardware configuration tool.\n"
"<span foreground=\"royalblue3\">Version:</span> %s\n"
"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
"\n"
msgstr ""
@@ -22106,8 +22113,8 @@ msgstr ""
#: standalone/logdrake:50
#, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinux Control Center"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linux Control Center"
#: standalone/logdrake:51
#, c-format
@@ -22613,7 +22620,7 @@ msgstr "Echu eo ar gevreadenn"
#, c-format
msgid ""
"Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
msgstr ""
#: standalone/net_monitor:341
diff --git a/perl-install/share/po/bs.po b/perl-install/share/po/bs.po
index 48d3a3509..24c302065 100644
--- a/perl-install/share/po/bs.po
+++ b/perl-install/share/po/bs.po
@@ -1305,11 +1305,11 @@ msgstr "Izbor jezika"
#: any.pm:733
#, c-format
msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux can support multiple languages. Select\n"
"the languages you would like to install. They will be available\n"
"when your installation is complete and you restart your system."
msgstr ""
-"Mandrivalinux podržava više jezika. Izaberite jezike koje\n"
+"Mandriva Linux podržava više jezika. Izaberite jezike koje\n"
"želite instalirati. Oni će biti dostupni kada se završi vaša\n"
"instalacija i restartujete vaš sistem."
@@ -3735,12 +3735,12 @@ msgstr "uključi radio podršku"
#, c-format
msgid ""
"Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
"terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
"button will reboot your computer."
msgstr ""
"Prije nego što nastavimo, trebate pažljivo pročitati uvjete licence. Ona\n"
-"pokriva cijelu Mandrivalinux distribuciju. Ako se slažete sa svim\n"
+"pokriva cijelu Mandriva Linux distribuciju. Ako se slažete sa svim\n"
"uvjetima u njoj, izaberite opciju \"%s\". Ako ne, klikom na \"%s\" ćete\n"
"restartovati vaš računar."
@@ -3928,13 +3928,13 @@ msgstr ""
#: help.pm:85
#, c-format
msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
"selected package is located on another CD-ROM, DrakX will eject the current\n"
"CD and ask you to insert the required one. If you do not have the requested\n"
"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
"installed."
msgstr ""
-"Mandrivalinux instalacija se prostire na nekoliko CDova. Ako je neki\n"
+"Mandriva Linux instalacija se prostire na nekoliko CDova. Ako je neki\n"
"paket smješten na drugom CDu, DrakX će izbaciti trenutni CD i zamoliti vas\n"
"da ubacite neki drugi po potrebi. Ako nemate potreban CD pri ruci,\n"
"samo kliknite na \"%s\", odgovarajući paketi neće biti instalirani."
@@ -3943,11 +3943,12 @@ msgstr ""
#, c-format
msgid ""
"It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
"simpler to manage, they have been placed into groups of similar\n"
"applications.\n"
"\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
"match applications from the various categories, so a ``Workstation''\n"
"installation can still have applications from the ``Server'' category\n"
"installed.\n"
@@ -3999,12 +4000,12 @@ msgid ""
"megabytes."
msgstr ""
"Sada je vrijeme da izaberete koje programe želite instalirati na vaš\n"
-"sistem. Za Mandrivalinux su dostupne hiljade paketa, pa da bi\n"
+"sistem. Za Mandriva Linux su dostupne hiljade paketa, pa da bi\n"
"njihovo upravljanje bilo lakše, organizovani su u grupe slične\n"
"primjene.\n"
"\n"
"Paketi su sortirani u grupe ovisno o tipičnoj namjeni vašeg računara.\n"
-"U Mandrivalinuxu date su četiri predefinisane kategorije. Možete\n"
+"U Mandriva Linuxu date su četiri predefinisane kategorije. Možete\n"
"miješati i poklapati programe iz raznih grupa, pa tako instalacija ``Radna\n"
"stanica'' može sadržavati programe iz grupe ``Programiranje''.\n"
"\n"
@@ -4110,10 +4111,10 @@ msgid ""
"!! If a server package has been selected, either because you specifically\n"
"chose the individual package or because it was part of a group of packages,\n"
"you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux will automatically start any installed\n"
"services at boot time. Even if they are safe and have no known issues at\n"
"the time the distribution was shipped, it is entirely possible that\n"
-"security holes were discovered after this version of Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
"finalized. If you do not know what a particular service is supposed to do "
"or\n"
"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4143,11 +4144,11 @@ msgstr ""
"\n"
"!! Ako izaberete neki serverski paket, zato što ste specifično izabrali taj\n"
"paket ili zato što je on dio grupe paketa, bićete zamoljeni da potvrdite da\n"
-"zaista želite da taj server bude instaliran. Mandrivalinux obično\n"
+"zaista želite da taj server bude instaliran. Mandriva Linux obično\n"
"automatski pokreće sve instalirane servise prilikom pokretanja sistema.\n"
"Čak i ako su sigurni i nemaju poznatih problema u trenutku pakovanja\n"
"distribucije, sasvim je moguće da su neke sigurnosne rupe otkrivene\n"
-"nakon što je dovršena ova verzija Mandrivalinuxa. Ako niste sigurni\n"
+"nakon što je dovršena ova verzija Mandriva Linuxa. Ako niste sigurni\n"
"čemu tačno služi taj paket ili zašto ga treba instalirati, kliknite na \"%s"
"\".\n"
"Klikom na \"%s\" instalirate navedene servise i oni će biti automatski\n"
@@ -4304,7 +4305,7 @@ msgstr ""
msgid ""
"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
"on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
"\n"
"You'll see a list of different parameters to change to get an optimal\n"
"graphical display.\n"
@@ -4360,7 +4361,7 @@ msgid ""
msgstr ""
"X (skraćeno od X Window System) je srce GNU/Linux grafičkog interfejsa\n"
"o kojem ovise sve grafičke okoline (KDE, GNOME, AfterStep,\n"
-"WindowMaker itd.) uključene u Mandrivalinux.\n"
+"WindowMaker itd.) uključene u Mandriva Linux.\n"
"\n"
"Biće vam predstavljena lista različitih parametara koje možete promijeniti\n"
"da biste dobili optimalan grafički prikaz.\n"
@@ -4477,12 +4478,12 @@ msgstr ""
#: help.pm:316
#, c-format
msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\n"
"operating system on your hard drive. If your hard drive is empty or if an\n"
"existing operating system is using all the available space you will have to\n"
"partition the drive. Basically, partitioning a hard drive means to\n"
"logically divide it to create the space needed to install your new\n"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
"\n"
"Because the process of partitioning a hard drive is usually irreversible\n"
"and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4509,7 +4510,7 @@ msgid ""
"FAT or NTFS partition. Resizing can be performed without the loss of any\n"
"data, provided you've previously defragmented the Windows partition.\n"
"Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
"the same computer.\n"
"\n"
" Before choosing this option, please understand that after this\n"
@@ -4518,7 +4519,8 @@ msgid ""
"to store your data or to install new software.\n"
"\n"
" * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
"this option. Be careful, because you will not be able to undo this "
"operation\n"
"after you confirm.\n"
@@ -4538,12 +4540,12 @@ msgid ""
"experience. For more instructions on how to use the DiskDrake utility,\n"
"refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
msgstr ""
-"Na ovom mjestu trebate izabrati gdje želite instalirati Mandrivalinux\n"
+"Na ovom mjestu trebate izabrati gdje želite instalirati Mandriva Linux\n"
"operativni sistem na vašem hard disku. Ako je disk prazan ili ako postojeći\n"
"operativni sistem koristi sav prostor na njemu, potrebno je da ga\n"
"particionirate. U biti, particioniranje hard diska predstavlja logičko\n"
"organiziranje kako bi se stvorio prostor za instaliranje vašeg novog\n"
-"Mandrivalinux sistema.\n"
+"Mandriva Linux sistema.\n"
"\n"
"Pošto su efekti particioniranja obično nepovratni, i mogu voditi do gubitka\n"
"podataka na eventualnom postojećem operativnom sistemu, particioniranje\n"
@@ -4575,7 +4577,7 @@ msgstr ""
"podataka, pod uslovom da prethodno defragmentirate Windows particiju\n"
"i da ona koristi FAT format. Backupovanje vaših podataka je strogo\n"
"preporučeno. Ova mogućnost je preporučena ako namjeravate koristiti i\n"
-"Mandrivalinux i Microsoft Windows na istom računaru.\n"
+"Mandriva Linux i Microsoft Windows na istom računaru.\n"
"\n"
" Prije izbora ove opcije, molim da imate na umu da će, nakon ove\n"
"procedure, veličina vaše Microsoft Windows particije biti manja nego\n"
@@ -4743,7 +4745,7 @@ msgid ""
"Click on \"%s\" when you're ready to format the partitions.\n"
"\n"
"Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
"\n"
"Click on \"%s\" if you wish to select partitions which will be checked for\n"
"bad blocks on the disk."
@@ -4765,7 +4767,7 @@ msgstr ""
"Kliknite na \"%s\" kada budete spremni za formatiranje particija.\n"
"\n"
"Kliknite na \"%s\" ako želite da izaberete druge particije za instalaciju\n"
-"vašeg novog Mandrivalinux operativnog sistema.\n"
+"vašeg novog Mandriva Linux operativnog sistema.\n"
"\n"
"Kliknite na \"%s\" da izaberete particije koje želite provjeriti radi\n"
"loših blokova."
@@ -4782,7 +4784,7 @@ msgstr "Nazad"
#: help.pm:434
#, c-format
msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
"have been updated since the initial release. Bugs may have been fixed,\n"
"security issues resolved. To allow you to benefit from these updates,\n"
"you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4794,7 +4796,7 @@ msgid ""
"will appear: review the selection, and press \"%s\" to retrieve and install\n"
"the selected package(s), or \"%s\" to abort."
msgstr ""
-"Kada završite instalaciju Mandrivalinuxa, moguće je da su neki paketi\n"
+"Kada završite instalaciju Mandriva Linuxa, moguće je da su neki paketi\n"
"ažurirani od zadnjeg izdanja. Moguće je da su ispravljeni bugovi ili\n"
"rješena neka sigurnosna pitanja. Ako želite iskoristiti ova unaprjeđenja,\n"
"možete ih sada dobaviti sa Interneta. Izaberite \"%s\" ako imate ispravnu\n"
@@ -4822,7 +4824,7 @@ msgid ""
"generally obtained at the expense of ease of use.\n"
"\n"
"If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
"Control Center.\n"
"\n"
"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4835,7 +4837,7 @@ msgstr ""
"jednostavnosti korištenja.\n"
"\n"
"Ako ne znate šta izabrati, zadržite ponuđenu opciju. Možete promijeniti\n"
-"nivo sigurnosti naknadno koristeći program draksec iz Mandrivalinux\n"
+"nivo sigurnosti naknadno koristeći program draksec iz Mandriva Linux\n"
"Kontrolnog centra.\n"
"\n"
"Polje \"%s\" obavještava sistem o korisniku koji će biti odgovoran za\n"
@@ -4850,7 +4852,7 @@ msgstr "Sigurnosni administrator"
#, c-format
msgid ""
"At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
"defined, either from a previous installation of GNU/Linux or by another\n"
"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
"partitions must be defined.\n"
@@ -4921,7 +4923,7 @@ msgid ""
"emergency boot situations."
msgstr ""
"Sada trebate izabrati koje particije želite koristiti za instalaciju vašeg\n"
-"Mandrivalinux sistema. Ako su particije već definisane, iz prijašnje\n"
+"Mandriva Linux sistema. Ako su particije već definisane, iz prijašnje\n"
"GNU/Linux instalacije ili nekim drugim alatom za particioniranje, možete\n"
"koristiti postojeće particije. U suprotnom, sada morate definisati\n"
"particije vašeg hard diska.\n"
@@ -5008,7 +5010,7 @@ msgstr "Prekidač normalnog/ekspertnog moda"
msgid ""
"More than one Microsoft partition has been detected on your hard drive.\n"
"Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
"\n"
"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
"\"Capacity\".\n"
@@ -5038,7 +5040,7 @@ msgid ""
msgstr ""
"Na vašem hard disku ustanovljeno je više od jedne Microsoft particije.\n"
"Molim izaberite onu koju želite smanjiti kako biste instalirali vaš\n"
-"Mandrivalinux operativni sistem.\n"
+"Mandriva Linux operativni sistem.\n"
"\n"
"Svaka particija je navedena ovako: \"Linux ime\", \"Windows ime\",\n"
"\"Kapacitet\".\n"
@@ -5086,7 +5088,7 @@ msgid ""
"found on your machine.\n"
"\n"
"DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
"\n"
" * \"%s\". For the most part, this completely wipes out the old system.\n"
"However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5095,19 +5097,20 @@ msgid ""
"the file system, you should use this option.\n"
"\n"
" * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux system. Your current "
+"partitioning\n"
"scheme and user data will not be altered. Most of the other configuration\n"
"steps remain available and are similar to a standard installation.\n"
"\n"
-"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
msgstr ""
"Ovaj korak se aktivira samo ako je na vašem računaru pronađena postojeća\n"
"GNU/Linux particija.\n"
"\n"
"DrakX sada treba znati da li želite izvršiti novu instalaciju ili\n"
-"nadogradnju postojećeg Mandrivalinux sistema:\n"
+"nadogradnju postojećeg Mandriva Linux sistema:\n"
"\n"
" * \"%s\". Najčešće ovo će u potpunosti obrisati stari sistem. Ipak,\n"
"ovisno o vašoj šemi particioniranja, možete spriječiti da neki od vaših\n"
@@ -5116,14 +5119,14 @@ msgstr ""
"datotečni sistem, trebate koristiti ovu opciju.\n"
"\n"
" * \"%s\". Ova vrsta instalacije vam omogućuje da ažurirate pakete\n"
-"koji su trenutno instalirani na vašem Mandrivalinux sistemu. Vaša trenutna\n"
+"koji su trenutno instalirani na vašem Mandriva Linux sistemu. Vaša trenutna\n"
"šema particioniranja i korisnički podaci neće biti izmijenjeni. Većina\n"
"ostalih koraka konfiguracije ostaju kao što jesu, slično običnoj "
"instalaciji.\n"
"\n"
-"Opcija ''Nadogradi'' bi trebala raditi ispravno na Mandrivalinux sistemima\n"
+"Opcija ''Nadogradi'' bi trebala raditi ispravno na Mandriva Linux sistemima\n"
"koji koriste verziju \"8.1\" ili kasniju. Obavljanje nadogradnje na ranijim\n"
-"verzijama Mandrivalinuxa, prije verzije \"8.1\", nije preporučeno."
+"verzijama Mandriva Linuxa, prije verzije \"8.1\", nije preporučeno."
#: help.pm:591
#, c-format
@@ -5181,7 +5184,8 @@ msgid ""
"\n"
"About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
"cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 "
+"will\n"
"depend on the user's choices:\n"
"\n"
" * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5221,7 +5225,7 @@ msgstr ""
"\n"
"O UTF-8 (Unicode) podršci. Unicode je novi način kodiranja znakova čiji\n"
"je cilj da obuhvati sve postojeće jezike. Ipak puna podrška za njega pod\n"
-"GNU/Linuxom je još uvijek u razvoju. Iz tog razloga, Mandrivalinux će ga\n"
+"GNU/Linuxom je još uvijek u razvoju. Iz tog razloga, Mandriva Linux će ga\n"
"koristiti ovisno o drugim izborima korisnika:\n"
"\n"
" * Ako izaberete jezike sa raširenim starim kodiranjem (latin1 jezici, "
@@ -5462,7 +5466,7 @@ msgstr ""
#, c-format
msgid ""
"Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
"the printing systems is best suited to particular types of configuration.\n"
"\n"
" * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5483,11 +5487,11 @@ msgid ""
"options and for managing the printer.\n"
"\n"
"If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
"Control Center and clicking on the \"%s\" button."
msgstr ""
"Sada je vrijeme da izaberete sistem štampe za vaš računar. Drugi\n"
-"operativni sistemi vam možda nude jedan, ali Mandrivalinux nudi\n"
+"operativni sistemi vam možda nude jedan, ali Mandriva Linux nudi\n"
"dva. Svaki od ovih sistema je najbolji za određenu vrstu konfiguracije.\n"
"\n"
"* \"%s\" -- skraćeno za ``štampaj i nemoj stavljati u red'' (print, do not\n"
@@ -5514,7 +5518,7 @@ msgstr ""
"\n"
"Ako sada napravite izbor, pa kasnije zaključite da vam se ne sviđa izabrani\n"
"sistem štampe, možete ga promijeniti pokretanjem PrinterDrake iz\n"
-"Mandrivalinux Kontrolnog centra i klikanjem na dugme \"%s\"."
+"Mandriva Linux Kontrolnog centra i klikanjem na dugme \"%s\"."
#: help.pm:765
#, c-format
@@ -5632,7 +5636,8 @@ msgid ""
"\n"
" * \"%s\": if you wish to configure your Internet or local network access,\n"
"you can do so now. Refer to the printed documentation or use the\n"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to "
+"benefit\n"
"from full in-line help.\n"
"\n"
" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5649,7 +5654,7 @@ msgid ""
" * \"%s\": if you wish to change your bootloader configuration, click this\n"
"button. This should be reserved to advanced users. Refer to the printed\n"
"documentation or the in-line help about bootloader configuration in the\n"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
"\n"
" * \"%s\": through this entry you can fine tune which services will be run\n"
"on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5701,7 +5706,7 @@ msgstr ""
"\n"
"* \"%s\": ako želite, možete podesiti vaš Internet pristup ili pristup\n"
"lokalnoj mreži. Pogledajte štampanu dokumentaciju ili koristite\n"
-"Mandrivalinux Kontrolni centar nakon što je završena instalacija\n"
+"Mandriva Linux Kontrolni centar nakon što je završena instalacija\n"
"kako biste koristili ugrađenu pomoć. \n"
" * \"%s\": omogućuje vam da podesite adrese HTTP i FTP proxyja ako\n"
"se računar na koji instalirate nalazi iza proxy servera.\n"
@@ -5716,7 +5721,7 @@ msgstr ""
"* \"%s\": ako želite promijeniti postavke bootloadera, kliknite na to\n"
"dugme. Ovo bi trebalo biti rezervisano za napredne korisnike. Pogledajte\n"
"štampanu dokumentaciju ili pomoć za bootloader konfiguraciju uključenu\n"
-"u Mandrivalinux Kontrolni centar.\n"
+"u Mandriva Linux Kontrolni centar.\n"
"\n"
"* \"%s\": ovdje možete fino podešavati koji servisi će biti pokrenuti\n"
"na vašem računaru. Ako planirate koristiti ovaj računar kao server,\n"
@@ -5777,11 +5782,11 @@ msgstr "Servisi"
#, c-format
msgid ""
"Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
"and will not be recoverable!"
msgstr ""
"Izaberite hard disk koji želite obrisati kako biste instalirali vašu novu\n"
-"Mandrivalinux particiju. Budite pažljivi, svi podaci koji se nalaze na\n"
+"Mandriva Linux particiju. Budite pažljivi, svi podaci koji se nalaze na\n"
"njemu će biti izgubljeni i neće se moći vratiti!"
#: help.pm:863
@@ -6137,12 +6142,12 @@ msgstr "Izračunavam veličinu Windows particije"
#, c-format
msgid ""
"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
"installation."
msgstr ""
"Vaša Windows particija je previše fragmentirana. Molim restartujte vaš "
-"računar pod Windows-om, pokrenite ``defrag'' alat, zatim pokrenite "
-"Mandrivalinux instalaciju."
+"računar pod Windows-om, pokrenite ``defrag'' alat, zatim pokrenite Mandriva "
+"Linux instalaciju."
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
#: install_interactive.pm:166
@@ -6259,13 +6264,13 @@ msgstr "Zaustavljam mrežu"
msgid ""
"Introduction\n"
"\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
"shall be called the \"Software Products\" hereafter. The Software Products "
"include, but are not \n"
"restricted to, the set of programs, methods, rules and documentation related "
"to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
"\n"
"\n"
"1. License Agreement\n"
@@ -6319,7 +6324,7 @@ msgid ""
"loss) arising out \n"
"of the possession and use of software components or arising out of "
"downloading software components \n"
-"from one of Mandrivalinux sites which are prohibited or restricted in some "
+"from one of Mandriva Linux sites which are prohibited or restricted in some "
"countries by local laws.\n"
"This limited liability applies to, but is not restricted to, the strong "
"cryptography components \n"
@@ -6356,7 +6361,7 @@ msgid ""
"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
"as a whole or in \n"
"parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
"Mandriva S.A. \n"
"\n"
"\n"
@@ -6383,13 +6388,13 @@ msgstr ""
"\n"
"Introduction\n"
"\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
"shall be called the \"Software Products\" hereafter. The Software Products "
"include, but are not \n"
"restricted to, the set of programs, methods, rules and documentation related "
"to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
"\n"
"\n"
"1. License Agreement\n"
@@ -6443,7 +6448,7 @@ msgstr ""
"loss) arising out \n"
"of the possession and use of software components or arising out of "
"downloading software components \n"
-"from one of Mandrivalinux sites which are prohibited or restricted in some "
+"from one of Mandriva Linux sites which are prohibited or restricted in some "
"countries by local laws.\n"
"This limited liability applies to, but is not restricted to, the strong "
"cryptography components \n"
@@ -6480,7 +6485,7 @@ msgstr ""
"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
"as a whole or in \n"
"parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
"Mandriva S.A. \n"
"\n"
"\n"
@@ -6591,8 +6596,8 @@ msgid ""
"Remove the boot media and press return to reboot.\n"
"\n"
"\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
"consult the Errata available from:\n"
"\n"
"\n"
@@ -6600,13 +6605,14 @@ msgid ""
"\n"
"\n"
"Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
msgstr ""
"Čestitamo, instalacija je završena.\n"
"Uklonite boot medij i pritisnite Enter da restartujete računar.\n"
"\n"
"\n"
-"Za informacije o ispravkama koje su dostupne za ovu verziju Mandrivalinuxa,\n"
+"Za informacije o ispravkama koje su dostupne za ovu verziju Mandriva "
+"Linuxa,\n"
"pogledajte Errata koja je dostupna na:\n"
"\n"
"\n"
@@ -6614,13 +6620,13 @@ msgstr ""
"\n"
"\n"
"Informacije o podešavanju vašeg sistema su dostupne u poglavlju\n"
-"\"Nakon instalacije\" vašeg zvaničnog Mandrivalinux Priručnika za upotrebu."
+"\"Nakon instalacije\" vašeg zvaničnog Mandriva Linux Priručnika za upotrebu."
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
#: install_messages.pm:144
#, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
#: install_steps.pm:246
#, c-format
@@ -6649,12 +6655,12 @@ msgstr "Prelazim na korak `%s'\n"
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
"this,\n"
"press `F1' when booting on CDROM, then enter `text'."
msgstr ""
"Vašem sistemu ponestaje resursa. Možda imate neki problem sa instalacijom\n"
-"Mandrivalinuxa. Ako se ovo desi, možete pokušati tekstualnu instalaciju. Za "
+"Mandriva Linuxa. Ako se ovo desi, možete pokušati tekstualnu instalaciju. Za "
"ovo,\n"
"pritisnite `F1' prilikom bootanja CDROMa, zatim unesite `text'."
@@ -7193,9 +7199,9 @@ msgstr ""
#: install_steps_interactive.pm:821
#, c-format
msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
-"Kontaktiram Mandrivalinux web stranicu da bih saznao listu dostupnih "
+"Kontaktiram Mandriva Linux web stranicu da bih saznao listu dostupnih "
"mirrora..."
#: install_steps_interactive.pm:840
@@ -7419,8 +7425,8 @@ msgstr ""
#: install_steps_newt.pm:20
#, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux instalacija %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux instalacija %s"
#. -PO: This string must fit in a 80-char wide text screen
#: install_steps_newt.pm:34
@@ -10006,13 +10012,13 @@ msgstr "BitTorrent"
msgid ""
"drakfirewall configurator\n"
"\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
"For a powerful and dedicated firewall solution, please look to the\n"
"specialized MandrakeSecurity Firewall distribution."
msgstr ""
"drakfirewall podešavanje\n"
"\n"
-"Podesite lični firewall na ovom Mandrivalinux računaru.\n"
+"Podesite lični firewall na ovom Mandriva Linux računaru.\n"
"Ako želite moćnu soluciju posebnog firewalla, molim pogledajte\n"
"specijaliziranu MandrakeSecurity Firewall distribuciju."
@@ -14062,11 +14068,11 @@ msgstr ""
#: printer/printerdrake.pm:3929
#, c-format
msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
"\n"
msgstr ""
-"Pokrenite Scannerdrake (Hardver/Skener u Mandrivalinux Kontrolnom centru) "
+"Pokrenite Scannerdrake (Hardver/Skener u Mandriva Linux Kontrolnom centru) "
"kako biste dijelili vaš skener putem mreže.\n"
"\n"
@@ -16001,23 +16007,23 @@ msgstr "Stop"
#: share/advertising/01.pl:13
#, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Šta je Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Šta je Mandriva Linux?</b>"
#: share/advertising/01.pl:15
#, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Dobro došli u <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Dobro došli u <b>Mandriva Linux</b>!"
#: share/advertising/01.pl:17
#, c-format
msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"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."
msgstr ""
-"Mandrivalinux je <b>Linux distribucija</b> koja sadržava jezgru sistema, "
+"Mandriva Linux je <b>Linux distribucija</b> koja sadržava jezgru sistema, "
"koja se naziva <b>operativni sistem</b> (baziranu na Linux kernelu) kao i "
"<b>mnoštvo programa</b> koji zadovoljavaju sve potrebe koje vam mogu pasti "
"na pamet."
@@ -16025,10 +16031,10 @@ msgstr ""
#: share/advertising/01.pl:19
#, c-format
msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"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!"
msgstr ""
-"Mandrivalinux je <b>najprijateljskija</b> Linux distribucija danas. On je "
+"Mandriva Linux je <b>najprijateljskija</b> Linux distribucija danas. On je "
"takođe i jedna od <b>najšire korištenih</b> Linux distribucija na svijetu!"
#: share/advertising/02.pl:13
@@ -16044,14 +16050,14 @@ msgstr "Dobro došli u svijet <b>otvorenog izvornog koda</b>!"
#: share/advertising/02.pl:17
#, c-format
msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"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 Mandrivalinux "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
"contributors."
msgstr ""
-"Mandrivalinux u potpunosti podržava open-source model. To znači da je ovo "
+"Mandriva Linux u potpunosti podržava open-source model. To znači da je ovo "
"novo izdanje je rezultat <b>saradnje</b> između <b>Mandriva-ovog tima "
-"programera</b> i <b>međunarodne zajednice</b> Mandrivalinux saradnika."
+"programera</b> i <b>međunarodne zajednice</b> Mandriva Linux saradnika."
#: share/advertising/02.pl:19
#, c-format
@@ -16070,11 +16076,11 @@ msgstr "<b>GPL - General Public License</b>"
#: share/advertising/03.pl:15
#, c-format
msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
msgstr ""
-"Većina softvera koji je uključen u ovoj distribuciji, kao i svi "
-"Mandrivalinux alati, koriste <b>GNU General Public License</b>."
+"Većina softvera koji je uključen u ovoj distribuciji, kao i svi Mandriva "
+"Linux alati, koriste <b>GNU General Public License</b>."
#: share/advertising/03.pl:17
#, c-format
@@ -16104,25 +16110,25 @@ msgstr "<b>Uključite se u zajednicu</b>"
#: share/advertising/04.pl:15
#, c-format
msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"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 Mandrivalinux world."
+"<b>key role</b> in the Mandriva Linux world."
msgstr ""
-"Mandrivalinux ima jednu od <b>najvećih zajednica</b> korisnika i programera. "
-"Uloga takve zajednice je raznolika, počevši od prijavljivanja bugova do "
-"razvoja novih programa. Zajednica igra <b>ključnu ulogu</b> u svijetu "
-"Mandrivalinuxa."
+"Mandriva Linux ima jednu od <b>najvećih zajednica</b> korisnika i "
+"programera. Uloga takve zajednice je raznolika, počevši od prijavljivanja "
+"bugova do razvoja novih programa. Zajednica igra <b>ključnu ulogu</b> u "
+"svijetu Mandriva Linuxa."
#: share/advertising/04.pl:17
#, c-format
msgid ""
"To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"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."
msgstr ""
"Da biste <b>naučili više</b> o našoj dinamičnoj zajednici, molimo posjetite "
-"<b>www.mandrakelinux.com</b> ili direktno <b>www.mandrakelinux.com/en/"
+"<b>www.mandrivalinux.com</b> ili direktno <b>www.mandrivalinux.com/en/"
"cookerdevel.php3</b> i <b>uključite se</b> u razvoj."
#: share/advertising/05.pl:15
@@ -16133,10 +16139,10 @@ msgstr "<b>Download verzija</b>"
#: share/advertising/05.pl:17
#, c-format
msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
"version that Mandriva wants to keep <b>available to everyone</b>."
msgstr ""
-"Trenutno instalirate <b>Mandrivalinux Download</b>. To je besplatna verzija "
+"Trenutno instalirate <b>Mandriva Linux Download</b>. To je besplatna verzija "
"koju Mandriva želi zadržati <b>dostupnom svima</b>."
#: share/advertising/05.pl:19
@@ -16181,8 +16187,8 @@ msgstr "<b>Discovery, Tvoj prvi Linux Desktop</b>"
#: share/advertising/06.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Trenutno instalirate <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Trenutno instalirate <b>Mandriva Linux Discovery</b>."
#: share/advertising/06.pl:17
#, c-format
@@ -16204,8 +16210,8 @@ msgstr "<b>PowerPack, Najbolji Linux Desktop</b>"
#: share/advertising/07.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Trenutno instalirate <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Trenutno instalirate <b>Mandriva Linux PowerPack</b>."
#: share/advertising/07.pl:17
#, c-format
@@ -16224,8 +16230,8 @@ msgstr "<b>PowerPack+, Linux rješenje za Desktop i Server</b>"
#: share/advertising/08.pl:15
#, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Trenutno instalirate <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Trenutno instalirate <b>Mandriva Linux PowerPack+</b>."
#: share/advertising/08.pl:17
#, c-format
@@ -16247,13 +16253,14 @@ msgstr "<b>Mandriva proizvodi</b>"
#: share/advertising/09.pl:15
#, c-format
msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
-msgstr "<b>Mandriva</b> je razvio širok raspon <b>Mandrivalinux</b> proizvoda."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
+msgstr ""
+"<b>Mandriva</b> je razvio širok raspon <b>Mandriva Linux</b> proizvoda."
#: share/advertising/09.pl:17
#, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux proizvodi su:"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux proizvodi su:"
#: share/advertising/09.pl:18
#, c-format
@@ -16273,11 +16280,11 @@ msgstr "\t* <b>PowerPack+</b>, Linux rješenje za Desktop i Server."
#: share/advertising/09.pl:21
#, c-format
msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
"the most of your 64-bit processor."
msgstr ""
-"\t* <b>Mandrivalinux za x86-64</b>, Mandrivalinux rješenje kojim ćete izvući "
-"maksimum iz vašeg 64-bitnog procesora."
+"\t* <b>Mandriva Linux za x86-64</b>, Mandriva Linux rješenje kojim ćete "
+"izvući maksimum iz vašeg 64-bitnog procesora."
#: share/advertising/10.pl:15
#, c-format
@@ -16287,29 +16294,28 @@ msgstr "<b>Mandriva proizvodi (mobilni proizvodi)</b>"
#: share/advertising/10.pl:17
#, c-format
msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"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:"
msgstr ""
-"Mandriva je razvio dva proizvoda koji vam omogućuju da koristite "
-"Mandrivalinux <b>na bilo kojem računaru</b> bez potrebe da ga ustvari "
-"instalirate:"
+"Mandriva je razvio dva proizvoda koji vam omogućuju da koristite Mandriva "
+"Linux <b>na bilo kojem računaru</b> bez potrebe da ga ustvari instalirate:"
#: share/advertising/10.pl:18
#, c-format
msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
"bootable CD-ROM."
msgstr ""
-"\t* <b>Move</b>, Mandrivalinux distribucija koja se izvršava u potpunosti sa "
-"bootabilnog CD-ROMa."
+"\t* <b>Move</b>, Mandriva Linux distribucija koja se izvršava u potpunosti "
+"sa bootabilnog CD-ROMa."
#: share/advertising/10.pl:19
#, c-format
msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
"ultra-compact “LaCie Mobile Hard Drive”."
msgstr ""
-"\t* <b>GlobeTrotter</b>, Mandrivalinux distribucija preinstalirana na "
+"\t* <b>GlobeTrotter</b>, Mandriva Linux distribucija preinstalirana na "
"kompaktnom USB hard disku - “LaCie Mobile Hard Drive”."
#: share/advertising/11.pl:13
@@ -16328,19 +16334,22 @@ msgstr ""
#: share/advertising/11.pl:16
#, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b>, Mandrivalinux Desktop za preduzeća."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Mandriva Linux Desktop za preduzeća."
#: share/advertising/11.pl:17
#, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Mandrivalinux rješenje za servere."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Mandriva Linux rješenje za servere."
#: share/advertising/11.pl:18
#, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
msgstr ""
-"\t* <b>Multi-Network Firewall</b>, Mandrivalinux rješenje za sigurnost mreža."
+"\t* <b>Multi-Network Firewall</b>, Mandriva Linux rješenje za sigurnost "
+"mreža."
#: share/advertising/12.pl:13
#, c-format
@@ -16541,10 +16550,10 @@ msgstr "<b>Uživajte u širokoj paleti programa</b>"
#: share/advertising/18.pl:15
#, c-format
msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
"<b>all of your tasks</b>:"
msgstr ""
-"U Mandrivalinux meniju naći ćete <b>jednostavne</b> programe <b>za sve "
+"U Mandriva Linux meniju naći ćete <b>jednostavne</b> programe <b>za sve "
"zadatke</b>:"
#: share/advertising/18.pl:16
@@ -16806,18 +16815,18 @@ msgstr "\t* <b>Postfix</b> i <b>Sendmail</b>: Popularni i moćni mail serveri."
#: share/advertising/25.pl:13
#, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux Kontrolni centar</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux Kontrolni centar</b>"
#: share/advertising/25.pl:15
#, c-format
msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
"your computer."
msgstr ""
-"<b>Mandrivalinux Kontrolni centar</b> je kolecija najvažnijih alata "
-"specifičnih za Mandrivalinux koji olakšavaju podešavanje vašeg računara."
+"<b>Mandriva Linux Kontrolni centar</b> je kolecija najvažnijih alata "
+"specifičnih za Mandriva Linux koji olakšavaju podešavanje vašeg računara."
#: share/advertising/25.pl:17
#, c-format
@@ -16842,15 +16851,15 @@ msgid ""
"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 "
+"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!"
msgstr ""
"Kao i svo računarsko programiranje, za razvoj open-source softwara je "
"<b>potrebno vrijeme i ljudi</b>. Kako bi poštovao open-source filozofiju, "
"Mandriva vam prodaje dodatnu vrijednost proizvoda i usluga kako bi "
-"<b>nastavio usavršavati Mandrivalinux</b>. Ako želite <b>podržati open-"
-"source filozofiju</b> kao i razvoj Mandrivalinuxa, <b>molimo vas</b> da "
+"<b>nastavio usavršavati Mandriva Linux</b>. Ako želite <b>podržati open-"
+"source filozofiju</b> kao i razvoj Mandriva Linuxa, <b>molimo vas</b> da "
"razmotrite kupovinu nekog od naših proizvoda ili usluga!"
#: share/advertising/27.pl:13
@@ -16885,8 +16894,8 @@ msgstr ""
#: share/advertising/27.pl:21
#, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Navratite danas u <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Navratite danas u <b>store.mandriva.com</b>!"
#: share/advertising/28.pl:15
#, c-format
@@ -16896,10 +16905,11 @@ msgstr "<b>Mandriva Club</b>"
#: share/advertising/28.pl:17
#, c-format
msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
"product.."
msgstr ""
-"<b>Mandriva Club</b> je <b>savršen dodatak</b> vašem Mandrivalinux proizvodu."
+"<b>Mandriva Club</b> je <b>savršen dodatak</b> vašem Mandriva Linux "
+"proizvodu."
#: share/advertising/28.pl:19
#, c-format
@@ -16913,10 +16923,10 @@ msgstr ""
#, c-format
msgid ""
"\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
msgstr ""
"\t* <b>Posebni popusti</b> za proizvode i usluge u našoj on-line prodavnici "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
#: share/advertising/28.pl:21
#, c-format
@@ -16929,17 +16939,17 @@ msgstr ""
#: share/advertising/28.pl:22
#, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Učešće u Mandrivalinux <b>korisničkim forumima</b>"
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Učešće u Mandriva Linux <b>korisničkim forumima</b>"
#: share/advertising/28.pl:23
#, c-format
msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
msgstr ""
-"\t* <b>Rani i privilegovani pristup</b>, prije javnog izdanja, Mandrivalinux "
-"<b>ISO imidžima</b>."
+"\t* <b>Rani i privilegovani pristup</b>, prije javnog izdanja, Mandriva "
+"Linux <b>ISO imidžima</b>."
#: share/advertising/29.pl:13
#, c-format
@@ -16959,10 +16969,10 @@ msgstr ""
#, c-format
msgid ""
"Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
msgstr ""
"Mandriva Online vam pruža širok izbor usluga za <b>jednostavno ažuriranje</"
-"b> vaših Mandrivalinux sistema:"
+"b> vaših Mandriva Linux sistema:"
#: share/advertising/29.pl:18
#, c-format
@@ -16987,9 +16997,9 @@ msgstr "\t* Fleksibilno <b>planiranje</b> ažuriranja."
#: share/advertising/29.pl:21
#, c-format
msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
msgstr ""
-"\t* Menadžment <b>svih vaših Mandrivalinux sistema</b> putem jednog "
+"\t* Menadžment <b>svih vaših Mandriva Linux sistema</b> putem jednog "
"korisničkog računa."
#: share/advertising/30.pl:13
@@ -17001,28 +17011,28 @@ msgstr "<b>Mandriva Expert</b>"
#, c-format
msgid ""
"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
msgstr ""
"Da li vam je potrebna <b>podrška?</b> Upoznajte Mandriva tehničke eksperte "
-"na našoj <b>platformi za tehničku podršku</b> www.mandrakeexpert.com."
+"na našoj <b>platformi za tehničku podršku</b> www.mandrivaexpert.com."
#: share/advertising/30.pl:17
#, c-format
msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
"a lot of time."
msgstr ""
-"Zahvaljujući pomoći <b>kvalificiranih eksperata za Mandrivalinux</b>, "
+"Zahvaljujući pomoći <b>kvalificiranih eksperata za Mandriva Linux</b>, "
"uštedićete mnogo vremena."
#: share/advertising/30.pl:19
#, c-format
msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
msgstr ""
-"Za bilo kakva pitanja u vezi Mandrivalinuxa, možete kupiti incidente za "
-"podršku na <b>store.mandrakesoft.com</b>."
+"Za bilo kakva pitanja u vezi Mandriva Linuxa, možete kupiti incidente za "
+"podršku na <b>store.mandriva.com</b>."
#: share/compssUsers.pl:25
#, c-format
@@ -17408,8 +17418,8 @@ msgid ""
"\n"
"OPTIONS:\n"
" --help - print this help message.\n"
-" --report - program should be one of mandrakelinux tools\n"
-" --incident - program should be one of mandrakelinux tools"
+" --report - program should be one of Mandriva Linux tools\n"
+" --incident - program should be one of Mandriva Linux tools"
msgstr ""
"[OPTIONS] [PROGRAM_NAME]\n"
"\n"
@@ -17470,7 +17480,7 @@ msgstr ""
#, c-format
msgid ""
"[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
"--enable : enable MTS\n"
"--disable : disable MTS\n"
"--start : start MTS\n"
@@ -17484,7 +17494,7 @@ msgid ""
"IP, nbi image name)"
msgstr ""
"[OPTIONS]...\n"
-"Podešavanje Mandrivalinux Terminal Servera\n"
+"Podešavanje Mandriva Linux Terminal Servera\n"
"--enable : omogući MTS\n"
"--disable : onemogući MTS\n"
"--start : pokreni MTS\n"
@@ -20324,13 +20334,13 @@ msgstr ""
#: standalone/drakbug:41
#, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux alat za prijavu bugova"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux alat za prijavu bugova"
#: standalone/drakbug:46
#, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux Kontrolni centar"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux Kontrolni centar"
#: standalone/drakbug:48
#, c-format
@@ -20821,19 +20831,19 @@ msgstr "Pokrenut na bootu"
#, c-format
msgid ""
"This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
msgstr ""
"Interfejs još nije podešen.\n"
-"Pokrenite asistent \"Dodaj interfejs\" iz Mandrivalinux Kontrolnog centra"
+"Pokrenite asistent \"Dodaj interfejs\" iz Mandriva Linux Kontrolnog centra"
#: standalone/drakconnect:1009 standalone/net_applet:61
#, c-format
msgid ""
"You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
msgstr ""
"Niste podesili nijednu Internet konekciju.\n"
-"Pokrenite asistent \"%s\" iz Mandrivalinux Kontrolnog centra"
+"Pokrenite asistent \"%s\" iz Mandriva Linux Kontrolnog centra"
#. -PO: here "Add Connection" should be translated the same was as in control-center
#: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20883,8 +20893,8 @@ msgstr "KDM (KDE Display Manager)"
#: standalone/drakedm:36
#, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Mandriva Linux Display Manager)"
#: standalone/drakedm:37
#, c-format
@@ -21188,18 +21198,18 @@ msgid ""
"\n"
" DUPONT Sebastien (original version)\n"
"\n"
-" CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+" CHAUMETTE Damien <dchaumette@mandriva.com>\n"
"\n"
-" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+" VIGNAUD Thierry <tvignaud@mandriva.com>"
msgstr ""
"Copyright (C) 2001-2002 by Mandriva \n"
"\n"
"\n"
" DUPONT Sebastien (originalna verzija)\n"
"\n"
-" CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+" CHAUMETTE Damien <dchaumette@mandriva.com>\n"
"\n"
-" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+" VIGNAUD Thierry <tvignaud@mandriva.com>"
#: standalone/drakfont:520
#, c-format
@@ -21771,8 +21781,8 @@ msgstr ""
#: standalone/drakhelp:36
#, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinux Centar za pomoć"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linux Centar za pomoć"
#: standalone/drakhelp:36
#, c-format
@@ -22042,7 +22052,7 @@ msgid ""
msgstr ""
"Sada ćete podesiti instalacioni server, koji se sastoji od PXE servera (DHCP "
"servera) i TFTP servera.\n"
-"Sa ovom opcijom, moći ćete instalirati Mandrivalinux na druge računare na "
+"Sa ovom opcijom, moći ćete instalirati Mandriva Linux na druge računare na "
"vašoj lokalnoj mreži koristećiovaj računar kao izvor.\n"
"\n"
"Prije nego što nastavite, provjerite da li ste podesili mrežni/internet "
@@ -22435,7 +22445,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
"Nije pronađena nijedna zvučna kartica na vašoj mašini. Molim provjerite da "
"li je ispravno spojena zvučna kartica koja je podržana pod Linuxom.\n"
@@ -22444,7 +22454,7 @@ msgstr ""
"Možete posjetiti našu bazu hardvera na:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
#: standalone/draksound:57
#, c-format
@@ -24462,7 +24472,7 @@ msgid ""
"You can visit our hardware database at:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
msgstr ""
"Na vašem računaru nije detektovana TV kartica. Molim provjerite da li je "
"ispravno priključena Video/TV kartica koja je podržana pod Linuxom.\n"
@@ -24471,7 +24481,7 @@ msgstr ""
"Možete posjetiti našu bazu hardvera na:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
#: standalone/harddrake2:24
#, c-format
@@ -25184,13 +25194,13 @@ msgid ""
"This is HardDrake, a %s hardware configuration tool.\n"
"<span foreground=\"royalblue3\">Version:</span> %s\n"
"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
"\n"
msgstr ""
"Ovo je HardDrake, %s alat za podešavanje hardvera.\n"
"<span foreground=\"royalblue3\">Verzija:</span> %s\n"
"<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
"\n"
#: standalone/harddrake2:243
@@ -25298,8 +25308,8 @@ msgstr "Izmjena je napravljena, ali da bi stupila na snagu morate se odjaviti"
#: standalone/logdrake:50
#, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Dnevnici Mandrivalinux alata"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Dnevnici Mandriva Linux alata"
#: standalone/logdrake:51
#, c-format
@@ -25812,10 +25822,10 @@ msgstr "Konekcija završena."
#, c-format
msgid ""
"Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
msgstr ""
"Konekcija nije uspjela.\n"
-"Provjerite konfiguraciju u Mandrivalinux Kontrolnom centru."
+"Provjerite konfiguraciju u Mandriva Linux Kontrolnom centru."
#: standalone/net_monitor:341
#, c-format
diff --git a/perl-install/share/po/ca.po b/perl-install/share/po/ca.po
index 380d2dad4..ebc8cab4e 100644
--- a/perl-install/share/po/ca.po
+++ b/perl-install/share/po/ca.po