9 files changed, 188 insertions, 188 deletions
diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm index cf88e7cda..11bf3cba9 100644 --- a/perl-install/bootlook.pm +++ b/perl-install/bootlook.pm @@ -213,14 +213,14 @@ $global_vbox->pack_start ($x_main_frame, 1, 1, 0); #deush : hability to choose the runlevel. my $runl_hbox = new Gtk::HBox; -my $runl_button5 = new Gtk::RadioButton _("5"); -my $runl_button1 = new Gtk::RadioButton _("1"), $runl_button5; +my $runl_button5 = new Gtk::RadioButton ("5"); +my $runl_button1 = new Gtk::RadioButton ("1"), $runl_button5; $runl_hbox->pack_start($runl_button1, 0, 0, 0); -my $runl_button2 = new Gtk::RadioButton _("2"), $runl_button5; +my $runl_button2 = new Gtk::RadioButton ("2"), $runl_button5; $runl_hbox->pack_start($runl_button2, 0, 0, 0); -my $runl_button3 = new Gtk::RadioButton _("3"), $runl_button5; +my $runl_button3 = new Gtk::RadioButton ("3"), $runl_button5; $runl_hbox->pack_start($runl_button3, 0, 0, 0); -my $runl_button4 = new Gtk::RadioButton _("4"), $runl_button5; +my $runl_button4 = new Gtk::RadioButton ("4"), $runl_button5; $runl_hbox->pack_start($runl_button4, 0, 0, 0); $runl_hbox->pack_start($runl_button5, 0, 0, 0); diff --git a/perl-install/help.pm b/perl-install/help.pm index b1ad37b26..afff7e11e 100644 --- a/perl-install/help.pm +++ b/perl-install/help.pm @@ -27,15 +27,15 @@ beginning of installation) will be available after installation, please chose them in list above. If you want select all, you just need to select \"All\"."), selectInstallClass => - __("Please choose \"Install\" if there are no previous version of Linux-Mandrake + __("Please choose \"Install\" if there are no previous version of Mandrake Linux installed or if you wish to use several operating systems. -Please choose \"Update\" if you wish to update an already installed version of Linux-Mandrake. +Please choose \"Update\" if you wish to update an already installed version of Mandrake Linux. Depend of your knowledge in GNU/Linux, you can choose one of the following levels to install or update your -Linux-Mandrake operating system: +Mandrake Linux operating system: * Recommended: if you have never installed a GNU/Linux operating system choose this. Installation will be be very easy and you will be asked only on few questions. @@ -106,10 +106,10 @@ manufacturer's Web site (if you have Internet access) or from Microsoft Windows doPartitionDisks => __("At this point, you need to choose where to install your -Linux-Mandrake operating system on your hard drive. If it is empty or if an +Mandrake Linux operating system on your hard drive. If it is empty or if an existing operating system uses all the space available on it, you need to partition it. Basically, partitioning a hard drive consists of logically -dividing it to create space to install your new Linux-Mandrake system. +dividing it to create space to install your new Mandrake Linux system. Because the effects of the partitioning process are usually irreversible, @@ -136,7 +136,7 @@ configuration, several solutions can be available: * Erase entire disk: if you want delete all data and all partitions present on your hard drive and replace them by - your new Linux-Mandrake system, you can choose this option. Be careful with this solution, you will not be + your new Mandrake Linux system, you can choose this option. Be careful with this solution, you will not be able to revert your choice after confirmation. @@ -144,7 +144,7 @@ configuration, several solutions can be available: all space available on it, you have to create free space for Linux data. To do that you can delete your Microsoft Windows partition and data (see \"Erase entire disk\" or \"Expert mode\" solutions) or resize your Microsoft Windows partition. Resizing can be performed without loss of any data. This solution is - recommended if you want use both Linux-Mandrake and Microsoft Windows on same computer. + recommended if you want use both Mandrake Linux and Microsoft Windows on same computer. Before choosing this solution, please understand that the size of your Microsoft @@ -158,7 +158,7 @@ configuration, several solutions can be available: partition_with_diskdrake => __("At this point, you need to choose what -partition(s) to use to install your new Linux-Mandrake system. If partitions +partition(s) to use to install your new Mandrake Linux system. If partitions have been already defined (from a previous installation of GNU/Linux or from another partitioning tool), you can use existing partitions. In other cases, hard drive partitions must be defined. @@ -256,7 +256,7 @@ With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means \"sec takeOverHdChoose => __("Choose the hard drive you want to erase to install your -new Linux-Mandrake partition. Be careful, all data present on it will be lost +new Mandrake Linux partition. Be careful, all data present on it will be lost and will not be recoverable."), takeOverHdConfirm => @@ -272,7 +272,7 @@ partitions present on this hard drive."), resizeFATChoose => __("More than one Microsoft Windows partition have been detected on your hard drive. Please choose the one you want resize to install -your new Linux-Mandrake operating system. +your new Mandrake Linux operating system. For information, each partition is listed as follow; \"Linux name\", \"Windows @@ -329,7 +329,7 @@ Click on \"OK\" when you are ready to format partitions. Click on \"Cancel\" if you want to choose other partitions to install your new -Linux-Mandrake operating system."), +Mandrake Linux operating system."), choosePackages => __("You may now select the group of packages you wish to @@ -366,7 +366,7 @@ none of those CDs, click Cancel. If only some CDs are missing, unselect them, then click Ok."), installPackages => - __("Your new Linux-Mandrake operating system is currently being + __("Your new Mandrake Linux operating system is currently being installed. This operation should take a few minutes (it depends on size you choose to install and the speed of your computer). @@ -499,10 +499,10 @@ CUPS and LPR. CUPS is a new, powerful and flexible printing system for Unix systems (CUPS means \"Common Unix Printing System\"). It is the default printing system in -Linux-Mandrake. +Mandrake Linux. -LPR is the old printing system used in previous Linux-Mandrake distributions. +LPR is the old printing system used in previous Mandrake Linux distributions. If you don't have printer, click on \"None\"."), @@ -588,7 +588,7 @@ Please see its documentation if you don't know what choose here. You will be able to test your configuration in next step and you will be able to modify it if it doesn't work as you want."), setRootPassword => - __("You can now enter the root password for your Linux-Mandrake system. + __("You can now enter the root password for your Mandrake Linux system. The password must be entered twice to verify that both password entries are identical. @@ -843,7 +843,7 @@ miscellaneous => exitInstall => __("Your system is going to reboot. -After rebooting, your new Linux Mandrake system will load automatically. +After rebooting, your new Mandrake Linux system will load automatically. If you want to boot into another existing operating system, please read the additional instructions."), ); @@ -906,7 +906,7 @@ the additional instructions."), #- #-partitionDisks => #- __("In this stage, you may choose what partition(s) use to install your -#-Linux-Mandrake system."), +#-Mandrake Linux system."), #- #-#At this point, hard drive partitions must be defined. (Unless you #-#are overwriting a previous install of GNU/Linux and have already defined @@ -984,7 +984,7 @@ the additional instructions."), #-panel. #- #- -#-If you install a Linux-Mandrake system on a machine which is part +#-If you install a Mandrake Linux system on a machine which is part #-of an already existing network, the network administrator will #-have given you all necessary information (IP address, network #-submask or netmask for short, and hostname). If you're setting @@ -1021,7 +1021,7 @@ the additional instructions."), #-for a NetWare printer, except that you need no workgroup information."), #- #-setRootPassword => -#- __("You must now enter the root password for your Linux-Mandrake +#- __("You must now enter the root password for your Mandrake Linux #-system. The password must be entered twice to verify that both #-password entries are identical. #- diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 539d2f1e5..da7133d96 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -140,7 +140,7 @@ sub selectLanguage { $o->ask_warn('', _("Your system is low on resource. You may have some problem installing -Linux-Mandrake. If that occurs, you can try a text install instead. For this, +Mandrake Linux. If that occurs, you can try a text install instead. For this, press `F1' when booting on CDROM, then enter `text'.")) if $first_time && availableRamMB() < 60; # 60MB } diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 15b0a50cd..2967b273c 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -86,10 +86,10 @@ sub selectLanguage { $o->{useless_thing_accepted} = $o->ask_from_list_(_("License agreement"), formatAlaTeX( _("Introduction -The operating system and the different components available in the Linux-Mandrake distribution +The operating system and the different components available in the Mandrake Linux distribution shall be called the \"Software Products\" hereafter. The Software Products include, but are not restricted to, the set of programs, methods, rules and documentation related to the operating -system and the different components of the Linux-Mandrake distribution. +system and the different components of the Mandrake Linux distribution. 1. License Agreement @@ -124,7 +124,7 @@ liable for any special, incidental, direct or indirect damages whatsoever (inclu limitation damages for loss of business, interruption of business, financial loss, legal fees and penalties resulting from a court judgment, or any other consequential loss) arising out of the possession and use of software components or arising out of downloading software components -from one of Linux-Mandrake sites which are prohibited or restricted in some countries by local laws. +from one of Mandrake Linux sites which are prohibited or restricted in some countries by local laws. This limited liability applies to, but is not restricted to, the strong cryptography components included in the Software Products. @@ -148,7 +148,7 @@ All rights to the components of the Software Products belong to their respective protected by intellectual property and copyright laws applicable to software programs. MandrakeSoft S.A. reserves its rights to modify or adapt the Software Products, as a whole or in parts, by all means and for all purposes. -\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of MandrakeSoft S.A. +\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of MandrakeSoft S.A. 5. Governing Laws @@ -1167,11 +1167,11 @@ Do you really want to quit now?"), 0); _("Congratulations, installation is complete. Remove the boot media and press return to reboot. -For information on fixes which are available for this release of Linux-Mandrake, -consult the Errata available from http://www.linux-mandrake.com/. +For information on fixes which are available for this release of Mandrake Linux, +consult the Errata available from http://www.mandrakelinux.com/. Information on configuring your system is available in the post -install chapter of the Official Linux-Mandrake User's Guide."), +install chapter of the Official Mandrake Linux User's Guide."), cancel => '', }, [ diff --git a/perl-install/install_steps_newt.pm b/perl-install/install_steps_newt.pm index 7fd1cab1f..20e0293e6 100644 --- a/perl-install/install_steps_newt.pm +++ b/perl-install/install_steps_newt.pm @@ -19,7 +19,7 @@ use common qw(:common); my $banner = __(); sub banner { - my $banner = translate(__("Linux-Mandrake Installation %s")); + my $banner = translate(__("Mandrake Linux Installation %s")); my $l = first(Newt::GetScreenSize) - length($banner) - length($_[0]) + 1; Newt::DrawRootText(0, 0, sprintf($banner, ' ' x $l . $_[0])); } diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot index 35206b229..ed85994e4 100644 --- a/perl-install/share/po/DrakX.pot +++ b/perl-install/share/po/DrakX.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-06-18 19:04+0200\n" +"POT-Creation-Date: 2001-06-21 23:35+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1803,18 +1803,18 @@ msgstr "" #: ../../help.pm_.c:30 msgid "" -"Please choose \"Install\" if there are no previous version of Linux-" -"Mandrake\n" +"Please choose \"Install\" if there are no previous version of Mandrake " +"Linux\n" "installed or if you wish to use several operating systems.\n" "\n" "\n" "Please choose \"Update\" if you wish to update an already installed version " -"of Linux-Mandrake.\n" +"of Mandrake Linux.\n" "\n" "\n" "Depend of your knowledge in GNU/Linux, you can choose one of the following " "levels to install or update your\n" -"Linux-Mandrake operating system:\n" +"Mandrake Linux operating system:\n" "\n" "\t* Recommended: if you have never installed a GNU/Linux operating system " "choose this. Installation will be\n" @@ -1917,10 +1917,10 @@ msgstr "" #: ../../help.pm_.c:108 msgid "" "At this point, you need to choose where to install your\n" -"Linux-Mandrake operating system on your hard drive. If it is empty or if an\n" +"Mandrake Linux operating system on your hard drive. If it is empty or if an\n" "existing operating system uses all the space available on it, you need to\n" "partition it. Basically, partitioning a hard drive consists of logically\n" -"dividing it to create space to install your new Linux-Mandrake system.\n" +"dividing it to create space to install your new Mandrake Linux system.\n" "\n" "\n" "Because the effects of the partitioning process are usually irreversible,\n" @@ -1954,7 +1954,7 @@ msgid "" "\n" "\t* Erase entire disk: if you want delete all data and all partitions " "present on your hard drive and replace them by\n" -"\t your new Linux-Mandrake system, you can choose this option. Be careful " +"\t your new Mandrake Linux system, you can choose this option. Be careful " "with this solution, you will not be\n" "\t able to revert your choice after confirmation.\n" "\n" @@ -1967,7 +1967,7 @@ msgid "" "\"Expert mode\" solutions) or resize your\n" "\t Microsoft Windows partition. Resizing can be performed without loss of " "any data. This solution is\n" -"\t recommended if you want use both Linux-Mandrake and Microsoft Windows on " +"\t recommended if you want use both Mandrake Linux and Microsoft Windows on " "same computer.\n" "\n" "\n" @@ -1988,7 +1988,7 @@ msgstr "" #: ../../help.pm_.c:160 msgid "" "At this point, you need to choose what\n" -"partition(s) to use to install your new Linux-Mandrake system. If " +"partition(s) to use to install your new Mandrake Linux system. If " "partitions\n" "have been already defined (from a previous installation of GNU/Linux or " "from\n" @@ -2115,7 +2115,7 @@ msgstr "" #: ../../help.pm_.c:258 msgid "" "Choose the hard drive you want to erase to install your\n" -"new Linux-Mandrake partition. Be careful, all data present on it will be " +"new Mandrake Linux partition. Be careful, all data present on it will be " "lost\n" "and will not be recoverable." msgstr "" @@ -2139,7 +2139,7 @@ msgid "" "More than one Microsoft Windows partition have been\n" "detected on your hard drive. Please choose the one you want resize to " "install\n" -"your new Linux-Mandrake operating system.\n" +"your new Mandrake Linux operating system.\n" "\n" "\n" "For information, each partition is listed as follow; \"Linux name\", " @@ -2211,7 +2211,7 @@ msgid "" "\n" "Click on \"Cancel\" if you want to choose other partitions to install your " "new\n" -"Linux-Mandrake operating system." +"Mandrake Linux operating system." msgstr "" #: ../../help.pm_.c:335 @@ -2262,7 +2262,7 @@ msgstr "" #: ../../help.pm_.c:369 msgid "" -"Your new Linux-Mandrake operating system is currently being\n" +"Your new Mandrake Linux operating system is currently being\n" "installed. This operation should take a few minutes (it depends on size you\n" "choose to install and the speed of your computer).\n" "\n" @@ -2451,10 +2451,10 @@ msgid "" "CUPS is a new, powerful and flexible printing system for Unix systems (CUPS\n" "means \"Common Unix Printing System\"). It is the default printing system " "in\n" -"Linux-Mandrake.\n" +"Mandrake Linux.\n" "\n" "\n" -"LPR is the old printing system used in previous Linux-Mandrake " +"LPR is the old printing system used in previous Mandrake Linux " "distributions.\n" "\n" "\n" @@ -2568,7 +2568,7 @@ msgstr "" #: ../../help.pm_.c:591 msgid "" -"You can now enter the root password for your Linux-Mandrake system.\n" +"You can now enter the root password for your Mandrake Linux system.\n" "The password must be entered twice to verify that both password entries are " "identical.\n" "\n" @@ -2892,7 +2892,7 @@ msgstr "" msgid "" "Your system is going to reboot.\n" "\n" -"After rebooting, your new Linux Mandrake system will load automatically.\n" +"After rebooting, your new Mandrake Linux system will load automatically.\n" "If you want to boot into another existing operating system, please read\n" "the additional instructions." msgstr "" @@ -3304,7 +3304,7 @@ msgstr "" #: ../../install_steps_gtk.pm_.c:142 msgid "" "Your system is low on resource. You may have some problem installing\n" -"Linux-Mandrake. If that occurs, you can try a text install instead. For " +"Mandrake Linux. If that occurs, you can try a text install instead. For " "this,\n" "press `F1' when booting on CDROM, then enter `text'." msgstr "" @@ -3518,13 +3518,13 @@ msgstr "" msgid "" "Introduction\n" "\n" -"The operating system and the different components available in the Linux-" -"Mandrake distribution \n" +"The operating system and the different components available in the Mandrake " +"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 Linux-Mandrake distribution.\n" +"system and the different components of the Mandrake Linux distribution.\n" "\n" "\n" "1. License Agreement\n" @@ -3578,7 +3578,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 Linux-Mandrake sites which are prohibited or restricted in some " +"from one of Mandrake 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" @@ -3615,7 +3615,7 @@ msgid "" "MandrakeSoft 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" -"\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of " +"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of " "MandrakeSoft S.A. \n" "\n" "\n" @@ -4097,12 +4097,12 @@ msgid "" "Congratulations, installation is complete.\n" "Remove the boot media and press return to reboot.\n" "\n" -"For information on fixes which are available for this release of Linux-" -"Mandrake,\n" -"consult the Errata available from http://www.linux-mandrake.com/.\n" +"For information on fixes which are available for this release of Mandrake " +"Linux,\n" +"consult the Errata available from http://www.mandrakelinux.com/.\n" "\n" "Information on configuring your system is available in the post\n" -"install chapter of the Official Linux-Mandrake User's Guide." +"install chapter of the Official Mandrake Linux User's Guide." msgstr "" #: ../../install_steps_interactive.pm_.c:1179 @@ -4132,7 +4132,7 @@ msgstr "" #: ../../install_steps_newt.pm_.c:22 #, c-format -msgid "Linux-Mandrake Installation %s" +msgid "Mandrake Linux Installation %s" msgstr "" #: ../../install_steps_newt.pm_.c:33 @@ -6442,7 +6442,7 @@ msgstr "" msgid "" "tinyfirewall configurator\n" "\n" -"This configures a personal firewall for this Linux Mandrake machine.\n" +"This configures a personal firewall for this Mandrake Linux machine.\n" "For a powerful dedicated firewall solution, please look to the\n" "specialized MandrakeSecurity Firewall distribution." msgstr "" diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po index 5103a2862..b4a5b5aac 100644 --- a/perl-install/share/po/no.po +++ b/perl-install/share/po/no.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX VERSION\n" -"POT-Creation-Date: 2001-06-18 19:04+0200\n" +"POT-Creation-Date: 2001-06-21 23:35+0200\n" "PO-Revision-Date: 2001-03-13 13:19CET\n" "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n" "Language-Team: Norsk\n" @@ -1972,18 +1972,18 @@ msgstr "" #: ../../help.pm_.c:30 msgid "" -"Please choose \"Install\" if there are no previous version of Linux-" -"Mandrake\n" +"Please choose \"Install\" if there are no previous version of Mandrake " +"Linux\n" "installed or if you wish to use several operating systems.\n" "\n" "\n" "Please choose \"Update\" if you wish to update an already installed version " -"of Linux-Mandrake.\n" +"of Mandrake Linux.\n" "\n" "\n" "Depend of your knowledge in GNU/Linux, you can choose one of the following " "levels to install or update your\n" -"Linux-Mandrake operating system:\n" +"Mandrake Linux operating system:\n" "\n" "\t* Recommended: if you have never installed a GNU/Linux operating system " "choose this. Installation will be\n" @@ -2008,18 +2008,18 @@ msgid "" "knowledge in GNU/Linux. So, don't choose\n" "\t this installation class unless you know what you are doing." msgstr "" -"Velg \"Installer\" hvis det ikke er noen tidligere versjoner av Linux-" -"Mandrake\n" +"Velg \"Installer\" hvis det ikke er noen tidligere versjoner av Mandrake " +"Linux\n" "installert eller hvis du ønsker å bruke flere operativsystem.\n" "\n" "\n" "Velg \"Oppdater\" hvis du ønsker å oppdatere en allerede installert versjon " -"av Linux-Mandrake.\n" +"av Mandrake Linux.\n" "\n" "\n" "Avhengig av din kunnskap i GNU/Linux, kan du velge en av følgende nivåer til " "å installere eller oppdatere\n" -"Linux-Mandrake operativsystemet ditt:\n" +"Mandrake Linux operativsystemet ditt:\n" "\n" "\t* Anbefalt: hvis du aldri har installert et GNU/Linux operativsystem velg " "denne. Installasjonen vil være\n" @@ -2179,10 +2179,10 @@ msgstr "" #: ../../help.pm_.c:108 msgid "" "At this point, you need to choose where to install your\n" -"Linux-Mandrake operating system on your hard drive. If it is empty or if an\n" +"Mandrake Linux operating system on your hard drive. If it is empty or if an\n" "existing operating system uses all the space available on it, you need to\n" "partition it. Basically, partitioning a hard drive consists of logically\n" -"dividing it to create space to install your new Linux-Mandrake system.\n" +"dividing it to create space to install your new Mandrake Linux system.\n" "\n" "\n" "Because the effects of the partitioning process are usually irreversible,\n" @@ -2216,7 +2216,7 @@ msgid "" "\n" "\t* Erase entire disk: if you want delete all data and all partitions " "present on your hard drive and replace them by\n" -"\t your new Linux-Mandrake system, you can choose this option. Be careful " +"\t your new Mandrake Linux system, you can choose this option. Be careful " "with this solution, you will not be\n" "\t able to revert your choice after confirmation.\n" "\n" @@ -2229,7 +2229,7 @@ msgid "" "\"Expert mode\" solutions) or resize your\n" "\t Microsoft Windows partition. Resizing can be performed without loss of " "any data. This solution is\n" -"\t recommended if you want use both Linux-Mandrake and Microsoft Windows on " +"\t recommended if you want use both Mandrake Linux and Microsoft Windows on " "same computer.\n" "\n" "\n" @@ -2247,12 +2247,12 @@ msgid "" "\t don't choose this solution unless you know what you are doing." msgstr "" "På dette punktet må du velge hvor du skal installere ditt\n" -"Linux-Mandrake operativsystem på harddisken din. Hvis den er tom eller hvis " +"Mandrake Linux operativsystem på harddisken din. Hvis den er tom eller hvis " "et\n" "eksisterende operativsystem bruker all tilgjengelig plass må du\n" "partisjonere denne. I basis består partisjonering av en harddisk av å " "logisk\n" -"dele denne for å opprette plass til installere ditt nye Linux-Mandrake " +"dele denne for å opprette plass til installere ditt nye Mandrake Linux " "system.\n" "\n" "\n" @@ -2287,7 +2287,7 @@ msgstr "" "\n" "\t* Slett hele disken: hvis du ønsker å slette alle data og alle partisjoner " "på harddisken din og erstatte disse med\n" -"\t ditt nye Linux-Mandrake system, kan du velge dette valget. Vær forsiktig " +"\t ditt nye Mandrake Linux system, kan du velge dette valget. Vær forsiktig " "med denne løsningen, du vil ikke kunne\n" "\t gjøre om valget ditt etter bekreftelse.\n" "\n" @@ -2300,7 +2300,7 @@ msgstr "" "\"Ekspert modus\" løsninger) eller endre størrelsen på din\n" "\t Microsoft Windows partisjon. Endring av størrelse kan utføres uten tap " "av noen data. Denne løsningen \n" -"\t anbefales hvis du ønsker å bruke både Linux-Mandrake og Microsoft " +"\t anbefales hvis du ønsker å bruke både Mandrake Linux og Microsoft " "Windows på samme maskin.\n" "\n" "\n" @@ -2321,7 +2321,7 @@ msgstr "" #: ../../help.pm_.c:160 msgid "" "At this point, you need to choose what\n" -"partition(s) to use to install your new Linux-Mandrake system. If " +"partition(s) to use to install your new Mandrake Linux system. If " "partitions\n" "have been already defined (from a previous installation of GNU/Linux or " "from\n" @@ -2401,7 +2401,7 @@ msgid "" "a spare kernel and ramdisk image for emergency boot situations." msgstr "" "På dette punktet må du velge hvilken\n" -"partisjon(er) som skal brukes til å installere ditt nye Linux-Mandrake " +"partisjon(er) som skal brukes til å installere ditt nye Mandrake Linux " "system. Hvis partisjoner\n" "allerede har blitt definert (fra en tidligere installasjon av GNU/Linux " "eller fra\n" @@ -2564,12 +2564,12 @@ msgstr "" #: ../../help.pm_.c:258 msgid "" "Choose the hard drive you want to erase to install your\n" -"new Linux-Mandrake partition. Be careful, all data present on it will be " +"new Mandrake Linux partition. Be careful, all data present on it will be " "lost\n" "and will not be recoverable." msgstr "" "Velg den harddisken du ønsker å slette for å installere din\n" -"nye Linux-Mandrake partisjon. Vær forsiktig, alle data på denne vil gå tapt\n" +"nye Mandrake Linux partisjon. Vær forsiktig, alle data på denne vil gå tapt\n" "og kan ikke bli gjenopprettet." #: ../../help.pm_.c:263 @@ -2600,7 +2600,7 @@ msgid "" "More than one Microsoft Windows partition have been\n" "detected on your hard drive. Please choose the one you want resize to " "install\n" -"your new Linux-Mandrake operating system.\n" +"your new Mandrake Linux operating system.\n" "\n" "\n" "For information, each partition is listed as follow; \"Linux name\", " @@ -2639,7 +2639,7 @@ msgstr "" "Mer enn en Microsoft Windows partisjon har blitt\n" "oppdaget på harddisken din. Vennligst velg den du ønsker å endre størrelsen " "på for å\n" -"installere ditt nye Linux-Mandrake operativsystem.\n" +"installere ditt nye Mandrake Linux operativsystem.\n" "\n" "\n" "For informasjon, hver partisjon er listet som følger: \"Linux navn\", " @@ -2708,7 +2708,7 @@ msgid "" "\n" "Click on \"Cancel\" if you want to choose other partitions to install your " "new\n" -"Linux-Mandrake operating system." +"Mandrake Linux operating system." msgstr "" "Partisjoner som nylig har blitt definert må\n" "formateres for bruk (formatering betyr å opprette et filsystem).\n" @@ -2739,7 +2739,7 @@ msgstr "" "\n" "Klikk på \"Avbryt\" hvis du ønsker å velge andre partisjoner å installere " "ditt nye\n" -"Linux-Mandrake operating system på." +"Mandrake Linux operating system på." #: ../../help.pm_.c:335 msgid "" @@ -2822,14 +2822,14 @@ msgstr "" #: ../../help.pm_.c:369 msgid "" -"Your new Linux-Mandrake operating system is currently being\n" +"Your new Mandrake Linux operating system is currently being\n" "installed. This operation should take a few minutes (it depends on size you\n" "choose to install and the speed of your computer).\n" "\n" "\n" "Please be patient." msgstr "" -"Ditt nye Linux-Mandrake operativsystem blir nå\n" +"Ditt nye Mandrake Linux operativsystem blir nå\n" "installert. Denne operasjonen burde ta noen minutter (avhengig av størrelsen " "du\n" "valgte å installere og hastigheten på maskinen din).\n" @@ -3113,10 +3113,10 @@ msgid "" "CUPS is a new, powerful and flexible printing system for Unix systems (CUPS\n" "means \"Common Unix Printing System\"). It is the default printing system " "in\n" -"Linux-Mandrake.\n" +"Mandrake Linux.\n" "\n" "\n" -"LPR is the old printing system used in previous Linux-Mandrake " +"LPR is the old printing system used in previous Mandrake Linux " "distributions.\n" "\n" "\n" @@ -3130,10 +3130,10 @@ msgstr "" "CUPS er et nytt, kraftig og fleksibelt utskriftsystem for Unix systemer " "(CUPS\n" "betyr \"Common Unix Printing System\"). Det er standard utskriftsystem i\n" -"Linux-Mandrake.\n" +"Mandrake Linux.\n" "\n" "\n" -"LPR er det gamle utskriftsystemet brukt i tidligere Linux-Mandrake " +"LPR er det gamle utskriftsystemet brukt i tidligere Mandrake Linux " "distribusjoner.\n" "\n" "\n" @@ -3327,7 +3327,7 @@ msgstr "" #: ../../help.pm_.c:591 msgid "" -"You can now enter the root password for your Linux-Mandrake system.\n" +"You can now enter the root password for your Mandrake Linux system.\n" "The password must be entered twice to verify that both password entries are " "identical.\n" "\n" @@ -3348,7 +3348,7 @@ msgid "" "to\n" "remember it without too much effort." msgstr "" -"Du kan nå entre root-passordet for Linux-Mandrake systemet ditt.\n" +"Du kan nå entre root-passordet for Mandrake Linux systemet ditt.\n" "Passordet må entres to ganger for å verifisere at begge passordinntastingene " "er identiske.\n" "\n" @@ -3898,13 +3898,13 @@ msgstr "" msgid "" "Your system is going to reboot.\n" "\n" -"After rebooting, your new Linux Mandrake system will load automatically.\n" +"After rebooting, your new Mandrake Linux system will load automatically.\n" "If you want to boot into another existing operating system, please read\n" "the additional instructions." msgstr "" "Systemet ditt vil bli startet på nytt.\n" "\n" -"Etter omstart vil ditt nye Linux Mandrake system bli automatisk lastet.\n" +"Etter omstart vil ditt nye Mandrake Linux system bli automatisk lastet.\n" "Hvis du ønsker å starte et annet eksisterende operativsystem, vennligst\n" "les ytterligere instruksjoner." @@ -4357,12 +4357,12 @@ msgstr "Bruke eksisterende konfigurasjon for X11?" #: ../../install_steps_gtk.pm_.c:142 msgid "" "Your system is low on resource. You may have some problem installing\n" -"Linux-Mandrake. If that occurs, you can try a text install instead. For " +"Mandrake Linux. If that occurs, you can try a text install instead. For " "this,\n" "press `F1' when booting on CDROM, then enter `text'." msgstr "" "Systemet ditt har lite ressurser. Du kan muligens oppleve noen problemer\n" -"ved installering av Linux-Mandrake. Hvis dette skjer kan du prøve tekst- " +"ved installering av Mandrake Linux. Hvis dette skjer kan du prøve tekst- " "installering\n" "i stedet. Trykk `F1' ved oppstart av CD-ROM, skriv så `text'." @@ -4623,13 +4623,13 @@ msgstr "License agreement" msgid "" "Introduction\n" "\n" -"The operating system and the different components available in the Linux-" -"Mandrake distribution \n" +"The operating system and the different components available in the Mandrake " +"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 Linux-Mandrake distribution.\n" +"system and the different components of the Mandrake Linux distribution.\n" "\n" "\n" "1. License Agreement\n" @@ -4683,7 +4683,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 Linux-Mandrake sites which are prohibited or restricted in some " +"from one of Mandrake 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" @@ -4720,7 +4720,7 @@ msgid "" "MandrakeSoft 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" -"\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of " +"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of " "MandrakeSoft S.A. \n" "\n" "\n" @@ -4741,13 +4741,13 @@ msgid "" msgstr "" "Introduction\n" "\n" -"The operating system and the different components available in the Linux-" -"Mandrake distribution \n" +"The operating system and the different components available in the Mandrake " +"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 Linux-Mandrake distribution.\n" +"system and the different components of the Mandrake Linux distribution.\n" "\n" "\n" "1. License Agreement\n" @@ -4801,7 +4801,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 Linux-Mandrake sites which are prohibited or restricted in some " +"from one of Mandrake 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" @@ -4838,7 +4838,7 @@ msgstr "" "MandrakeSoft 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" -"\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of " +"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of " "MandrakeSoft S.A. \n" "\n" "\n" @@ -5407,22 +5407,22 @@ msgid "" "Congratulations, installation is complete.\n" "Remove the boot media and press return to reboot.\n" "\n" -"For information on fixes which are available for this release of Linux-" -"Mandrake,\n" -"consult the Errata available from http://www.linux-mandrake.com/.\n" +"For information on fixes which are available for this release of Mandrake " +"Linux,\n" +"consult the Errata available from http://www.mandrakelinux.com/.\n" "\n" "Information on configuring your system is available in the post\n" -"install chapter of the Official Linux-Mandrake User's Guide." +"install chapter of the Official Mandrake Linux User's Guide." msgstr "" "Gratulerer, installasjonen er fullført.\n" "Fjern oppstartsmediet og trykk return for å starte på nytt.\n" "\n" -"For informasjon om endringer som er tilgjengelige for denne utgaven av Linux-" -"Mandrake,\n" -"sjekk errataen tilgjengelig fra http://www.linux-mandrake.com/.\n" +"For informasjon om endringer som er tilgjengelige for denne utgaven av " +"Mandrake Linux,\n" +"sjekk errataen tilgjengelig fra http://www.mandrakelinux.com/.\n" "\n" "Informasjon om konfigurering av systemet ditt finnes i post\n" -"install-kapittelet i Official Linux Mandrake User's Guide." +"install-kapittelet i Official Mandrake Linux User's Guide." #: ../../install_steps_interactive.pm_.c:1179 msgid "Generate auto install floppy" @@ -5456,8 +5456,8 @@ msgstr "Lagre pakkevalg" #: ../../install_steps_newt.pm_.c:22 #, c-format -msgid "Linux-Mandrake Installation %s" -msgstr "Linux-Mandrake installasjon %s" +msgid "Mandrake Linux Installation %s" +msgstr "Mandrake Linux installasjon %s" #: ../../install_steps_newt.pm_.c:33 msgid "" @@ -8039,13 +8039,13 @@ msgstr "" msgid "" "tinyfirewall configurator\n" "\n" -"This configures a personal firewall for this Linux Mandrake machine.\n" +"This configures a personal firewall for this Mandrake Linux machine.\n" "For a powerful dedicated firewall solution, please look to the\n" "specialized MandrakeSecurity Firewall distribution." msgstr "" "tinyfirewall konfigurering\n" "\n" -"Dette konfigurerer en personlig brannmur for denne Linux Mandrake maskinen.\n" +"Dette konfigurerer en personlig brannmur for denne Mandrake Linux maskinen.\n" "For en kraftig dedikert brannmurløsning ta en kikk på den\n" "spesialiserte MandrakeSecurity Firewall distribusjonen." diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po index 91146b8a0..51a9f51b4 100644 --- a/perl-install/share/po/sp.po +++ b/perl-install/share/po/sp.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX VERSION\n" -"POT-Creation-Date: 2001-06-18 19:04+0200\n" +"POT-Creation-Date: 2001-06-21 23:35+0200\n" "PO-Revision-Date: 2001-03-20 07:46+0200\n" "Last-Translator: Jankovic Tomislav <tomaja@net.yu>\n" "Language-Team: Serbian (cyrillic)\n" @@ -1953,18 +1953,18 @@ msgstr "" #: ../../help.pm_.c:30 msgid "" -"Please choose \"Install\" if there are no previous version of Linux-" -"Mandrake\n" +"Please choose \"Install\" if there are no previous version of Mandrake " +"Linux\n" "installed or if you wish to use several operating systems.\n" "\n" "\n" "Please choose \"Update\" if you wish to update an already installed version " -"of Linux-Mandrake.\n" +"of Mandrake Linux.\n" "\n" "\n" "Depend of your knowledge in GNU/Linux, you can choose one of the following " "levels to install or update your\n" -"Linux-Mandrake operating system:\n" +"Mandrake Linux operating system:\n" "\n" "\t* Recommended: if you have never installed a GNU/Linux operating system " "choose this. Installation will be\n" @@ -1989,17 +1989,17 @@ msgid "" "knowledge in GNU/Linux. So, don't choose\n" "\t this installation class unless you know what you are doing." msgstr "" -"¸×ÐÑÕàØâÕ \"¸ÝáâÐÛÐæØja\" ãÚÞÛØÚÞ ÝÕÜÐ ßàÕâåÞÔÝÕ ÒÕà×ØjÕLinux-Mandrake\n" +"¸×ÐÑÕàØâÕ \"¸ÝáâÐÛÐæØja\" ãÚÞÛØÚÞ ÝÕÜÐ ßàÕâåÞÔÝÕ ÒÕà×ØjÕMandrake Linux\n" "ÚÞjÐ jÕ ØÝáâÐÛØàÐÝÐ ØÛØ åÞûÕâÕ ÔÐ ÚÞàØáâØâÕ ÒØèÕ ÞßÕàÐâØÒÝØå áØáâÕÜa.\n" "\n" "\n" -"¸×ÐÑÕàØâe \"AÖãàØàaúe\" ãÚÞÛØÚÞ ÖÕÛØâÕ ÔÐ aÖãàØàaâÕ ßÞáâÞjeûã ÒÕà×Øjã Linux-" -"Mandrake-a.\n" +"¸×ÐÑÕàØâe \"AÖãàØàaúe\" ãÚÞÛØÚÞ ÖÕÛØâÕ ÔÐ aÖãàØàaâÕ ßÞáâÞjeûã ÒÕà×Øjã " +"Mandrake Linux-a.\n" "\n" "\n" "à ×ÐÒØáÝÞáâØ ÞÔ ÒaèÕÓ ßÞ×ÝÐÒaúÐ GNU/Linux-a, ÜÞÖÕâÕ Ø×ÐÑàÐâØ jÕÔÝã ÞÔ " "áÛÕÔeûØå ÝØÒÞÐ ×Ð ØÝáâÐÛÐæØjã ØÛØ aÖãàØàaúÕ\n" -"Linux-Mandrake ÞßÕàÐâØÒÝÞÓ áØáâÕÜa:\n" +"Mandrake Linux ÞßÕàÐâØÒÝÞÓ áØáâÕÜa:\n" "\n" "\t* ¿àÕßÞàãçÕÝÞ: ãÚÞÛØÚÞ ÝØÐÚÐÔÐ ÝØáâÕ ØÝáâÐÛØàÐÛØ GNU/Linux ÞßÕàÐâØÒÝØ " "áØáâÕÜ Ø×ÐÑÕàØâÕ ÞÒÞ. ¸ÝáâÐÛÐæØjÐ ûÕ ÑØâØ\n" @@ -2092,7 +2092,7 @@ msgstr "" "Ø×ÒÞàÝÞÓ ÚÞÔa, ØÛØ ×Ð ÚàÕØàaúÕ áÞäâÒÕàáÚÞØå ßÐÚÕâa.\n" "\n" "\n" -" - ÁÕàÒÕà: Ø×ÐÑÕàØâÕ ÞÒÞ ãÚÞÛØÚÞ ØÜÐâÕ ÝÐÜÕàã ÔÐ Linux-Mandrake\n" +" - ÁÕàÒÕà: Ø×ÐÑÕàØâÕ ÞÒÞ ãÚÞÛØÚÞ ØÜÐâÕ ÝÐÜÕàã ÔÐ Mandrake Linux\n" "ÚÞàØáâØâÕ ÚÐÞ áÕàÒÕà. ¸ÛØ ÚÐÞ äÐjÛ áÕàÒÕà (NFS ØÛØ SMB),\n" "ØÛØ áÕàÒÕà ßàÞâÞÚÞÛ ×Ð èâÐÜßã(Unix' lp (Line Printer ØÛØ Windows SMB\n" "èâÐÜßaúe) ØÛØ ÐãâÕÝâØçÝØ áÕàÒÕà (NIS), ØÛØ ÚÐÞ áÕàÒÕà ×Ð ÑÐ×ã ßÞÔÐâÐÚa " @@ -2158,10 +2158,10 @@ msgstr "" #: ../../help.pm_.c:108 msgid "" "At this point, you need to choose where to install your\n" -"Linux-Mandrake operating system on your hard drive. If it is empty or if an\n" +"Mandrake Linux operating system on your hard drive. If it is empty or if an\n" "existing operating system uses all the space available on it, you need to\n" "partition it. Basically, partitioning a hard drive consists of logically\n" -"dividing it to create space to install your new Linux-Mandrake system.\n" +"dividing it to create space to install your new Mandrake Linux system.\n" "\n" "\n" "Because the effects of the partitioning process are usually irreversible,\n" @@ -2195,7 +2195,7 @@ msgid "" "\n" "\t* Erase entire disk: if you want delete all data and all partitions " "present on your hard drive and replace them by\n" -"\t your new Linux-Mandrake system, you can choose this option. Be careful " +"\t your new Mandrake Linux system, you can choose this option. Be careful " "with this solution, you will not be\n" "\t able to revert your choice after confirmation.\n" "\n" @@ -2208,7 +2208,7 @@ msgid "" "\"Expert mode\" solutions) or resize your\n" "\t Microsoft Windows partition. Resizing can be performed without loss of " "any data. This solution is\n" -"\t recommended if you want use both Linux-Mandrake and Microsoft Windows on " +"\t recommended if you want use both Mandrake Linux and Microsoft Windows on " "same computer.\n" "\n" "\n" @@ -2226,11 +2226,11 @@ msgid "" "\t don't choose this solution unless you know what you are doing." msgstr "" "à ÞÒÞÜ âàÕÝãâÚã, ÜÞàÐâÕ ÔÐ Ø×ÐÑÕàÕâÕ ÓÔÕ ûÕâÕ ØÝáâÐÛØàÐâØ\n" -"Linux-Mandrake ÞßÕàÐâØÒÝØ áØáâÕÜ ÝÐ Òaè åÐàÔ ÔØáÚ. ÃÚÞÛØÚÞ jÕ ßàÐ×ÐÝ ØÛØ\n" +"Mandrake Linux ÞßÕàÐâØÒÝØ áØáâÕÜ ÝÐ Òaè åÐàÔ ÔØáÚ. ÃÚÞÛØÚÞ jÕ ßàÐ×ÐÝ ØÛØ\n" "ßÞáâÞjeûØ ÞßÕàÐâØÒÝØ áØáâÕÜ ÚÞàØáâØ áÐÒ ßÞáâÞjeûØ ßàÞáâÞà ÝÐ ÔØáÚã, âàÕÑÐ Ôa " "ÓÐ\n" "ßÐàâØæØÞÝØàÐâe. à ÞáÝÞÒØ, ßÐàâØæØÞÝØàaúÕ åÐàÔ ÔØáÚa áÕ áÐáâÞjØ ÛÞÓØçÚÞÓ\n" -"ÔeùeúÐ ÔÐ ÑØ ÞÑÕ×ÑÕÔØÛØ ßàÞáâÞà ×Ð ØÝáâÐÛÐæØjã Òaè ÝÞÒØ Linux-Mandrake " +"ÔeùeúÐ ÔÐ ÑØ ÞÑÕ×ÑÕÔØÛØ ßàÞáâÞà ×Ð ØÝáâÐÛÐæØjã Òaè ÝÞÒØ Mandrake Linux " "áØáâÕÜ.\n" "\n" "\n" @@ -2263,7 +2263,7 @@ msgstr "" "\n" "\t* ±àØáaúÕ æÕÛÞÓ ÔØáÚa: ãÚÞÛØÚÞ ÖÕÛØâÕ ÔÐ Ø×ÑàØèÕâÕ áÒÕ ßÞÔÐâÚÕ Ø áÒÕ " "ßÐàâØæØje ÚÞjØ ßÞáâÞjÕ ÝÐ ÒaèÕÜ åÐàÔ ÔØáÚã Ø ×ÐÜÕÝØâÕ Øå ÒaèØÜ\n" -"\t ÝÞÒØÜ Linux-Mandrake áØáâÕÜÞÜ, ÜÞÖÕâÕ ÔÐ Ø×ÐÑÕàÕâÕ ÞÒã ÞæØjã. ±ãÔØâÕ " +"\t ÝÞÒØÜ Mandrake Linux áØáâÕÜÞÜ, ÜÞÖÕâÕ ÔÐ Ø×ÐÑÕàÕâÕ ÞÒã ÞæØjã. ±ãÔØâÕ " "ßaÖùØÒØáÐ ÞÒÞÜ ÞßæØjÞÜ, jÕà ÝeûÕâÕ ÑØâØ ã ÜÞÓãûÝÞáâØ\n" "\t ÔÐ ßÞÒàÐâØâÕ áâÐàÞ áâaúe ÝÐÚÞÝ ßÞâÒàÔe.\n" "\n" @@ -2276,7 +2276,7 @@ msgstr "" "ØÛØ \"EÚáßÕàâÝØ ÜÞÔ\" àeèeúa) ØÛØ ÔÐ ßàÞÜÕÝØâÕ ÒeÛØçØÝã\n" "\t Microsoft Windows ßÐàâØæØje. ÂÐj ßÞáâãßÐÚ áÕ ÜÞÖe Ø×ÒÕáâØ ÑÕ× " "ÓãÑùeúÐßÞÔÐâÐÚa. ¾ÒÞ àeèeúÕ áÕ ßàÕßÞàãçãje\n" -"\t ãÚÞÛØÚÞ ÖÕÛØâÕ ÔÐ ÚÞàØáâØâÕ Linux-Mandrake Ø Microsoft Windows ÝaØáâÞÜ " +"\t ãÚÞÛØÚÞ ÖÕÛØâÕ ÔÐ ÚÞàØáâØâÕ Mandrake Linux Ø Microsoft Windows ÝaØáâÞÜ " "ÚÞÜßjãâÕàã.\n" "\n" "\n" @@ -2295,7 +2295,7 @@ msgstr "" #: ../../help.pm_.c:160 msgid "" "At this point, you need to choose what\n" -"partition(s) to use to install your new Linux-Mandrake system. If " +"partition(s) to use to install your new Mandrake Linux system. If " "partitions\n" "have been already defined (from a previous installation of GNU/Linux or " "from\n" @@ -2375,7 +2375,7 @@ msgid "" "a spare kernel and ramdisk image for emergency boot situations." msgstr "" "½Ð ÞÒÞj âaçÚØ, ÜÞàÐâÕ Ø×ÑàÐâØ ÚÞjã\n" -"ßÐàâØæØjã(e) ÖÕÛØâÕ ÔÐ ÚÞàØáâØâÕ ×Ð ØÝáâÐÛÐæØjã ÝÞÒÞÓ Linux-Mandrake " +"ßÐàâØæØjã(e) ÖÕÛØâÕ ÔÐ ÚÞàØáâØâÕ ×Ð ØÝáâÐÛÐæØjã ÝÞÒÞÓ Mandrake Linux " "áØáâÕÜa. ÃÚÞÛØÚÞ áã ßÐàâØæØje\n" "Òeû ÔÕäØÝØáÐÝÕ (ÞÔ ßàÕÔåÞÔÝÕ ØÝáâÐÛÐæØjÕ ØÛØ ÞÔ áâàÐÝe\n" "ÔàãÓÞÓ ÐÛÐâÐ ×Ð ßÐàâØæØje), ÜÞÖÕâÕ ÔÐ ÚÞàØáâØâÕ ßÞáâÞjeûÕ ßÐàâØæØje. à " @@ -2537,12 +2537,12 @@ msgstr "" #: ../../help.pm_.c:258 msgid "" "Choose the hard drive you want to erase to install your\n" -"new Linux-Mandrake partition. Be careful, all data present on it will be " +"new Mandrake Linux partition. Be careful, all data present on it will be " "lost\n" "and will not be recoverable." msgstr "" "¸×ÐÑÕàØâÕ åÐàÔ ÔØáÚ ÚÞjØ ÖÕÛØâÕ ÔÐ Ø×ÑàØèÕâe ÔÐ ÑØ ØÝáâÐÛØàÐÛØ \n" -"ÝÞÒã Linux-Mandrake ßÐàâØæØjã. ±ãÔØâÕ ßaÖùØÒØ, áÒØ ßÞÔÐæØ ÝÐ úÕÜã ûÕ ÑØâØ " +"ÝÞÒã Mandrake Linux ßÐàâØæØjã. ±ãÔØâÕ ßaÖùØÒØ, áÒØ ßÞÔÐæØ ÝÐ úÕÜã ûÕ ÑØâØ " "Ø×ÓãÑùÕÝØ\n" "Ø ÝeûÕ áÕ ÜÞûØ ßÞÒàÐâØâØ." @@ -2573,7 +2573,7 @@ msgid "" "More than one Microsoft Windows partition have been\n" "detected on your hard drive. Please choose the one you want resize to " "install\n" -"your new Linux-Mandrake operating system.\n" +"your new Mandrake Linux operating system.\n" "\n" "\n" "For information, each partition is listed as follow; \"Linux name\", " @@ -2611,7 +2611,7 @@ msgid "" msgstr "" "JÕÔÝÐ ØÛØ ÒØèÕ ¼icrosoft Windows ßÐàâØæØjÐ jÕ ÔÕâÕÚâÞÒÐÝÞ \n" "ÝÐ åÐàÔ ÔØáÚã. ¸×ÐÑÕàØâÕ ÚÞjã ÞÔ úØå ÖÕÛØâÕ ÔÐ áÜaúØâÕ ÔÐ ÑØ ØÝáâÐÛØàÐÛØ\n" -"ÝÞÒØ Linux-Mandrake ÞßÕàÐâØÒÝØ áØáâÕÜ.\n" +"ÝÞÒØ Mandrake Linux ÞßÕàÐâØÒÝØ áØáâÕÜ.\n" "\n" "\n" "¸ÝäÞàÜÐæØja: áÒÐÚÐ ßÐàâØæØjÐ jÕ ØáßØáÐÝÐ ÝÐ áÛÕÔeûØ ÝaçØÝ: \"¸ÜÕ Linux-a\", " @@ -2681,7 +2681,7 @@ msgid "" "\n" "Click on \"Cancel\" if you want to choose other partitions to install your " "new\n" -"Linux-Mandrake operating system." +"Mandrake Linux operating system." msgstr "" "ÁÒÐÚÐ ßÐàâØæØjÐ ÚÞjÐ jÕ ÝÞÒÞÔÕäØÝØáÐÝÐ ÜÞàa ÑØâØ\n" "äÞàÜÐâØàÐÝÐ ×Ð ãßâàÕÑã (äÞàÜÐâØàaúÕ ×ÝÐçØ ÚàÕØàaúÕ ÔÐâÞâeçÝÞÓ(äÐjÛ) " @@ -2710,7 +2710,7 @@ msgstr "" "\n" "ºÛØÚÝØâÕ ÝÐ \"¿ÞÝØèâØ\" ãÚÞÛØÚÞ ÖÕÛØâÕ ÔÐ Ø×ÐÑÕàÕÕâÕ ÔàãÓÕ ßÐàâØæØjÕ ×Ð " "ØÝáâÐÛÐæØjã ÝÞÒÞÓ\n" -"Linux-Mandrake ÞßÕàÐâØÒÝÞÓ áØáâÕÜa." +"Mandrake Linux ÞßÕàÐâØÒÝÞÓ áØáâÕÜa." #: ../../help.pm_.c:335 msgid "" @@ -2795,14 +2795,14 @@ msgstr "" #: ../../help.pm_.c:369 msgid "" -"Your new Linux-Mandrake operating system is currently being\n" +"Your new Mandrake Linux operating system is currently being\n" "installed. This operation should take a few minutes (it depends on size you\n" "choose to install and the speed of your computer).\n" "\n" "\n" "Please be patient." msgstr "" -"²aè ÝÞÒØ Linux-Mandrake ÞßÕàÐâØÒÝØ áØáâÕÜ áÕ âàÕÝãâÝÞ\n" +"²aè ÝÞÒØ Mandrake Linux ÞßÕàÐâØÒÝØ áØáâÕÜ áÕ âàÕÝãâÝÞ\n" "ØÝáâÐÛØàa. ¾ÒÐ ÞßÕàÐæØjÐ ÑØ âàÕÑÐÛÐ ÔÐ ßÞâàÐjÕ ÝÕÚÞÛØÚÞ ÜØÝãâa (ã ×ÐÒØáÝÞáâØ " "ÞÔ ÒÕÛØçØÝe\n" "ßÐÚÕâÐ ÚÞjØ áÕ ØÝáâÐÛØàÐjã Ø Ñà×ØÝÕ ÒaèÕÓ ÚÞÜßjãâÕàa).\n" @@ -3084,10 +3084,10 @@ msgid "" "CUPS is a new, powerful and flexible printing system for Unix systems (CUPS\n" "means \"Common Unix Printing System\"). It is the default printing system " "in\n" -"Linux-Mandrake.\n" +"Mandrake Linux.\n" "\n" "\n" -"LPR is the old printing system used in previous Linux-Mandrake " +"LPR is the old printing system used in previous Mandrake Linux " "distributions.\n" "\n" "\n" @@ -3101,10 +3101,10 @@ msgstr "" "CUPS jÕ ÝÞÒØ, ÜÞûÝØ Ø äÛÕÚáØÑØÛÝØ áØáâÕÜ ×Ð èâÐÜßaúÕ ×Ð Unix áØáâÕÜe (CUPS\n" "jÕ áÚàaûÕÝØæÐ ×Ð \"Common Unix Printing System\"). ¾Ý jÕ ßÞáâÐÒùÕÝ ×Ð " "default áØáâÕÜ ×Ð èâÐÜßaúÕ ã\n" -"Linux-Mandrake-ã.\n" +"Mandrake Linux-ã.\n" "\n" "\n" -"LPR jÕ áâÐàØ áØáâÕÜ ×Ð èâÐÜßaúÕ ÚÞjØ áÕ ÚÞàØáâØÞ ã ßàÕâåÞÔÝØÜ Linux-Mandrake " +"LPR jÕ áâÐàØ áØáâÕÜ ×Ð èâÐÜßaúÕ ÚÞjØ áÕ ÚÞàØáâØÞ ã ßàÕâåÞÔÝØÜ Mandrake Linux " "ÔØáâàØÑãæØjÐÜa.\n" "\n" "\n" @@ -3304,7 +3304,7 @@ msgstr "" #: ../../help.pm_.c:591 msgid "" -"You can now enter the root password for your Linux-Mandrake system.\n" +"You can now enter the root password for your Mandrake Linux system.\n" "The password must be entered twice to verify that both password entries are " "identical.\n" "\n" @@ -3325,7 +3325,7 @@ msgid "" "to\n" "remember it without too much effort." msgstr "" -"ÁÐÔa, ÜÞÖÕâe ãÝÕâØ root ÛÞ×ØÝÚã ×Ð Òaè Linux-Mandrake áØáâÕÜ.\n" +"ÁÐÔa, ÜÞÖÕâe ãÝÕâØ root ÛÞ×ØÝÚã ×Ð Òaè Mandrake Linux áØáâÕÜ.\n" "»Þ×ØÝÚÐ ÜÞàÐ ÑØâØ ãÝÕâÐ ÔÒÐ ßãâÐ àÐÔØ ÒÕàØäØÚÐæØjÕ ÔÐ áã ÞÑÐ ãÝÞáÐ\n" "ÛÞ×ØÝÚØ Øáâa.\n" "\n" @@ -3873,13 +3873,13 @@ msgstr "" msgid "" "Your system is going to reboot.\n" "\n" -"After rebooting, your new Linux Mandrake system will load automatically.\n" +"After rebooting, your new Mandrake Linux system will load automatically.\n" "If you want to boot into another existing operating system, please read\n" "the additional instructions." msgstr "" "ÁØáâÕÜ ûÕ áÕ àÕáÕâÞÒÐâØ.\n" "\n" -"¿ÞáÛÕ àÕáÕâÞÒÐúÐ, ÒÐè ÝÞÒØ Linux-Mandrake áØáâÕÜ ûÕ áÕ ßÞÔØûØ ÐãâÞÜÐâáÚØ.\n" +"¿ÞáÛÕ àÕáÕâÞÒÐúÐ, ÒÐè ÝÞÒØ Mandrake Linux áØáâÕÜ ûÕ áÕ ßÞÔØûØ ÐãâÞÜÐâáÚØ.\n" "ÃÚÞÛØÚÞ ÖÕÛØâÕ ÔÐ ßÞÔØÓÝÕâÕ ÝÕÚØ ÔàãÓØ ØÝáâÐÛØàÐÝØ ÞßÕàÐâØÒÝØ áØáâÕÜ,\n" "ßàÞçØâÐâÕ ãßãáâÒÞ ØÛØ ßÞáÕâØâÕ ÝÕÚØ ÞÔ Linux chat ÚÐÝÐÛÐ." @@ -4324,13 +4324,13 @@ msgstr "´Ð ÛØ ÔÐ ÚÞàØáâØÜ ßÞáâÞøÕûã ÚÞÝäØÓãàÐæØøã ×Ð X11 ?" #: ../../install_steps_gtk.pm_.c:142 msgid "" "Your system is low on resource. You may have some problem installing\n" -"Linux-Mandrake. If that occurs, you can try a text install instead. For " +"Mandrake Linux. If that occurs, you can try a text install instead. For " "this,\n" "press `F1' when booting on CDROM, then enter `text'." msgstr "" "²aè áØáâÕÜ ØÜÐ ÜaúÐÚ áÝÐÓÕ. ÃáÛÕÔ âÞÓÐ ÜÞÖÕâÕ ØÜaâØ ßàÞÑÛÕÜÐ ßàØ " "ØÝáâÐÛÐæØjØ\n" -"Linux-Mandrake. ÃÚÞÛØÚÞ áÕ ÞÝØ ßÞjÐÒe, ÜÞÖÕâÕ ßàÞÑÐâØ âÕÚáâãÐÛÝã " +"Mandrake Linux. ÃÚÞÛØÚÞ áÕ ÞÝØ ßÞjÐÒe, ÜÞÖÕâÕ ßàÞÑÐâØ âÕÚáâãÐÛÝã " "ØÝáâÐÛÐæØjã. ´Ð ÑØ âÞ ßÞáâØÓÛØ,\n" "ßàØâØáÝØâe `F1' ßàØ áâÐàâaúã áÐ CDROM-a, Ð ÞÝÔÐ ãÚãæÐjâe `text'." @@ -4593,13 +4593,13 @@ msgstr "»¸æÕÝæØàÐÝØ ãÓÞÒÞà" msgid "" "Introduction\n" "\n" -"The operating system and the different components available in the Linux-" -"Mandrake distribution \n" +"The operating system and the different components available in the Mandrake " +"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 Linux-Mandrake distribution.\n" +"system and the different components of the Mandrake Linux distribution.\n" "\n" "\n" "1. License Agreement\n" @@ -4653,7 +4653,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 Linux-Mandrake sites which are prohibited or restricted in some " +"from one of Mandrake 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" @@ -4690,7 +4690,7 @@ msgid "" "MandrakeSoft 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" -"\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of " +"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of " "MandrakeSoft S.A. \n" "\n" "\n" @@ -4711,13 +4711,13 @@ msgid "" msgstr "" "ÃßÞ×ÝÐÒaúe\n" "\n" -"¾ßÕàÐâØÒÝØ áØáâÕÜ Ø ÔàãÓÕ ÚÞÜßÞÝÕÝâÕ ÔÞáâãßÝÕ ã Linux-Mandrake " +"¾ßÕàÐâØÒÝØ áØáâÕÜ Ø ÔàãÓÕ ÚÞÜßÞÝÕÝâÕ ÔÞáâãßÝÕ ã Mandrake Linux " "ÔØáâàØÑãæØjØ \n" "ÝÐ Ôaùe ûÕ ÑØâØ ×ÒÐÝÕ \"ÁÞäâÒÕàáÚØ ¿àÞØ×ÒÞÔØ\" . ÁÞäâÒÕàáÚØ ßàÞØ×ÒÞÔØ " "ãkùãçãjã, ÐÛØ ÝØáã Ø \n" "ÞÓàÐÝØçÕÝØ Ýa, áÚãß ßàÞÓàÐÜa, ÜÕâÞÔa, ßàÐÒØÛÐ Ø ÔÞÚãÜÕÝâÐæØjã ÚÞjÐ je " "ÒÕ×ÐÝa×Ð ÞßÕàÐâØÒÝØ \n" -"áØáâÕÜ Ø ÔàãÓÕ ÚÞÜßÞÝÕÝâÕ Linux-Mandrake ÔØáâàØÑãæØje.\n" +"áØáâÕÜ Ø ÔàãÓÕ ÚÞÜßÞÝÕÝâÕ Mandrake Linux ÔØáâàØÑãæØje.\n" "\n" "\n" "1. »ØæÕÝæÝØ ãÓÞÒÞà\n" @@ -4769,7 +4769,7 @@ msgstr "" "ßàÞØ×ØÛÐ×e \n" "Ø× ãßÞâàÕÑe ØÛØ ÝÕÜÞÓãûÝÞáâØ ÚÞàØèûeúÐ ÁÞäâÒÕàáÚØå ºÞÜßÞÝÕÝâØ ØÛØ ÚÞje " "ßàÞØ×ØÛÐ×e download-ÞÒÐÝØå áÞäâÒÕàáÚØå ÚÞÜßÞÝÕÝâØ \n" -"ÑØÛÞ ÚÞÓ Linux-Mandrake áÐjâÐ ÚÞjØ áã ×ÐÑàaúÕÝØ ØÛØ ÞÓàÐÝØçÕÝØ ã ÝÕÚØÜ " +"ÑØÛÞ ÚÞÓ Mandrake Linux áÐjâÐ ÚÞjØ áã ×ÐÑàaúÕÝØ ØÛØ ÞÓàÐÝØçÕÝØ ã ÝÕÚØÜ " "×ÕÜùÐÜÐ ßÞ ÛÞÚÐÛÝØÜ ×ÐÚÞÝØÜa.\n" "¾ÒÐ ÞÓàÐÝØçÕÝÐ ßàÐÒÐ áÕ ßàØÜeúãjã, ÐÛØ ÝØáã Ø ÞÓàÐÝØçÕÝÐ Ýa,ÚàØßâÞÓàÐäáÚÕ " "ÚÞÜßÞÝÕÝâe \n" @@ -4805,7 +4805,7 @@ msgstr "" "MandrakeSoft S.A. jÕ àÕ×ÕàÒØáÐÞ áÒÞjÐ ßàÐÒÐ ÝÐ ÜÞÔØäØÚÞÒaúÕ ØÛØ ÐÔÐßâÐæØjã " "ÁÞäâÒÕàáÚØå¿àÞØ×ÒÞÔa, ÚÐÚÞ ×Ð æÕÛØÝã âÐÚÞ Ø ×a \n" "ÔÕÛÞÒe, ×Ð áÒÕ áÒÕ áÒàåÕ Ø áÒÕ ãßÞâàÕÑe.\n" -"\"Mandrake\", \"Linux-Mandrake\" Ø ßàØÔàãÖÕÝØ ÛÞÓÞâØßØ Ø Þ×ÝÐÚe MandrakeSoft " +"\"Mandrake\", \"Mandrake Linux\" Ø ßàØÔàãÖÕÝØ ÛÞÓÞâØßØ Ø Þ×ÝÐÚe MandrakeSoft " "S.A. \n" "\n" "\n" @@ -5204,7 +5204,7 @@ msgstr "" "ÞÔ ÝÞàÜÐÛÝÞÓ áâÐàâÕàa. ¾ÒÞ øÕ ÚÞàØáÝÞ ÐÚÞ ÝÕ ÖÕÛØâÕ ÔÐ ØÝáâÐÛØàÐâÕ\n" "SILO(ØÛØ grub) ÝÐ ÒÐè áØáâÕÜ, ÐÚÞ ÔàãÓØ ÞßÕàÐâØÒÝØ áØáâÕÜ ãÚÛÞÝØ SILO, ØÛØ " "SILO ÝÕ\n" -"àÐÔØ áÐ ÒÐèØÜ åÐàÔÒÕàÞÜ. ÁâÐàâÝØ ÔØáÚ ÜÞÖÕâÕ ÚÞàØáâØâØ áÐ Linux Mandrake\n" +"àÐÔØ áÐ ÒÐèØÜ åÐàÔÒÕàÞÜ. ÁâÐàâÝØ ÔØáÚ ÜÞÖÕâÕ ÚÞàØáâØâØ áÐ Mandrake Linux\n" "'ÔØáÚÞÜ ×Ð áßÐáÐÒÐúÕ', èâÞ ÞÛÐÚèÐÒÐ ÞßÞàÐÒÐÚ ã áÛãçÐøã âÕÖÕ åÐÒÐàØøÕ.\n" "ÃÚÞÛØÚÞ ÖÕÛØâÕ ÔÐ ÚàÕØàÐâÕ áâÐàâÝã ÔØáÚÕâã ×Ð ÒÐè áØáâÕÜãÑÐæØâÕ ÔØáÚÕâã ã " "ßÞÓÞÝ Ø ßàØâØáÝØâÕ \"´Ð\"." @@ -5238,7 +5238,7 @@ msgstr "" "ÞÔ ÝÞàÜÐÛÝÞÓ áâÐàâÕàa. ¾ÒÞ øÕ ÚÞàØáÝÞ ÐÚÞ ÝÕ ÖÕÛØâÕ ÔÐ ØÝáâÐÛØàÐâÕ\n" "LILO(ØÛØ grub) ÝÐ ÒÐè áØáâÕÜ, ÐÚÞ ÔàãÓØ ÞßÕàÐâØÒÝØ áØáâÕÜ ãÚÛÞÝØ LILO, ØÛØ " "LILO ÝÕ\n" -"àÐÔØ áÐ ÒÐèØÜ åÐàÔÒÕàÞÜ. ÁâÐàâÝØ ÔØáÚ ÜÞÖÕâÕ ÚÞàØáâØâØ áÐ Linux Mandrake\n" +"àÐÔØ áÐ ÒÐèØÜ åÐàÔÒÕàÞÜ. ÁâÐàâÝØ ÔØáÚ ÜÞÖÕâÕ ÚÞàØáâØâØ áÐ Mandrake Linux\n" "'ÔØáÚÞÜ ×Ð áßÐáÐÒÐúÕ', èâÞ ÞÛÐÚèÐÒÐ ÞßÞàÐÒÐÚ ã áÛãçÐøã âÕÖÕ åÐÒÐàØøÕ.\n" "´Ð ÛØ ÑØáâÕ ÔÐ ÚàÕØàÐâÕ áâÐàâÝã ÔØáÚÕâã ×Ð ÒÐè áØáâÕÜ?" @@ -5342,22 +5342,22 @@ msgid "" "Congratulations, installation is complete.\n" "Remove the boot media and press return to reboot.\n" "\n" -"For information on fixes which are available for this release of Linux-" -"Mandrake,\n" -"consult the Errata available from http://www.linux-mandrake.com/.\n" +"For information on fixes which are available for this release of Mandrake " +"Linux,\n" +"consult the Errata available from http://www.mandrakelinux.com/.\n" "\n" "Information on configuring your system is available in the post\n" -"install chapter of the Official Linux-Mandrake User's Guide." +"install chapter of the Official Mandrake Linux User's Guide." msgstr "" "ÇÕáâØâÐÜÞ, ØÝáâÐÛÐæØøÐ øÕ ×ÐÒàèÕÝÐ.\n" "¸×ÒÐÔØâÕ ÔØáÚÕâã Ø× ÔàÐøÒÐ Ø ßàØâØáÝØâÕ <Enter> ÔÐ áÕ àÐçãÝÐà àÕáÕâãøÕ.\n" "\n" "·Ð ØÝäÞàÜÐæØøÕ Þ ßÞßàÐÒÚÐÜÐ ÚÞøÕ áã ÝÐ àÐáßÞÛÐÓÐúã ×Ð ÞÒÞ Ø×ÔÐúÕ\n" -"Linux Mandrake »ØÝãÚáÐ, ßàÞçØâÐøâÕ ÔÕÞ 'Errata' ÚÞøØ ÜÞÖÕâÕ ÝÐûØ ÝÐ\n" -"http://www.linux-mandrake.com/.\n" +"Mandrake Linux »ØÝãÚáÐ, ßàÞçØâÐøâÕ ÔÕÞ 'Errata' ÚÞøØ ÜÞÖÕâÕ ÝÐûØ ÝÐ\n" +"http://www.mandrakelinux.com/.\n" "\n" "¸ÝäÞàÜÐæØøÕ Þ ÚÞÝäØÓãàØáÐúã ÒÐèÕÓ áØáâÕÜÐ ÜÞÖÕâÕ ÝÐûØ ã ßÞáâ-ØÝáâÐÛÐæØÞÝÞÜ\n" -"ßÞÓÛÐÒùã ×ÒÐÝØçÝÞÓ Linux Mandrake '²ÞÔØçÐ ×Ð ÚÞàØáÝØÚÕ'." +"ßÞÓÛÐÒùã ×ÒÐÝØçÝÞÓ Mandrake Linux '²ÞÔØçÐ ×Ð ÚÞàØáÝØÚÕ'." #: ../../install_steps_interactive.pm_.c:1179 msgid "Generate auto install floppy" @@ -5391,8 +5391,8 @@ msgstr "ÁaçãÒÐj áÕÛÕÚæØjã ßÐÚÕâa" #: ../../install_steps_newt.pm_.c:22 #, c-format -msgid "Linux-Mandrake Installation %s" -msgstr "Linux-Mandrake ¸ÝáâÐÛÐæØøÐ %s" +msgid "Mandrake Linux Installation %s" +msgstr "Mandrake Linux ¸ÝáâÐÛÐæØøÐ %s" #: ../../install_steps_newt.pm_.c:33 msgid "" @@ -7950,13 +7950,13 @@ msgstr "" msgid "" "tinyfirewall configurator\n" "\n" -"This configures a personal firewall for this Linux Mandrake machine.\n" +"This configures a personal firewall for this Mandrake Linux machine.\n" "For a powerful dedicated firewall solution, please look to the\n" "specialized MandrakeSecurity Firewall distribution." msgstr "" "¼ÐÛØ firewall ÚÞÝäØÓãàÐâÞà\n" "\n" -"¾Ý ÚÞÝäØÓãàØèÕ ÛØçÝØ firewall ×Ð ÞÒã Linux Mandrake ÜaèØÝã.\n" +"¾Ý ÚÞÝäØÓãàØèÕ ÛØçÝØ firewall ×Ð ÞÒã Mandrake Linux ÜaèØÝã.\n" "·Ð ÜÞûÝÞ firewall àeèÕúe, ßÞÓÛÕÔÐjâe\n" "áßÕæØjÐÛØ×ÞÒÐÝã MandrakeSecurity Firewall ÔØáâàØÑãæØjã." @@ -9052,7 +9052,7 @@ msgstr "ÁÕâ ÐÛÐâÐ ×Ð ÕÛ.ßÞèâã, ÒÕáâØ, web, âàÐÝáäÕà ÔÐâÞâÕÚa, ØÛØ chat" #~ "Choose \"Install\" if there are no previous versions of GNU/Linux\n" #~ "installed, or if you wish to use multiple distributions or versions.\n" #~ "\n" -#~ "Choose \"Rescue\" if you wish to rescue a version of Linux-Mandrake " +#~ "Choose \"Rescue\" if you wish to rescue a version of Mandrake Linux " #~ "already installed.\n" #~ "\n" #~ "\n" @@ -9101,7 +9101,7 @@ msgstr "ÁÕâ ÐÛÐâÐ ×Ð ÕÛ.ßÞèâã, ÒÕáâØ, web, âàÐÝáäÕà ÔÐâÞâÕÚa, ØÛØ chat" #~ msgid "" #~ "At this point, you may choose what partition(s) to use to install\n" -#~ "your Linux-Mandrake system if they have been already defined (from a\n" +#~ "your Mandrake Linux system if they have been already defined (from a\n" #~ "previous install of GNU/Linux or from another partitioning tool). In " #~ "other\n" #~ "cases, hard drive partitions must be defined. This operation consists of\n" @@ -9142,7 +9142,7 @@ msgstr "ÁÕâ ÐÛÐâÐ ×Ð ÕÛ.ßÞèâã, ÒÕáâØ, web, âàÐÝáäÕà ÔÐâÞâÕÚa, ØÛØ chat" #~ "- Ctrl-m to set the mount point\n" #~ msgstr "" #~ "ÁÐÔÐ, ÜÞÖÕâÕ Ø×ÐÑàÐâØ ÝÐ ÚÞøã ßÐàâØæØøã(Õ) ÖÕÛØâÕ ØÝáâÐÛØàÐâØ\n" -#~ "ÒÐè Linux-Mandrake áØáâÕÜ ãÚÞÛØÚÞ øÕ(áã) ÞÝÐ ãÝÐßàÕÔ ÞÔàÕòÕÝÐ(Õ)\n" +#~ "ÒÐè Mandrake Linux áØáâÕÜ ãÚÞÛØÚÞ øÕ(áã) ÞÝÐ ãÝÐßàÕÔ ÞÔàÕòÕÝÐ(Õ)\n" #~ "(ßÞáâÞøÕûÞÜ »ØÝãÚá ØÝáâÐÛÐæØøÞÜ ØÛØ ÝÕÚØÜ ßàÞÓàÐÜÞÜ ×Ð ßÐàâØæØàÐúÕ " #~ "ÔØáÚÐ).\n" #~ "à ÔàãÓØÜ áÛãçÐøÕÒØÜÐ ßÐàâØæØøÕ ÝÐ åÐàÔ ÔØáÚã ÜÞàÐøã ÑØâØ ÔÕäØÝØáÐÝÕ.\n" @@ -9248,7 +9248,7 @@ msgstr "ÁÕâ ÐÛÐâÐ ×Ð ÕÛ.ßÞèâã, ÒÕáâØ, web, âàÐÝáäÕà ÔÐâÞâÕÚa, ØÛØ chat" #~ "hardware.\n" #~ "\n" #~ "\n" -#~ "If you install a Linux-Mandrake system on a machine which is part\n" +#~ "If you install a Mandrake Linux system on a machine which is part\n" #~ "of an already existing network, the network administrator will\n" #~ "have given you all necessary information (IP address, network\n" #~ "submask or netmask for short, and hostname). If you're setting\n" @@ -9275,7 +9275,7 @@ msgstr "ÁÕâ ÐÛÐâÐ ×Ð ÕÛ.ßÞèâã, ÒÕáâØ, web, âàÐÝáäÕà ÔÐâÞâÕÚa, ØÛØ chat" #~ "åÐàÔÒÕàÐ.\n" #~ "\n" #~ "\n" -#~ "ÃÚÞÛØÚÞ ØÝáâÐÛØàÐâÕ Linux-Mandrake áØáâÕÜ ÝÐ ÜÐèØÝã ÚÞï øÕ ÔÕÞ ßÞáâÞøÕûÕ\n" +#~ "ÃÚÞÛØÚÞ ØÝáâÐÛØàÐâÕ Mandrake Linux áØáâÕÜ ÝÐ ÜÐèØÝã ÚÞï øÕ ÔÕÞ ßÞáâÞøÕûÕ\n" #~ "ÜàÕÖÕ, ÜàÕÖÝØ ÐÔÜØÝØáâàÐâÞà ûÕ ÒÐÜ ÔÐâØ áÒÕ ßÞâàÕÑÝÕ ØÝäÞàÜÐæØøÕ\n" #~ "(IP ÐÔàÕáã, ØÜÕ ÜÐèØÝÕ Ø Ôà.) ÃÚÞÛØÚÞ ßÞÔÕèÐÒÐâÕ ßàØÒÐâÝã ÜàÕÖã\n" #~ "ã ÚãûØ, áÐÜØ ÑØàÐâÕ ÐÔàÕáÕ.\n" diff --git a/perl-install/tinyfirewall.pm b/perl-install/tinyfirewall.pm index e3c2effcd..37c6e8d5a 100644 --- a/perl-install/tinyfirewall.pm +++ b/perl-install/tinyfirewall.pm @@ -9,7 +9,7 @@ use network; use POSIX qw(tmpnam); my @messages = (_("tinyfirewall configurator -This configures a personal firewall for this Linux Mandrake machine. +This configures a personal firewall for this Mandrake Linux machine. For a powerful dedicated firewall solution, please look to the specialized MandrakeSecurity Firewall distribution."), _("We'll now ask you questions about which services you'd like to allow |