summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/XFdrake
blob: b8c9ae16782a27660d0f4722d910555d9f667337 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
#!/usr/bin/perl

# XFdrake
# Copyright (C) 1999-2004 MandrakeSoft (pixel@mandrakesoft.com)
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

use lib qw(/usr/lib/libDrakX);

use standalone;     #- warning, standalone must be loaded very first, for 'explanations'

use Xconfig::main;
use Xconfig::xfree;
use Xconfig::default;
use interactive;
use modules;
use common;
use any;
use c;

local $_ = join '', @ARGV;

my ($configure_this) = grep { !/^-/ } @ARGV;
$configure_this = 'resolution' if $0 =~ /Xdrakres/;
$configure_this ||= 'everything';

{ 
    my $in = 'interactive'->vnew('su', 'X');

    modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf';

    my $rc = do {
	my $options = { allowFB => listlength(cat_("/proc/fb")) };

	if ($configure_this eq 'everything') {
	    check_XFree($in);
	    Xconfig::main::configure_everything_or_configure_chooser($in, $options, $::auto);
	} elsif ($configure_this eq 'auto_install') {
	    Xconfig::main::configure_everything_auto_install(Xconfig::default::configure(), $in->do_pkgs, {}, $options);
	} elsif ($configure_this eq 'monitor') {
	    Xconfig::main::configure_monitor($in, Xconfig::xfree->read);
	} elsif ($configure_this eq 'resolution') {
	    Xconfig::main::configure_resolution($in, Xconfig::xfree->read);
	}
    };
    ask_for_X_restart($in) if $rc;

    $in->exit(0);
}

sub check_XFree {
    my ($in) = @_;

    #- set the standard configuration
    foreach ('XF86Config', 'XF86Config-4') {
	my $f = "/etc/X11/$_";
	symlinkf("$_.standard", $f) if -l $f && -e "$f.standard";
    }

    my $f = "/usr/X11R6/lib/X11/rgb.txt"; #- this one is on all platform
    -e $f or $in->do_pkgs->install('XFree86', 'XFree86-75dpi-fonts');
    -e $f or die "install XFree86 first!\n";

    system("mount /proc 2>/dev/null"); # ensure /proc is mounted for pci probing
}

sub ask_for_X_restart {
    my ($in) = @_;

    $::isStandalone && $in->isa('interactive::gtk') or return;

    my ($wm, $pid) = any::running_window_manager();

    if (!$wm) {
    	$in->ask_warn('', N("Please log out and then use Ctrl-Alt-BackSpace"));
	return;
    }

    $in->ask_okcancel('', N("You need to log out and back in again for changes to take effect"), 1) or return;

    if (fork()) {
	any::ask_window_manager_to_logout($wm);
	return;
    }
    
    open STDIN, "</dev/zero";
    open STDOUT, ">/dev/null";
    open STDERR, ">&STDERR";
    c::setsid();
    exec 'perl', '-e', q(
	my ($wm, $pid) = @ARGV;
	my $nb;
	for ($nb = 30; $nb && -e "/proc/$pid"; $nb--) { sleep 1 }
	system("killall X") if $nb;
    ), $wm, $pid;
}
/share/po/bs.po6
-rw-r--r--perl-install/share/po/ca.po6
-rw-r--r--perl-install/share/po/cs.po6
-rw-r--r--perl-install/share/po/cy.po6
-rw-r--r--perl-install/share/po/da.po6
-rw-r--r--perl-install/share/po/de.po6
-rw-r--r--perl-install/share/po/el.po6
-rw-r--r--perl-install/share/po/eo.po6
-rw-r--r--perl-install/share/po/es.po6
-rw-r--r--perl-install/share/po/et.po6
-rw-r--r--perl-install/share/po/eu.po6
-rw-r--r--perl-install/share/po/fa.po6
-rw-r--r--perl-install/share/po/fi.po6
-rw-r--r--perl-install/share/po/fr.po10
-rw-r--r--perl-install/share/po/fur.po6
-rw-r--r--perl-install/share/po/ga.po6
-rw-r--r--perl-install/share/po/gl.po6
-rw-r--r--perl-install/share/po/he.po6
-rw-r--r--perl-install/share/po/help-de.pot102
-rw-r--r--perl-install/share/po/help-es.pot104
-rw-r--r--perl-install/share/po/help-fr.pot98
-rw-r--r--perl-install/share/po/help-it.pot102
-rw-r--r--perl-install/share/po/help-ru.pot98
-rw-r--r--perl-install/share/po/help-zh_CN.pot96
-rw-r--r--perl-install/share/po/hi.po6
-rw-r--r--perl-install/share/po/hr.po6
-rw-r--r--perl-install/share/po/hu.po6
-rw-r--r--perl-install/share/po/id.po12
-rw-r--r--perl-install/share/po/is.po6
-rw-r--r--perl-install/share/po/it.po6
-rw-r--r--perl-install/share/po/ja.po6
-rw-r--r--perl-install/share/po/ko.po6
-rw-r--r--perl-install/share/po/ky.po6
-rw-r--r--perl-install/share/po/lt.po6
-rw-r--r--perl-install/share/po/ltg.po6
-rw-r--r--perl-install/share/po/lv.po6
-rw-r--r--perl-install/share/po/mk.po6
-rw-r--r--perl-install/share/po/mn.po6
-rw-r--r--perl-install/share/po/ms.po6
-rw-r--r--perl-install/share/po/mt.po6
-rw-r--r--perl-install/share/po/nb.po6
-rw-r--r--perl-install/share/po/nl.po6
-rw-r--r--perl-install/share/po/nn.po6
-rw-r--r--perl-install/share/po/pa_IN.po6
-rw-r--r--perl-install/share/po/pl.po6
-rw-r--r--perl-install/share/po/pt.po6
-rw-r--r--perl-install/share/po/pt_BR.po6
-rw-r--r--perl-install/share/po/ro.po6
-rw-r--r--perl-install/share/po/ru.po6
-rw-r--r--perl-install/share/po/sc.po6
-rw-r--r--perl-install/share/po/sk.po6
-rw-r--r--perl-install/share/po/sl.po6
-rw-r--r--perl-install/share/po/sq.po6
-rw-r--r--perl-install/share/po/sr.po6
-rw-r--r--perl-install/share/po/sr@Latn.po6
-rw-r--r--perl-install/share/po/sv.po6
-rw-r--r--perl-install/share/po/ta.po6
-rw-r--r--perl-install/share/po/tg.po6
-rw-r--r--perl-install/share/po/th.po6
-rw-r--r--perl-install/share/po/tl.po6
-rw-r--r--perl-install/share/po/tr.po6
-rw-r--r--perl-install/share/po/uk.po6
-rw-r--r--perl-install/share/po/uz.po6
-rw-r--r--perl-install/share/po/uz@Latn.po6
-rw-r--r--perl-install/share/po/vi.po6
-rw-r--r--perl-install/share/po/wa.po6
-rw-r--r--perl-install/share/po/zh_CN.po6
-rw-r--r--perl-install/share/po/zh_TW.po6
77 files changed, 518 insertions, 518 deletions
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 02d402646..ec6e69f17 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -5059,7 +5059,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 ""
@@ -5543,7 +5543,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
@@ -5735,7 +5735,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
diff --git a/perl-install/share/po/af.po b/perl-install/share/po/af.po
index b65417036..866c47e65 100644
--- a/perl-install/share/po/af.po
+++ b/perl-install/share/po/af.po
@@ -6416,7 +6416,7 @@ 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 ""
@@ -6955,7 +6955,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
@@ -7178,7 +7178,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
diff --git a/perl-install/share/po/am.po b/perl-install/share/po/am.po
index e698935cd..addebc6f3 100644
--- a/perl-install/share/po/am.po
+++ b/perl-install/share/po/am.po
@@ -5327,7 +5327,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 ""
@@ -5829,7 +5829,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
@@ -6034,7 +6034,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
diff --git a/perl-install/share/po/ar.po b/perl-install/share/po/ar.po
index 6b7efd27d..68c64ae18 100644
--- a/perl-install/share/po/ar.po
+++ b/perl-install/share/po/ar.po
@@ -6579,7 +6579,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 ""
@@ -7115,7 +7115,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
@@ -7336,7 +7336,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
diff --git a/perl-install/share/po/az.po b/perl-install/share/po/az.po
index 72b003d49..c1c6b72a9 100644
--- a/perl-install/share/po/az.po
+++ b/perl-install/share/po/az.po
@@ -6571,7 +6571,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 ""
@@ -7108,7 +7108,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
@@ -7328,7 +7328,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
diff --git a/perl-install/share/po/be.po b/perl-install/share/po/be.po
index 86f55d140..5ecdc42f1 100644
--- a/perl-install/share/po/be.po
+++ b/perl-install/share/po/be.po
@@ -5388,7 +5388,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 ""
@@ -5906,7 +5906,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
@@ -6115,7 +6115,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
diff --git a/perl-install/share/po/bg.po b/perl-install/share/po/bg.po
index f35e82e23..dc4b4b05d 100644
--- a/perl-install/share/po/bg.po
+++ b/perl-install/share/po/bg.po
@@ -6183,7 +6183,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 ""
@@ -6714,7 +6714,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
@@ -6935,7 +6935,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
diff --git a/perl-install/share/po/bn.po b/perl-install/share/po/bn.po
index 2ed588b4a..781411714 100644
--- a/perl-install/share/po/bn.po
+++ b/perl-install/share/po/bn.po
@@ -6100,7 +6100,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 ""
@@ -6647,7 +6647,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
@@ -6870,7 +6870,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
diff --git a/perl-install/share/po/br.po b/perl-install/share/po/br.po
index 2f82f4938..8f8cd19ee 100644
--- a/perl-install/share/po/br.po
+++ b/perl-install/share/po/br.po
@@ -5446,7 +5446,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 ""
@@ -5964,7 +5964,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
@@ -6175,7 +6175,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
diff --git a/perl-install/share/po/bs.po b/perl-install/share/po/bs.po
index f1c4aab8d..31cdb89a0 100644
--- a/perl-install/share/po/bs.po
+++ b/perl-install/share/po/bs.po
@@ -6698,7 +6698,7 @@ 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 ""
@@ -7238,7 +7238,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
@@ -7462,7 +7462,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
diff --git a/perl-install/share/po/ca.po b/perl-install/share/po/ca.po
index 5f6912149..6390a2bfe 100644
--- a/perl-install/share/po/ca.po
+++ b/perl-install/share/po/ca.po
@@ -6732,7 +6732,7 @@ msgstr "S'està entrant en el pas '%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 ""
@@ -7283,7 +7283,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
@@ -7517,7 +7517,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
diff --git a/perl-install/share/po/cs.po b/perl-install/share/po/cs.po
index 55a20bf07..222481026 100644
--- a/perl-install/share/po/cs.po
+++ b/perl-install/share/po/cs.po
@@ -6681,7 +6681,7 @@ msgstr "Začíná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 ""
@@ -7218,7 +7218,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
@@ -7443,7 +7443,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
diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index 378a6f65b..374d4fa9d 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -6638,7 +6638,7 @@ msgstr "Cychwyn cam '%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 ""
@@ -7179,7 +7179,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
@@ -7403,7 +7403,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
diff --git a/perl-install/share/po/da.po b/perl-install/share/po/da.po
index dea3204ca..742bdaa0f 100644
--- a/perl-install/share/po/da.po
+++ b/perl-install/share/po/da.po
@@ -6604,7 +6604,7 @@ msgstr "Går til trin `%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 ""
@@ -7146,7 +7146,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
@@ -7371,7 +7371,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
diff --git a/perl-install/share/po/de.po b/perl-install/share/po/de.po
index 243c3c616..ffa509664 100644
--- a/perl-install/share/po/de.po
+++ b/perl-install/share/po/de.po
@@ -6794,7 +6794,7 @@ msgstr "Beginn von Schritt „%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 ""
@@ -7342,7 +7342,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
@@ -7572,7 +7572,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
diff --git a/perl-install/share/po/el.po b/perl-install/share/po/el.po
index 536460165..242d60dbe 100644
--- a/perl-install/share/po/el.po
+++ b/perl-install/share/po/el.po
@@ -6384,7 +6384,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 ""
@@ -6925,7 +6925,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
@@ -7147,7 +7147,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
diff --git a/perl-install/share/po/eo.po b/perl-install/share/po/eo.po
index 5420f1283..a1ca1fc10 100644
--- a/perl-install/share/po/eo.po
+++ b/perl-install/share/po/eo.po
@@ -5625,7 +5625,7 @@ msgstr "Eniras paŝon `%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 ""
@@ -6162,7 +6162,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
@@ -6376,7 +6376,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
diff --git a/perl-install/share/po/es.po b/perl-install/share/po/es.po
index 730eb439e..bbc7a96df 100644
--- a/perl-install/share/po/es.po
+++ b/perl-install/share/po/es.po
@@ -6823,7 +6823,7 @@ msgstr "Entrando en la etapa '%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 ""
@@ -7371,7 +7371,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
@@ -7599,7 +7599,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
diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po
index f39162b4c..d0d75c204 100644
--- a/perl-install/share/po/et.po
+++ b/perl-install/share/po/et.po
@@ -6669,7 +6669,7 @@ msgstr "Järgmine samm: %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 ""
@@ -7206,7 +7206,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
@@ -7430,7 +7430,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
diff --git a/perl-install/share/po/eu.po b/perl-install/share/po/eu.po
index bbb608310..80248a64c 100644
--- a/perl-install/share/po/eu.po
+++ b/perl-install/share/po/eu.po
@@ -6738,7 +6738,7 @@ msgstr "`%s'. urratsean sartzen\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 ""
@@ -7279,7 +7279,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
@@ -7504,7 +7504,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
diff --git a/perl-install/share/po/fa.po b/perl-install/share/po/fa.po
index 583d9197f..67e10fec2 100644
--- a/perl-install/share/po/fa.po
+++ b/perl-install/share/po/fa.po
@@ -6641,7 +6641,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 ""
@@ -7180,7 +7180,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
@@ -7403,7 +7403,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
diff --git a/perl-install/share/po/fi.po b/perl-install/share/po/fi.po
index 5393f17ae..38495ed3d 100644
--- a/perl-install/share/po/fi.po
+++ b/perl-install/share/po/fi.po
@@ -6797,7 +6797,7 @@ msgstr "Siirryn vaiheeseen `%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 ""
@@ -7345,7 +7345,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
@@ -7571,7 +7571,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
diff --git a/perl-install/share/po/fr.po b/perl-install/share/po/fr.po
index c8694d7bb..2c4d22ca9 100644
--- a/perl-install/share/po/fr.po
+++ b/perl-install/share/po/fr.po
@@ -6861,7 +6861,7 @@ msgstr "Démarrage de l'étape « %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 ""
@@ -7414,8 +7414,8 @@ msgstr ""
#: install_steps_interactive.pm:821
#, c-format
msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
-msgstr "Téléchargement de la liste des miroirs disponibles depuis le serveur web de Mandrivalinux ..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr "Téléchargement de la liste des miroirs disponibles depuis le serveur web de Mandriva Linux ..."
#: install_steps_interactive.pm:840
#, c-format
@@ -7643,8 +7643,8 @@ msgstr ""
#: install_steps_newt.pm:20
#, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Installation de Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Installation de Mandriva Linux %s"
#. -PO: This string must fit in a 80-char wide text screen
#: install_steps_newt.pm:34
diff --git a/perl-install/share/po/fur.po b/perl-install/share/po/fur.po
index 2d268ae1a..86a4bb136 100644
--- a/perl-install/share/po/fur.po
+++ b/perl-install/share/po/fur.po
@@ -5357,7 +5357,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 ""
@@ -5859,7 +5859,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
@@ -6064,7 +6064,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
diff --git a/perl-install/share/po/ga.po b/perl-install/share/po/ga.po
index d8c912360..0874aa9d3 100644
--- a/perl-install/share/po/ga.po
+++ b/perl-install/share/po/ga.po
@@ -5357,7 +5357,7 @@ msgstr "Ag tosnú ar céim `%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 ""
@@ -5861,7 +5861,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
@@ -6066,7 +6066,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
diff --git a/perl-install/share/po/gl.po b/perl-install/share/po/gl.po
index b8e2c0a82..b34ebc589 100644
--- a/perl-install/share/po/gl.po
+++ b/perl-install/share/po/gl.po
@@ -5831,7 +5831,7 @@ msgstr "Entrando na etapa '%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 ""
@@ -6366,7 +6366,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
@@ -6587,7 +6587,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
diff --git a/perl-install/share/po/he.po b/perl-install/share/po/he.po
index 42042f225..766bc397c 100644
--- a/perl-install/share/po/he.po
+++ b/perl-install/share/po/he.po
@@ -6033,7 +6033,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 ""
@@ -6570,7 +6570,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
@@ -6787,7 +6787,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
diff --git a/perl-install/share/po/help-de.pot b/perl-install/share/po/help-de.pot
index c454dccdf..1c8c3deb9 100644
--- a/perl-install/share/po/help-de.pot
+++ b/perl-install/share/po/help-de.pot
@@ -5,12 +5,12 @@ msgstr ""
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
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"
@@ -37,7 +37,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"
@@ -46,7 +46,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 won't be able to undo this operation\n"
"after you confirm.\n"
"\n"
@@ -65,11 +65,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 ""
-"Sie müssen nun entscheiden, wo auf Ihrer/n Festplatte(n) Ihr Mandrivalinux\n"
+"Sie müssen nun entscheiden, wo auf Ihrer/n Festplatte(n) Ihr Mandriva Linux\n"
"System installiert werden soll. Sofern alles leer ist bzw. ein\n"
"Betriebssystem alles belegt, müssen die Platte(n) neu partitioniert werden.\n"
"Prinzipiell besteht das Partitionieren der Platte(n) darin, den\n"
-"Plattenplatz so aufzuteilen, dass Ihr Mandrivalinux darauf installiert\n"
+"Plattenplatz so aufzuteilen, dass Ihr Mandriva Linux darauf installiert\n"
"werden kann.\n"
"\n"
"Da dieser Schritt normalerweise irreversibel ist und auch zu Datenverlusten\n"
@@ -100,7 +100,7 @@ msgstr ""
"defragmentiert. Dennoch sollten Sie vor diesem Schritt eine Sicherungskopie\n"
"Ihrer Daten auf einem anderem Medium als der zu verändernden Festplatte\n"
"vornehmen. Sie sollten diese Variante wählen, falls Sie beide\n"
-"Betriebssysteme (Microsoft Windows und Mandrivalinux) nebeneinander nutzen\n"
+"Betriebssysteme (Microsoft Windows und Mandriva Linux) nebeneinander nutzen\n"
"wollen.\n"
"\n"
" Bevor Sie sich für diese Variante entscheiden, sei hier noch einmal\n"
@@ -108,7 +108,7 @@ msgstr ""
"als momentan.\n"
"\n"
" * „%s“: Falls Sie alle Daten Ihrer Platte verlieren, und sie durch Ihr\n"
-"neues Mandrivalinux System ersetzen wollen, wählen Sie diese Schaltfläche.\n"
+"neues Mandriva Linux System ersetzen wollen, wählen Sie diese Schaltfläche.\n"
"Beachten Sie, dass dieser Schritt nicht rückgängig gemacht werden kann.\n"
"\n"
" !! Wenn Sie diese Variante wählen, werden alle Ihre Daten auf der Platte\n"
@@ -233,7 +233,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"
@@ -242,41 +242,41 @@ 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 won't 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 ""
"Dieser Schritt wird nur aufgerufen, wenn mindestens eine GNU/Linux\n"
"Partition auf Ihren Festplatten gefunden wird.\n"
"\n"
"DrakX fragt Sie nun nach der gewünschten Installationsart. Sie haben die\n"
"Wahl zwischen einer Aktualisierung einer bereits vorhandenen\n"
-"Mandrivalinux-Version oder einer kompletten Neuinstallation:\n"
+"Mandriva Linux-Version oder einer kompletten Neuinstallation:\n"
"\n"
-" * „%s“: Entfernt komplett ältere Versionen von Mandrivalinux, die noch\n"
+" * „%s“: Entfernt komplett ältere Versionen von Mandriva Linux, die noch\n"
"installiert sind - um genau zu sein, können Sie je nach aktuellem Inhalt\n"
"Ihrer Platte auch einige ältere Linux- oder anderweitige Partitionen\n"
"unangetastet behalten. Diese Installationsart ist gut, wenn Sie die\n"
"Partitionseinteilung auf Ihrer Festplatte sowieso ändern oder das benutzte\n"
"Dateisystem austauschen wollen\n"
"\n"
-" * „%s“: Mit dieser Variante können Sie eine existierende Mandrivalinux\n"
+" * „%s“: Mit dieser Variante können Sie eine existierende Mandriva Linux\n"
"Version aktualisieren. Die Partitionstabellen sowie die persönlichen\n"
"Verzeichnisse der Anwender bleiben erhalten. Alle anderen\n"
"Installationsschritte werden wie bei einer Installation ausgeführt.\n"
"\n"
-"Aktualisierungen von Mandrivalinux „8.1“ oder neueren Systemen sollten\n"
-"problemlos funktionieren. Ältere Versionen von Mandrivalinux sollten Sie\n"
+"Aktualisierungen von Mandriva Linux „8.1“ oder neueren Systemen sollten\n"
+"problemlos funktionieren. Ältere Versionen von Mandriva Linux sollten Sie\n"
"nicht zu aktualisieren versuchen."
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
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"
@@ -288,7 +288,7 @@ msgid ""
"will appear: review the selection, and press \"%s\" to retrieve and install\n"
"the selected package(s), or \"%s\" to abort."
msgstr ""
-"Es ist sehr wahrscheinlich, dass zum Zeitpunkt Ihrer Mandrivalinux\n"
+"Es ist sehr wahrscheinlich, dass zum Zeitpunkt Ihrer Mandriva Linux\n"
"Installation bereits einige Pakete aktualisiert wurden, etwa da noch Fehler\n"
"entdeckt und beseitigt wurden oder da in Paketen Sicherheitslücken entdeckt\n"
"wurden, für die bereits Lösungen existieren. Um von diesen aktualisierten\n"
@@ -310,7 +310,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"
@@ -339,7 +339,7 @@ msgid ""
"disk or partition is called \"C:\")."
msgstr ""
"Es wurde mehr als eine Windows-Partition gefunden. Wählen Sie bitte, welche\n"
-"Sie verkleinern wollen, um Platz für Ihr neues Mandrivalinux zu schaffen.\n"
+"Sie verkleinern wollen, um Platz für Ihr neues Mandriva Linux zu schaffen.\n"
"\n"
"Die Partitionen werden folgendermaßen aufgelistet: „Linux-Name“,\n"
"„Windows-Name“, „Kapazität“.\n"
@@ -372,7 +372,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"
@@ -428,7 +428,7 @@ msgid ""
msgstr ""
"X (das X Window System) ist das Herz der grafischen Benutzeroberfläche von\n"
"GNU/Linux. Es bildet die Grundlage für die Vielzahl grafischer\n"
-"Benutzerumgebungen, die Mandrivalinux Ihnen anbietet (wie etwa KDE, GNOME,\n"
+"Benutzerumgebungen, die Mandriva Linux Ihnen anbietet (wie etwa KDE, GNOME,\n"
"AfterStep oder WindowMaker).\n"
"\n"
"Sie erhalten eine Liste möglicher Parameter, mit deren Hilfe Sie die\n"
@@ -490,7 +490,7 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
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, don't queue'', is the choice\n"
@@ -511,11 +511,11 @@ msgid ""
"options and for managing the printer.\n"
"\n"
"If you make a choice now, and later find that you don't 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 ""
"Hier können Sie das Drucksystem für Ihren Rechner wählen. Andere\n"
-"Betriebssysteme bieten Ihnen nur eines, bei Mandrivalinux können Sie\n"
+"Betriebssysteme bieten Ihnen nur eines, bei Mandriva Linux können Sie\n"
"zwischen zwei verschiedenen wählen. jedes dieser Systeme ist für eine\n"
"bestimmte Konfiguration des Systems am besten geeignet.\n"
"\n"
@@ -537,18 +537,18 @@ msgstr ""
"starten. „%s“ bietet grafische Konfigurations- und Druckmenüs.\n"
"\n"
"Sie können diese Wahl später immer wieder ändern, indem Sie PrinterDrake\n"
-"aus dem Mandrivalinux Control Center starten und dort die Schaltfläche „%s“\n"
+"aus dem Mandriva Linux Control Center starten und dort die Schaltfläche „%s“\n"
"betätigen."
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
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"
@@ -600,7 +600,7 @@ msgid ""
"megabytes."
msgstr ""
"Nun ist es Zeit sich zu entscheiden, welche Programme Sie auf Ihrem Rechner\n"
-"installieren wollen. Es gibt tausende von Paketen für Mandrivalinux, und\n"
+"installieren wollen. Es gibt tausende von Paketen für Mandriva Linux, und\n"
"Sie müssen sie nicht alle auswendig kennen.\n"
"\n"
"Die Pakete sind nach ihrer Verwendung in vier Kategorien eingeteilt. Sie\n"
@@ -657,13 +657,13 @@ msgstr ""
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
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-Distribution wird auf mehreren CD-ROMs ausgeliefert. Es\n"
+"Die Mandriva Linux-Distribution wird auf mehreren CD-ROMs ausgeliefert. Es\n"
"kann daher vorkommen, dass DrakX Pakete von anderen, als der\n"
"Installations-CD-ROM installieren will. In diesem Fall wird es die aktuelle\n"
"CD auswerfen und nach einer anderen fragen. Wenn Sie dieses CD nicht haben,\n"
@@ -781,10 +781,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 don't 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"
@@ -813,7 +813,7 @@ msgstr ""
"!! Es kommt vor, dass Server- und Dienst-Pakete angewählt wurden - entweder\n"
"absichtlich, oder als Paket einer ganzen Gruppe; sollte das der Fall sein,\n"
"werden Sie nun gefragt, ob Sie diese wirklich installiert haben wollen.\n"
-"Unter Mandrivalinux werden installierte Server und Dienste automatisch beim\n"
+"Unter Mandriva Linux werden installierte Server und Dienste automatisch beim\n"
"Betriebssystemstart gestartet. Selbst wenn zum Zeitpunkt, als die\n"
"Distribution zusammengestellt wurde, keine Sicherheitslücken oder Fehler in\n"
"diesen Paketen bekannt waren, ist natürlich nicht auszuschließen, dass\n"
@@ -933,7 +933,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"
@@ -974,7 +974,7 @@ msgstr ""
"Zur UTF-8 (Unicode) Unterstützung: Unicode ist ein Zeichenkodierung, die\n"
"die existierenden Kodierungen ablösen soll und die Zeichen aller\n"
"existierender Sprachen beinhalten. Komplette Unterstützung in GNU/Linux ist\n"
-"leider immer noch nicht gegeben. Daher verwendet Mandrivalinux diese\n"
+"leider immer noch nicht gegeben. Daher verwendet Mandriva Linux diese\n"
"Kodierung nur auf Wunsch des Anwenders:\n"
"\n"
" * Falls Sie eine Sprache nutzen, die eine gut unterstütztes Kodierung\n"
@@ -1016,11 +1016,11 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
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 ""
"Bitte wählen Sie die Festplatte, die Sie löschen wollen, um Ihr neues\n"
-"Mandrivalinux zu installieren. Bedenken Sie dabei, dass alle Daten auf\n"
+"Mandriva Linux zu installieren. Bedenken Sie dabei, dass alle Daten auf\n"
"dieser Platte nach diesem Schritt unwiederbringlich verloren sind!"
# DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -1072,7 +1072,7 @@ msgid ""
"generally obtained at the expense of ease of use.\n"
"\n"
"If you don't 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"
@@ -1086,7 +1086,7 @@ msgstr ""
"\n"
"Sollten Sie sich an dieser Stelle nicht sicher sein, so behalten Sie die\n"
"Standardeinstellung bei. Sie können die Ebene später noch mittels draksec\n"
-"im Mandrivalinux Control Center anpassen.\n"
+"im Mandriva Linux Control Center anpassen.\n"
"\n"
"Das Feld „%s“ dient dazu, dem System mitzuteilen, wer für die Sicherheit\n"
"dieses Rechners verantwortlich ist. An dieses Kennzeichen/diese E-Mail\n"
@@ -1138,7 +1138,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"
@@ -1155,7 +1155,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"
@@ -1206,7 +1206,7 @@ msgstr ""
"\n"
" * „%s“: Falls Sie Ihren Internetzugang oder Ihr lokales Netzwerk nun\n"
"einrichten wollen, können Sie das hier tun. Lesen Sie sich dazu die\n"
-"gedruckte Dokumentation durch oder benutzen Sie das Mandrivalinux Control\n"
+"gedruckte Dokumentation durch oder benutzen Sie das Mandriva Linux Control\n"
"Center nachdem die Installation beendet ist.\n"
"\n"
" * „%s“: Hier können Sie HTTP- und FTP-Proxyadressen eintragen falls Ihre\n"
@@ -1225,10 +1225,10 @@ msgstr ""
"(„Bootloader“) ändern wollen, wählen Sie diese Schaltfläche. Es sei\n"
"angemerkt, dass dieser Punkt sich an fortgeschrittenere Nutzer richtet.\n"
"Hilfe finden Sie in der gedruckten Dokumentation oder im integrierten\n"
-"Hilfeteil des Mandrivalinux Control Center.\n"
+"Hilfeteil des Mandriva Linux Control Center.\n"
"\n"
" * „%s“: Sie können hier die Dienste wählen, die ab dem Start von\n"
-"Mandrivalinux zur Verfügung gestellt werden sollen. Wollen Sie den Rechner\n"
+"Mandriva Linux zur Verfügung gestellt werden sollen. Wollen Sie den Rechner\n"
"als Server verwenden, sollten Sie unbedingt einen Blick auf diese Liste\n"
"werfen."
@@ -1338,7 +1338,7 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
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 ""
@@ -1526,7 +1526,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."
@@ -1548,7 +1548,7 @@ msgstr ""
"Schaltfläche „%s“, um mit dem Formatieren der Partitionen zu beginnen.\n"
"\n"
"Betätigen Sie „%s“, wenn Sie eine andere Partition für Ihr neues\n"
-"Mandrivalinux vorgesehen haben.\n"
+"Mandriva Linux vorgesehen haben.\n"
"\n"
"Betätigen Sie die Schaltfläche „%s“, falls Sie Partitionen auf defekte\n"
"Blöcke untersuchen wollen."
@@ -1670,7 +1670,7 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
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"
@@ -1741,7 +1741,7 @@ msgid ""
"emergency boot situations."
msgstr ""
"Sie müssen nun entscheiden, auf welche(n) Partition(en) Ihr neues\n"
-"Mandrivalinux System installiert werden soll. Falls bereits Partitionen\n"
+"Mandriva Linux System installiert werden soll. Falls bereits Partitionen\n"
"existieren (etwa von einer früheren Installation von GNU/Linux oder durch\n"
"das Erzeugen mit einem anderen Partitionierungswerkzeug), können Sie diese\n"
"verwenden. Anderenfalls müssen Sie Partitionen definieren.\n"
diff --git a/perl-install/share/po/help-es.pot b/perl-install/share/po/help-es.pot
index 4a26d308e..30dc63dde 100644
--- a/perl-install/share/po/help-es.pot
+++ b/perl-install/share/po/help-es.pot
@@ -5,12 +5,12 @@ msgstr ""
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
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"
@@ -37,7 +37,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"
@@ -46,7 +46,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 won't be able to undo this operation\n"
"after you confirm.\n"
"\n"
@@ -66,11 +66,11 @@ msgid ""
"refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
msgstr ""
"Ahora necesita elegir el lugar de su disco rígido donde se instalará su\n"
-"sistema operativo Mandrivalinux. Si su disco rígido está vacío o si un\n"
+"sistema operativo Mandriva Linux. Si su disco rígido está vacío o si un\n"
"sistema operativo existente está utilizando todo el espacio disponible,\n"
"necesitará particionar el disco. Básicamente, particionar un disco rígido\n"
"consiste en dividirlo lógicamente para crear espacio para instalar su\n"
-"sistema Mandrivalinux nuevo.\n"
+"sistema Mandriva Linux nuevo.\n"
"\n"
"Debido a que el proceso de particionado de un disco rígido por lo general\n"
"es irreversible y puede llevar a pérdida de datos, el particionado puede\n"
@@ -100,7 +100,7 @@ msgstr ""
"realizar sin la pérdida de datos, siempre y cuando Usted haya\n"
"desfragmentado con anterioridad la partición Windows. Es altamente\n"
"recomendable hacer una copia de respaldo de sus datos. Se recomienda usar\n"
-"esta solución si desea utilizar tanto Mandrivalinux como Microsoft Windows\n"
+"esta solución si desea utilizar tanto Mandriva Linux como Microsoft Windows\n"
"en la misma computadora.\n"
"\n"
" Antes de elegir esta opción, por favor comprenda que después de este\n"
@@ -110,7 +110,7 @@ msgstr ""
"\n"
" * \"%s\". Si desea borrar todos los datos y todas las particiones\n"
"presentes en su disco rígido y reemplazarlos con su nuevo sistema\n"
-"Mandrivalinux, seleccione esta opción. Tenga cuidado con esta solución ya\n"
+"Mandriva Linux, seleccione esta opción. Tenga cuidado con esta solución ya\n"
"que no podrá revertir su elección después de confirmarla.\n"
"\n"
" !! Si elige esta opción, se perderán todos los datos en su disco. !!\n"
@@ -234,7 +234,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"
@@ -243,19 +243,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 won't 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 ""
"Este paso se activa sólo si se encontró una partición GNU/Linux existente\n"
"en su máquina.\n"
"\n"
"DrakX ahora necesita saber si desea realizar una instalación nueva o una\n"
-"actualización de un sistema Mandrivalinux existente:\n"
+"actualización de un sistema Mandriva Linux existente:\n"
"\n"
" * \"%s\". En gran parte, esta opción borrará por completo el sistema\n"
"anterior. Sin embargo, dependiendo de su esquema de particiones, puede\n"
@@ -264,20 +264,20 @@ msgstr ""
"particionan sus discos, debería usar esta opción.\n"
"\n"
" * \"%s\": Esta clase de instalación le permite actualizar los paquetes que\n"
-"en este momento están instalados en su sistema Mandrivalinux. No se alteran\n"
+"en este momento están instalados en su sistema Mandriva Linux. No se alteran\n"
"las particiones corrientes de sus discos ni los datos de los usuarios. La\n"
"mayoría de los otros pasos de configuración permanecen disponibles y son\n"
"similares a una instalación estándar.\n"
"\n"
"El uso de la opción \"Actualizar\" debería funcionar sin problemas para los\n"
-"sistemas Mandrivalinux que corren la versión \"8.1\" o una posterior. No se\n"
+"sistemas Mandriva Linux que corren la versión \"8.1\" o una posterior. No se\n"
"recomienda realizar una actualización sobre versiones anteriores a\n"
-"Mandrivalinux versión \"8.1\"."
+"Mandriva Linux versión \"8.1\"."
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
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"
@@ -289,7 +289,7 @@ msgid ""
"will appear: review the selection, and press \"%s\" to retrieve and install\n"
"the selected package(s), or \"%s\" to abort."
msgstr ""
-"Es probable que cuando instale Mandrivalinux algunos paquetes se hayan\n"
+"Es probable que cuando instale Mandriva Linux algunos paquetes se hayan\n"
"actualizado desde la publicación inicial. Se pueden haber corregido errores\n"
"y solucionado problemas de seguridad. Para permitir que Usted se beneficie\n"
"de estas actualizaciones, ahora las puede descargar desde la Internet.\n"
@@ -307,7 +307,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"
@@ -337,7 +337,7 @@ msgid ""
msgstr ""
"Se ha detectado más de una partición Microsoft Windows en su disco rígido.\n"
"Por favor, elija aquella a la cual desea cambiar el tamaño para poder\n"
-"instalar su sistema operativo Mandrivalinux nuevo.\n"
+"instalar su sistema operativo Mandriva Linux nuevo.\n"
"\n"
"Cada partición se lista como sigue: \"Nombre Linux\", \"Nombre Windows\",\n"
"\"Capacidad\".\n"
@@ -374,7 +374,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"
@@ -430,7 +430,7 @@ msgid ""
msgstr ""
"X (por \"X Window System\") es el corazón de la interfaz gráfica de\n"
"GNU/Linux en el que se apoyan todos los entornos gráficos (KDE, GNOME,\n"
-"AfterStep, WindowMaker, etc.) que se incluyen con Mandrivalinux.\n"
+"AfterStep, WindowMaker, etc.) que se incluyen con Mandriva Linux.\n"
"\n"
"Se le presentará la lista de parámetros diferentes a cambiar para obtener\n"
"una presentación gráfica óptima.\n"
@@ -489,7 +489,7 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
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, don't queue'', is the choice\n"
@@ -510,12 +510,12 @@ msgid ""
"options and for managing the printer.\n"
"\n"
"If you make a choice now, and later find that you don't 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 ""
"Ahora es el momento de seleccionar un sistema de impresión para su\n"
"computadora. Otros sistemas operativos pueden ofrecerle uno, pero\n"
-"Mandrivalinux le ofrece dos. Cada uno de los sistemas de impresión es más\n"
+"Mandriva Linux le ofrece dos. Cada uno de los sistemas de impresión es más\n"
"adecuado para tipos de configuración particulares.\n"
"\n"
" * \"%s\" - \"print, don't queue\" (imprimir sin poner en cola) es la\n"
@@ -538,17 +538,17 @@ msgstr ""
"\n"
"Si hace una elección ahora y más tarde encuentra que a Usted no le gusta su\n"
"sistema de impresión, puede cambiarlo ejecutando PrinterDrake desde el\n"
-"Centro de Control de Mandrivalinux y haciendo clic sobre el botón \"%s\"."
+"Centro de Control de Mandriva Linux y haciendo clic sobre el botón \"%s\"."
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
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"
@@ -600,11 +600,11 @@ msgid ""
"megabytes."
msgstr ""
"Ahora es el momento de especificar los programas que desea instalar en su\n"
-"sistema. Hay miles de paquetes disponibles para Mandrivalinux, y para hacer\n"
+"sistema. Hay miles de paquetes disponibles para Mandriva Linux, y para hacer\n"
"más simple el manejo de los paquetes, los mismos se han puesto en grupos de\n"
"aplicaciones similares.\n"
"\n"
-"Mandrivalinux clasifica los grupos de paquetes en cuatro categorías. Puede\n"
+"Mandriva Linux clasifica los grupos de paquetes en cuatro categorías. Puede\n"
"mezclar y hacer coincidir aplicaciones de varias categorías, por lo que una\n"
"instalación de \"Estación de trabajo\" puede tener instaladas aplicaciones\n"
"de la categoría \"Desarrollo\".\n"
@@ -658,13 +658,13 @@ msgstr ""
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
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 ""
-"La instalación de Mandrivalinux se distribuye en varios CD-ROM. Si un\n"
+"La instalación de Mandriva Linux se distribuye en varios CD-ROM. Si un\n"
"paquete seleccionado se encuentra en otro CD-ROM, DrakX expulsará el CD\n"
"corriente y le pedirá que inserte el necesario. Si no tiene el CD necesario\n"
"a mano, simplemente haga clic sobre \"%s\", no se instalarán los paquetes\n"
@@ -782,10 +782,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 don't 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"
@@ -819,11 +819,11 @@ msgstr ""
"seleccionó específicamente el paquete individual o porque el mismo era\n"
"parte de un grupo de paquetes, se le pedirá que confirme que realmente\n"
"desea que se instalen esos servidores. De manera predeterminada,\n"
-"Mandrivalinux iniciará automáticamente todos los servicios instalados al\n"
+"Mandriva Linux iniciará automáticamente todos los servicios instalados al\n"
"momento del arranque. Aunque estos son seguros y no tienen problemas\n"
"conocidos al momento en que se publicó la distribución, es muy posible que\n"
"se descubran vulnerabilidades en la seguridad luego que se terminó con esta\n"
-"versión de Mandrivalinux. Si no sabe que es lo que se supone que hace un\n"
+"versión de Mandriva Linux. Si no sabe que es lo que se supone que hace un\n"
"servicio o la razón por la cual se está instalando, entonces haga clic\n"
"sobre \"%s\". Si hace clic sobre \"%s\" se instalarán todos los servicios\n"
"listados y los mismos se iniciarán automáticamente al momento del arranque.\n"
@@ -937,7 +937,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"
@@ -978,7 +978,7 @@ msgstr ""
"Acerca del soporte UTF-8 (Unicode): Unicode es una codificación nueva de\n"
"caracteres que pretende cubrir todos los idiomas existentes. Sin embargo,\n"
"el soporte completo para Unicode bajo GNU/Linux todavía está en desarrollo.\n"
-"Por esta razón, Mandrivalinux lo usará o no dependiendo de las elecciones\n"
+"Por esta razón, Mandriva Linux lo usará o no dependiendo de las elecciones\n"
"del usuario:\n"
"\n"
" * Si elige un idioma con codificación legada fuerte (idiomas latin1, ruso,\n"
@@ -1021,11 +1021,11 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
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 ""
"Elija la unidad de disco que desea borrar para instalar su partición\n"
-"Mandrivalinux nueva. Tenga cuidado, ¡se perderán todos los datos presentes\n"
+"Mandriva Linux nueva. Tenga cuidado, ¡se perderán todos los datos presentes\n"
"en dicha unidad de disco y no se podrán recuperar!."
# DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -1078,7 +1078,7 @@ msgid ""
"generally obtained at the expense of ease of use.\n"
"\n"
"If you don't 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"
@@ -1092,7 +1092,7 @@ msgstr ""
"\n"
"Si no sabe cual elegir, mantenga la opción predeterminada. Podrá cambiarla\n"
"más adelante con la herramienta draksec, que es parte del Centro de Control\n"
-"de Mandrivalinux.\n"
+"de Mandriva Linux.\n"
"\n"
"Complete el campo \"%s\" con la dirección de correo electrónico de la\n"
"persona responsable de la seguridad. Los mensajes relativos a la seguridad\n"
@@ -1144,7 +1144,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"
@@ -1161,7 +1161,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"
@@ -1213,7 +1213,7 @@ msgstr ""
"\n"
" * \"%s\": si desea configurar ahora el acceso a la Internet o a su red\n"
"local, puede hacerlo ahora. Consulte la documentación impresa o utilice el\n"
-"Centro de Control de Mandrivalinux luego que finalizó la instalación para\n"
+"Centro de Control de Mandriva Linux luego que finalizó la instalación para\n"
"aprovechar la ayuda en línea completa.\n"
"\n"
" * \"%s\": permite configurar las direcciones de los proxy HTTP y FTP si la\n"
@@ -1232,7 +1232,7 @@ msgstr ""
"haga clic sobre este botón. Esto debería estar reservado para los usuarios\n"
"avanzados. Consulte la documentación impresa o la ayuda en línea acerca de\n"
"la configuración del cargador de arranque en el Centro de Control de\n"
-"Mandrivalinux.\n"
+"Mandriva Linux.\n"
"\n"
" * \"%s\": por medio de esta entrada podrá tener un control fino sobre qué\n"
"servicios correrán en su máquina. Si planifica utilizar esta máquina como\n"
@@ -1346,12 +1346,12 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
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 ""
"Antes de continuar, debería leer cuidadosamente los términos de la\n"
-"licencia. La misma cubre a toda la distribución Mandrivalinux. Si está de\n"
+"licencia. La misma cubre a toda la distribución Mandriva Linux. Si está de\n"
"acuerdo con todos los términos en la misma, haga clic en el botón \"%s\".\n"
"Si no, haga clic en el botón \"%s\" lo que reiniciará su computadora."
@@ -1535,7 +1535,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."
@@ -1558,7 +1558,7 @@ msgstr ""
"Haga clic sobre \"%s\" cuando esté listo para formatear las particiones.\n"
"\n"
"Haga clic sobre \"%s\" si desea elegir otra partición para la instalación\n"
-"de su sistema operativo Mandrivalinux nuevo.\n"
+"de su sistema operativo Mandriva Linux nuevo.\n"
"\n"
"Haga clic sobre \"%s\" si desea seleccionar las particiones del disco en\n"
"las que se buscarán bloques defectuosos."
@@ -1677,7 +1677,7 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
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"
@@ -1748,7 +1748,7 @@ msgid ""
"emergency boot situations."
msgstr ""
"Ahora necesita elegir qué particiones se utilizarán para la instalación de\n"
-"su sistema Mandrivalinux. Si ya se han definido particiones, ya sea por una\n"
+"su sistema Mandriva Linux. Si ya se han definido particiones, ya sea por una\n"
"instalación previa de GNU/Linux o con otra herramienta de particionado,\n"
"puede utilizarlas. De lo contrario, se deben definir particiones en el\n"
"disco rígido.\n"
diff --git a/perl-install/share/po/help-fr.pot b/perl-install/share/po/help-fr.pot
index 56353ecfa..ec8cbdf80 100644
--- a/perl-install/share/po/help-fr.pot
+++ b/perl-install/share/po/help-fr.pot
@@ -5,12 +5,12 @@ msgstr ""
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
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"
@@ -37,7 +37,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"
@@ -46,7 +46,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 won't be able to undo this operation\n"
"after you confirm.\n"
"\n"
@@ -66,7 +66,7 @@ msgid ""
"refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
msgstr ""
"Cette étape vous permet de déterminer précisément l'emplacement de votre\n"
-"installation de Mandrivalinux. Si votre disque est vide ou utilisé par un\n"
+"installation de Mandriva Linux. Si votre disque est vide ou utilisé par un\n"
"autre système d'exploitation, vous devrez repartitionner votre disque.\n"
"Partitionner un disque désigne l'opération consistant à le diviser\n"
"précisément afin de créer un espace pour votre installation.\n"
@@ -96,7 +96,7 @@ msgstr ""
"Le redimensionnement peut être effectué sans pertes de données, à condition\n"
"que vous ayez préalablement défragmenté la partition Windows. Une\n"
"sauvegarde de vos données ne fera pas de mal non plus. Cette solution est\n"
-"recommandée pour faire cohabiter Mandrivalinux et Microsoft Windows sur le\n"
+"recommandée pour faire cohabiter Mandriva Linux et Microsoft Windows sur le\n"
"même ordinateur.\n"
"\n"
" Avant de choisir cette option, il faut comprendre qu'après cette\n"
@@ -106,7 +106,7 @@ msgstr ""
"\n"
" * « %s »: si vous voulez effacer toutes les données et les applications\n"
"installées sur votre système et les remplacer par votre nouveau système\n"
-"Mandrivalinux, choisissez cette option. Soyez prudent, car ce choix est\n"
+"Mandriva Linux, choisissez cette option. Soyez prudent, car ce choix est\n"
"irréversible et permanent. Il vous sera impossible de retrouver vos données\n"
"effacées.\n"
"\n"
@@ -227,7 +227,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"
@@ -236,19 +236,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 won't 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 ""
"Cette étape ne s'affichera que si une partition GNU/Linux a été détectée\n"
"sur votre disque dur.\n"
"\n"
"DrakX doit maintenant savoir si vous désirez lancer une « %s » ou une\n"
-"« %s » d'un système Mandrivalinux déjà installé :\n"
+"« %s » d'un système Mandriva Linux déjà installé :\n"
"\n"
" * « %s » : remplace l'ancien système. Cependant, selon votre table de\n"
"partition, vous pourrez éviter l'effacement de vos données existantes\n"
@@ -257,13 +257,13 @@ msgstr ""
"vous devriez utiliser cette option.\n"
"\n"
" * « %s » : cette classe d'installation vous permet de mettre à jour\n"
-"seulement les paquetages qui composent votre système Mandrivalinux. Elle\n"
+"seulement les paquetages qui composent votre système Mandriva Linux. Elle\n"
"conserve les partitions existantes, ainsi que la configuration des\n"
"utilisateurs. La plupart des autres étapes d'une installation classique\n"
"sont accessibles.\n"
"\n"
"La mise à jour devrait fonctionner correctement pour les systèmes\n"
-"Mandrivalinux à partir de la version « 8.1 ». Essayer de lancer une mise à\n"
+"Mandriva Linux à partir de la version « 8.1 ». Essayer de lancer une mise à\n"
"jour sur les versions antérieures à « 8.1 » n'est pas recommandé."
# DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -271,7 +271,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"
@@ -301,7 +301,7 @@ msgid ""
msgstr ""
"Plus d'une partition Windows a été détectée sur votre disque dur. Veuillez\n"
"choisir celle que vous choisissez pour votre nouvelle installation de\n"
-"Mandrivalinux.\n"
+"Mandriva Linux.\n"
"\n"
"Chaque partition est identifiée comme suit: \"Nom linux\", \"Nom Windows\",\n"
"\"Capacité\".\n"
@@ -333,7 +333,7 @@ msgstr ""
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
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"
@@ -345,7 +345,7 @@ msgid ""
"will appear: review the selection, and press \"%s\" to retrieve and install\n"
"the selected package(s), or \"%s\" to abort."
msgstr ""
-"Au moment où vous installez Mandrivalinux, il est possible que certains\n"
+"Au moment où vous installez Mandriva Linux, il est possible que certains\n"
"paquetages aient été mis à jour depuis la sortie du produit. Des bogues ont\n"
"pu être corrigés, et des problèmes de sécurité résolus. Pour vous permettre\n"
"de bénéficier de ces mises à jour, il vous est maintenant proposé de les\n"
@@ -363,7 +363,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"
@@ -419,7 +419,7 @@ msgid ""
msgstr ""
"X (pour le système X Window) est le coeur de votre interface graphique sous\n"
"GNU/Linux. Tous les environnements graphiques (KDE, GNOME, WindowMaker\n"
-"etc.) présents sur Mandrivalinux dépendent de X.\n"
+"etc.) présents sur Mandriva Linux dépendent de X.\n"
"\n"
"Il vous sera présenté une liste de divers paramètres à changer pour obtenir\n"
"un affichage optimal :\n"
@@ -479,7 +479,7 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
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, don't queue'', is the choice\n"
@@ -500,11 +500,11 @@ msgid ""
"options and for managing the printer.\n"
"\n"
"If you make a choice now, and later find that you don't 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 ""
"Il faut choisir ici un système d'impression pour votre ordinateur. D'autres\n"
-"OS en offrent un, Mandrivalinux en propose deux. Chaque système\n"
+"OS en offrent un, Mandriva Linux en propose deux. Chaque système\n"
"d'impression convient le mieux à certains types de configuration.\n"
"\n"
" * « %s » - qui veut dire « print, don't queue », (ou, impression sans\n"
@@ -526,17 +526,17 @@ msgstr ""
"Si vous choisissez votre système d'impression maintenant et que par la\n"
"suite vous n'en seriez pas convaincu, vous pourrez le changer\n"
"ultérieurement en lançant PrinterDrake depuis le Centre de contrôle\n"
-"Mandrivalinux puis en cliquant sur le bouton « %s »."
+"Mandriva Linux puis en cliquant sur le bouton « %s »."
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
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"
@@ -588,11 +588,11 @@ msgid ""
"megabytes."
msgstr ""
"C'est maintenant le moment de choisir les paquetages qui seront installés\n"
-"sur votre système. Sachez que Mandrivalinux contient plusieurs milliers de\n"
+"sur votre système. Sachez que Mandriva Linux contient plusieurs milliers de\n"
"paquetages à installer, et ces paquetages ont été rangés par groupes chacun\n"
"correspondant à un usage particulier de l'ordinateur.\n"
"\n"
-"Mandrivalinux range ces groupes en quatre catégories. Vous pouvez mélanger\n"
+"Mandriva Linux range ces groupes en quatre catégories. Vous pouvez mélanger\n"
"des groupes de plusieurs catégories de sorte qu'« une station de travail »\n"
"peut toujours proposer des applications pour la catégorie « Serveur ».\n"
"\n"
@@ -647,13 +647,13 @@ msgstr ""
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
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 ""
-"Les paquetages requis à l'installation de Mandrivalinux sont distribués sur\n"
+"Les paquetages requis à l'installation de Mandriva Linux sont distribués sur\n"
"plusieurs CD-ROM. Si un paquetage requis se trouve sur un autre CD-ROM,\n"
"DrakX éjectera celui présent dans le lecteur et vous demandera d'insérer le\n"
"CD-ROM approprié. Si vous ne possédez pas le CD demandé, cliquez tout\n"
@@ -769,10 +769,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 don't 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"
@@ -801,7 +801,7 @@ msgstr ""
"apparaît à droite.\n"
"\n"
"!! Si un paquetage serveur a été sélectionné, vous devrez confirmer que\n"
-"vous voulez vraiment que celui-ci soit installé. Sous Mandrivalinux , par\n"
+"vous voulez vraiment que celui-ci soit installé. Sous Mandriva Linux , par\n"
"défaut, tous les services installés sont lancés au démarrage. Malgré tous\n"
"les efforts investis pour vous livrer une distribution Linux sécurisée, il\n"
"est possible que certaines failles de sécurité affectent les serveurs\n"
@@ -924,7 +924,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"
@@ -967,7 +967,7 @@ msgstr ""
"À propos de l'encodage UTF-8 (unicode) : Unicode est un nouveau système\n"
"d'encodage des caractères censé couvrir tous les langues existantes.\n"
"Cependant son intégration dans GNU/Linux est encore imparfaite. Pour cette\n"
-"raison, Mandrivalinux l'utilisera ou non selon les critères suivants :\n"
+"raison, Mandriva Linux l'utilisera ou non selon les critères suivants :\n"
"\n"
" * Si vous choisissez une langue avec un encodage ayant une longue histoire\n"
"(langues associées à « latin1 », Russe, Japonais, Chinois, Coréen, Thaï,\n"
@@ -997,7 +997,7 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
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 ""
"Choisissez le disque dur à effacer pour installer votre partition\n"
@@ -1044,7 +1044,7 @@ msgid ""
"generally obtained at the expense of ease of use.\n"
"\n"
"If you don't 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"
@@ -1059,7 +1059,7 @@ msgstr ""
"\n"
"Si vous ne savez pas quel niveau choisir, gardez la sélection par défaut.\n"
"Vous pourrez le modifier ultérieurement avec l'outil draksec, qui se trouve\n"
-"dans le Mandrivalinux Control Center\n"
+"dans le Mandriva Linux Control Center\n"
"\n"
"Remplissez le champ « %s » avec l'adresse électronique de l'utilisateur qui\n"
"sera responsable de la sécurité. Les messages de sécurité lui seront\n"
@@ -1120,7 +1120,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"
@@ -1137,7 +1137,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"
@@ -1188,7 +1188,7 @@ msgstr ""
"\n"
" * « %s » : si vous souhaitez configurer votre accès Internet ou réseau\n"
"local dès maintenant. Lisez la documentation fournie ou éxécutez\n"
-"Mandrivalinux Control Center après l'installation pour avoir droit à une\n"
+"Mandriva Linux Control Center après l'installation pour avoir droit à une\n"
"aide complète en ligne.\n"
"\n"
" * « %s »: permet de configurer les adresses proxy HTTP et FTP si la\n"
@@ -1205,7 +1205,7 @@ msgstr ""
" * « %s » : si vous souhaitez changer la configuration par défaut de votre\n"
"chargeur de démarrage. À réserver aux utilisateurs expérimentés. Lisez la\n"
"documentation fournie ou l'aide en ligne sur la configuration de chargeur\n"
-"de démarrage présente dans Mandrivalinux Control Center.\n"
+"de démarrage présente dans Mandriva Linux Control Center.\n"
"\n"
" * « %s » : vous pourrez ici contrôler finement les services disponibles\n"
"sur votre machine. Si vous envisagez de monter un serveur, c'est une bonne\n"
@@ -1294,13 +1294,13 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
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 ""
"Avant d'aller plus loin, il est fortement recommandé de lire attentivement\n"
"les termes et conditions d'utilisation de la licence. Celle-ci régit\n"
-"l'ensemble de la distribution Mandrivalinux. Si vous en acceptez tous les\n"
+"l'ensemble de la distribution Mandriva Linux. Si vous en acceptez tous les\n"
"termes, cochez la case « %s », sinon, cliquez sur le bouton « %s » pour\n"
"redémarrer votre ordinateur."
@@ -1510,7 +1510,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."
@@ -1530,7 +1530,7 @@ msgstr ""
"Cliquez sur « %s » lorsque vous êtes prêt à formater les partitions.\n"
"\n"
"Cliquez sur « %s » pour choisir une autre partition où installer votre\n"
-"nouveau système d'exploitation Mandrivalinux.\n"
+"nouveau système d'exploitation Mandriva Linux.\n"
"\n"
"Cliquer sur « %s » si vous désirez sélectionner des partitions pour une\n"
"vérification des secteurs défectueux (« Bad Blocks »)."
@@ -1610,7 +1610,7 @@ msgid ""
"\"mformat a:\", or \"fdformat /dev/fd0\" followed by \"mkfs.vfat\n"
"/dev/fd0\"."
msgstr ""
-"Votre installation de Mandrivalinux est maintenant terminée et votre\n"
+"Votre installation de Mandriva Linux est maintenant terminée et votre\n"
"système est prêt à être utilisé. Cliquez sur « %s » pour redémarrer votre\n"
"système. N'oubliez pas de retirer la source d'installation(CD-ROM ou\n"
"disquette). La première chose que vous verrez alors après que l'ordinateur\n"
@@ -1648,7 +1648,7 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
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"
@@ -1719,7 +1719,7 @@ msgid ""
"emergency boot situations."
msgstr ""
"À cette étape, vous devez sélectionner quelle partition sera utilisée pour\n"
-"votre système Mandrivalinux. Si votre disque est déjà partitionné, soit par\n"
+"votre système Mandriva Linux. Si votre disque est déjà partitionné, soit par\n"
"une autre installation GNU/Linux ou par un autre outil de partitionnement,\n"
"vous pourrez les utiliser. Sinon, les partitions devront être créées.\n"
"\n"
diff --git a/perl-install/share/po/help-it.pot b/perl-install/share/po/help-it.pot
index d10f299bb..7500e8a0f 100644
--- a/perl-install/share/po/help-it.pot
+++ b/perl-install/share/po/help-it.pot
@@ -5,12 +5,12 @@ msgstr ""
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
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"
@@ -37,7 +37,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"
@@ -46,7 +46,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 won't be able to undo this operation\n"
"after you confirm.\n"
"\n"
@@ -66,12 +66,12 @@ msgid ""
"refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
msgstr ""
"A questo punto dovete scegliere in quali punti del vostro disco rigido\n"
-"installare il sistema operativo Mandrivalinux. Se il disco è vuoto, o se\n"
+"installare il sistema operativo Mandriva Linux. Se il disco è vuoto, o se\n"
"tutto lo spazio disponibile è occupato da un altro sistema operativo già\n"
"installato, allora dovrete creare o modificare le partizioni. In breve,\n"
"partizionare un disco rigido consiste nel suddividerlo logicamente in più\n"
"zone in maniera da creare lo spazio necessario all'installazione di\n"
-"Mandrivalinux.\n"
+"Mandriva Linux.\n"
"\n"
"Dato che gli effetti del partizionamento sono di solito irreversibili, e\n"
"possono causare la perdita di dati, questa operazione può intimidire e\n"
@@ -102,7 +102,7 @@ msgstr ""
"dati, a patto che prima di procedere la partizione Windows sia stata\n"
"deframmentata. Vi consigliamo caldamente di fare comunque una copia di\n"
"sicurezza dei vostri dati. Questa è la soluzione consigliata se desiderate\n"
-"usare sia Mandrivalinux che Microsoft Windows sullo stesso computer.\n"
+"usare sia Mandriva Linux che Microsoft Windows sullo stesso computer.\n"
"\n"
" Prima di scegliere questa opzione, tenete presente che le dimensioni\n"
"della partizione su cui risiede Windows saranno ridotte rispetto a quelle\n"
@@ -111,7 +111,7 @@ msgstr ""
"\n"
" * \"%s\": se desiderate cancellare tutti i dati e tutte le partizioni\n"
"presenti sul vostro disco rigido e rimpiazzarli con il vostro nuovo sistema\n"
-"Mandrivalinux, potete selezionare questa opzione. Fate molta attenzione,\n"
+"Mandriva Linux, potete selezionare questa opzione. Fate molta attenzione,\n"
"perché dopo aver dato conferma non potrete più tornare indietro.\n"
"\n"
" !! Se scegliete questa opzione tutti i dati sul vostro disco saranno\n"
@@ -235,7 +235,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"
@@ -244,19 +244,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 won't 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 ""
"Questo passo viene eseguito soltanto se sulla vostra macchina viene trovata\n"
"una partizione GNU/Linux preesistente.\n"
"\n"
"A questo punto DrakX ha bisogno di sapere se intendete effettuare una nuova\n"
-"installazione o un aggiornamento di un sistema Mandrivalinux esistente:\n"
+"installazione o un aggiornamento di un sistema Mandriva Linux esistente:\n"
"\n"
" * \"%s\": nella maggior parte dei casi cancella completamente il vecchio\n"
"sistema. Tuttavia, in base allo schema di partizionamento usato, potete\n"
@@ -266,19 +266,19 @@ msgstr ""
"\n"
" * \"%s\": questo tipo di installazione vi permette di effettuare un\n"
"semplice aggiornamento dei pacchetti già installati sul vostro sistema\n"
-"Mandrivalinux. Tutte le partizioni attuali del disco rigido vengono\n"
+"Mandriva Linux. Tutte le partizioni attuali del disco rigido vengono\n"
"conservate, come pure le configurazioni e i dati individuali degli utenti.\n"
"La maggior parte degli altri passi relativi alla configurazione restano\n"
"disponibili, come per una installazione normale.\n"
"\n"
"L'opzione \"Aggiornamento\" non dovrebbe comportare difficoltà per sistemi\n"
-"Mandrivalinux a partire dalla versione \"8.1\", mentre non è consigliabile\n"
-"utilizzarla per aggiornare versioni di Mandrivalinux precedenti la \"8.1\"."
+"Mandriva Linux a partire dalla versione \"8.1\", mentre non è consigliabile\n"
+"utilizzarla per aggiornare versioni di Mandriva Linux precedenti la \"8.1\"."
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
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"
@@ -290,7 +290,7 @@ msgid ""
"will appear: review the selection, and press \"%s\" to retrieve and install\n"
"the selected package(s), or \"%s\" to abort."
msgstr ""
-"È molto probabile che, al momento in cui installate Mandrivalinux, alcuni\n"
+"È molto probabile che, al momento in cui installate Mandriva Linux, alcuni\n"
"pacchetti siano stati aggiornati rispetto alla versione iniziale;\n"
"potrebbero essere stati corretti degli errori, o risolti eventuali problemi\n"
"relativi alla sicurezza. Per permettervi di beneficiare di questi\n"
@@ -311,7 +311,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"
@@ -341,7 +341,7 @@ msgid ""
msgstr ""
"Sul vostro disco rigido è stata individuata più di una partizione\n"
"Microsoft. Scegliete quella che deve essere ridimensionata in modo da poter\n"
-"installare il vostro nuovo sistema operativo Mandrivalinux.\n"
+"installare il vostro nuovo sistema operativo Mandriva Linux.\n"
"\n"
"Ogni partizione è elencata in questo modo: \"nome Linux\", \"nome Windows\"\n"
"\"Dimensione\".\n"
@@ -374,7 +374,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"
@@ -430,7 +430,7 @@ msgid ""
msgstr ""
"X (abbreviazione per \"X Window System\") è il cuore dell'interfaccia\n"
"grafica di GNU/Linux, sul quale sono basati tutti gli ambienti grafici\n"
-"inclusi in Mandrivalinux (KDE, GNOME, AfterStep, WindowMaker, etc.).\n"
+"inclusi in Mandriva Linux (KDE, GNOME, AfterStep, WindowMaker, etc.).\n"
"\n"
"Vi verrà mostrata una lista dei parametri da configurare in modo da avere\n"
"la miglior visualizzazione possibile:\n"
@@ -492,7 +492,7 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
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, don't queue'', is the choice\n"
@@ -513,11 +513,11 @@ msgid ""
"options and for managing the printer.\n"
"\n"
"If you make a choice now, and later find that you don't 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 ""
"Qui potrete scegliere il sistema di stampa da usare con il vostro computer;\n"
-"altri sistemi operativi ve ne offrono uno, ma Mandrivalinux ve ne offre ben\n"
+"altri sistemi operativi ve ne offrono uno, ma Mandriva Linux ve ne offre ben\n"
"due. Ciascuno di essi è adatto a un particolare tipo di configurazione.\n"
"\n"
" * \"%s\" -- che sta per \"\"print, don't queue\"\" (\"stampa, non mettere\n"
@@ -541,17 +541,17 @@ msgstr ""
"\n"
"Se fate una scelta adesso e successivamente cambiate idea, potrete sempre\n"
"scegliere un diverso sistema di stampa avviando PrinterDrake dal\n"
-"Mandrivalinux Control Center e cliccando sul pulsante \"%s\"."
+"Mandriva Linux Control Center e cliccando sul pulsante \"%s\"."
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
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"
@@ -604,7 +604,7 @@ msgid ""
msgstr ""
"Adesso è il momento di indicare i programmi che volete siano installati sul\n"
"vostro sistema. Ci sono migliaia di pacchetti disponibili per\n"
-"Mandrivalinux, e sono stati suddivisi in gruppi in base al loro campo di\n"
+"Mandriva Linux, e sono stati suddivisi in gruppi in base al loro campo di\n"
"utilizzo, in modo da facilitarne la gestione.\n"
"\n"
"I gruppi sono a loro volta suddivisi in quattro categorie. Potete\n"
@@ -665,13 +665,13 @@ msgstr ""
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
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 ""
-"La distribuzione Mandrivalinux è suddivisa su più CD-ROM. Se uno dei\n"
+"La distribuzione Mandriva Linux è suddivisa su più CD-ROM. Se uno dei\n"
"pacchetti selezionati si trova su un CD-ROM diverso da quello attualmente\n"
"inserito nel lettore, DrakX provvederà a espellerlo e a chiedervi di\n"
"inserire quello corretto. Se non avete a portata di mano il CD richiesto,\n"
@@ -791,10 +791,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 don't 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"
@@ -825,11 +825,11 @@ msgstr ""
"!! Se avete selezionato un pacchetto che offre un servizio come server\n"
"(intenzionalmente, oppure perché faceva parte di un gruppo), vi verrà\n"
"chiesta conferma per la sua effettiva installazione. Come opzione\n"
-"predefinita, in Mandrivalinux tutti i servizi installati vengono attivati\n"
+"predefinita, in Mandriva Linux tutti i servizi installati vengono attivati\n"
"automaticamente all'avvio. Sebbene si tratti di servizi sicuri ed esenti da\n"
"problemi noti al momento del rilascio della distribuzione, non è escluso\n"
"che possano essere scoperte falle di sicurezza al loro interno dopo la\n"
-"pubblicazione di questa versione di Mandrivalinux. Quindi, se non avete\n"
+"pubblicazione di questa versione di Mandriva Linux. Quindi, se non avete\n"
"idea di cosa faccia un particolare servizio o del perché debba essere\n"
"installato, cliccate su \"%s\". Scegliendo \"%s\", invece, i servizi\n"
"elencati saranno installati e attivati in automatico all'avvio del sistema.\n"
@@ -946,7 +946,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"
@@ -990,7 +990,7 @@ msgstr ""
"Riguardo al supporto UTF-8 (Unicode): Unicode è un nuovo standard per la\n"
"codifica dei caratteri, progettato per supportare tutte le lingue\n"
"esistenti. Il suo supporto su GNU/Linux è ancora in fase di sviluppo, e per\n"
-"questo motivo la sua attivazione su Mandrivalinux dipenderà dalle scelte\n"
+"questo motivo la sua attivazione su Mandriva Linux dipenderà dalle scelte\n"
"effettuate dall'utente:\n"
"\n"
" * se scegliete lingue fortemente legate alle vecchie codifiche (lingue del\n"
@@ -1035,11 +1035,11 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
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 ""
"Scegliete il disco rigido che volete cancellare per poter creare la nuova\n"
-"partizione su cui installare Mandrivalinux. Attenzione, tutti i dati\n"
+"partizione su cui installare Mandriva Linux. Attenzione, tutti i dati\n"
"presenti sul disco selezionato andranno perduti e non potranno più essere\n"
"recuperati!"
@@ -1093,7 +1093,7 @@ msgid ""
"generally obtained at the expense of ease of use.\n"
"\n"
"If you don't 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"
@@ -1108,7 +1108,7 @@ msgstr ""
"\n"
"Se non sapete quale scelta fare, utilizzate l'impostazione predefinita.\n"
"Potrete comunque cambiare in seguito il livello di sicurezza usando\n"
-"draksec, uno strumento del Mandrivalinux Control Center.\n"
+"draksec, uno strumento del Mandriva Linux Control Center.\n"
"\n"
"Nel campo \"%s\" inserite l'indirizzo email dell'utente che sarà\n"
"responsabile per la sicurezza: tutti i messaggi relativi alla sicurezza\n"
@@ -1160,7 +1160,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"
@@ -1177,7 +1177,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"
@@ -1231,7 +1231,7 @@ msgstr ""
"\n"
" * \"%s\": se desiderate configurare l'accesso a Internet o a una rete\n"
"locale potete farlo adesso. Consultate la documentazione stampata, oppure\n"
-"utilizzate il Mandrivalinux Control Center una volta terminata\n"
+"utilizzate il Mandriva Linux Control Center una volta terminata\n"
"l'installazione per avere a vostra disposizione un aiuto in linea completo.\n"
"\n"
" * \"%s\": vi permette di configurare gli indirizzi di proxy HTTP e FTP,\n"
@@ -1249,7 +1249,7 @@ msgstr ""
" * \"%s\": cliccate su questo pulsante per cambiare la configurazione del\n"
"bootloader. Questa opzione dovrebbe essere utilizzata solo dagli utenti più\n"
"esperti. Consultate la documentazione stampata o l'aiuto in linea del\n"
-"Mandrivalinux Control Center riguardo la configurazione del bootloader.\n"
+"Mandriva Linux Control Center riguardo la configurazione del bootloader.\n"
"\n"
" * \"%s\": qui potrete stabilire in dettaglio quali servizi saranno\n"
"attivati sul vostro sistema. Se pensate di utilizzare il computer come\n"
@@ -1365,12 +1365,12 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
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 ""
"Prima di proseguire dovreste leggere con attenzione le condizioni d'uso che\n"
-"riguardano l'intera distribuzione Mandrivalinux. Se siete d'accordo con\n"
+"riguardano l'intera distribuzione Mandriva Linux. Se siete d'accordo con\n"
"tutti i termini della licenza cliccate sul pulsante \"%s\". In caso\n"
"contrario, semplicemente spegnere il computer per interrompere\n"
"l'installazione."
@@ -1558,7 +1558,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."
@@ -1580,7 +1580,7 @@ msgstr ""
"Cliccate su \"%s\" quando siete pronti ad avviare la formattazione.\n"
"\n"
"Cliccate su \"%s\" se desiderate installare il vostro nuovo sistema\n"
-"operativo Mandrivalinux su partizioni diverse da quelle selezionate.\n"
+"operativo Mandriva Linux su partizioni diverse da quelle selezionate.\n"
"\n"
"Cliccate su \"%s\" se desiderate selezionare alcune delle partizioni\n"
"affinché venga controllata la presenza di eventuali blocchi danneggiati su\n"
@@ -1707,7 +1707,7 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
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"
@@ -1778,7 +1778,7 @@ msgid ""
"emergency boot situations."
msgstr ""
"A questo punto, dovete decidere quali partizioni devono essere usate per\n"
-"l'installazione del vostro sistema Mandrivalinux. Se sono già state\n"
+"l'installazione del vostro sistema Mandriva Linux. Se sono già state\n"
"definite delle partizioni, grazie a una precedente installazione di\n"
"GNU/Linux o usando un altro programma di partizionamento, potete utilizzare\n"
"quelle. In caso contrario, sarà necessario creare o modificare le\n"
diff --git a/perl-install/share/po/help-ru.pot b/perl-install/share/po/help-ru.pot
index b56f80cd3..634c78d13 100644
--- a/perl-install/share/po/help-ru.pot
+++ b/perl-install/share/po/help-ru.pot
@@ -5,12 +5,12 @@ msgstr ""
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
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"
@@ -37,7 +37,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"
@@ -46,7 +46,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 won't be able to undo this operation\n"
"after you confirm.\n"
"\n"
@@ -66,11 +66,11 @@ msgid ""
"refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
msgstr ""
"На этом шаге вам прийдется решить, куда вы хотите установить операционную\n"
-"систему Mandrivalinux на вашем жестком диске. Если ваш жесткий диск пуст,\n"
+"систему Mandriva Linux на вашем жестком диске. Если ваш жесткий диск пуст,\n"
"или существующая операционная система на нем занимает все дисковое\n"
"пространство, вам прийдется диск переразбить (partition). Разделение диска\n"
"в основном состоит в том, чтобы логически выделить на нем свободное\n"
-"пространство для установки вашей новой системы Mandrivalinux.\n"
+"пространство для установки вашей новой системы Mandriva Linux.\n"
"\n"
"Поскольку разделение диска - это обычно необратимый процесс и может\n"
"привести к потере данных, если на диске уже есть установленная операционная\n"
@@ -97,7 +97,7 @@ msgstr ""
"потери данных, особенно если вы предварительно провели дефрагментацию\n"
"раздела Windows. Резервное копирование ваших данных настойчиво\n"
"рекомендуется.. Рекомендуем выбрать эту опцию, если вы собираетесь\n"
-"использовать Mandrivalinux и Microsoft Windows на одном компьютере.\n"
+"использовать Mandriva Linux и Microsoft Windows на одном компьютере.\n"
"\n"
" Перед тем, как выбрать эту опцию, вы должны осознать, что размер вашего\n"
"раздела Microsoft Windows станет меньше, чем был. У вас будет меньше\n"
@@ -105,7 +105,7 @@ msgstr ""
"новых программ.\n"
"\n"
" * \"%s\" выберите эту опцию, если вы хотите удалить все данные на всех\n"
-"разделах вашего жесткого диска и заменить их новой системой Mandrivalinux.\n"
+"разделах вашего жесткого диска и заменить их новой системой Mandriva Linux.\n"
"Будьте осторожны в этом решении, потому что после подтверждения вы не\n"
"сможете вернуть обратно все как было.\n"
"\n"
@@ -227,7 +227,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"
@@ -236,19 +236,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 won't 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"
"раздел GNU/Linux.\n"
"\n"
"DrakX теперь должен узнать, хотите ли вы провести новую установку или\n"
-"обновление существующей системы Mandrivalinux:\n"
+"обновление существующей системы Mandriva Linux:\n"
"\n"
" * \"%s\": в большинстве случаев этот вариант приведет к уничтожению старой\n"
"системы. Если вы желаете изменить разделы вашего жесткого диска или\n"
@@ -257,18 +257,18 @@ msgstr ""
"от перезаписи некоторые свои данные.\n"
"\n"
" * \"%s\": этот класс установки позволит вам обновить пакеты, установленные\n"
-"в вашей системе Mandrivalinux. Текущая схема разделов диска и\n"
+"в вашей системе Mandriva Linux. Текущая схема разделов диска и\n"
"пользовательские данные останутся нетронутыми. Большинство других шагов\n"
"будут доступны, как и при стандартной установке.\n"
"\n"
-"``Обновление'' будет неплохо работать на системах Mandrivalinux начиная с\n"
-"\"8.1\" и выше. Проведение обновления на системах Mandrivalinux старше\n"
+"``Обновление'' будет неплохо работать на системах Mandriva Linux начиная с\n"
+"\"8.1\" и выше. Проведение обновления на системах Mandriva Linux старше\n"
"\"8.1\" не рекомендуется."
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
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"
@@ -280,7 +280,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"
@@ -297,7 +297,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"
@@ -327,7 +327,7 @@ msgid ""
msgstr ""
"На вашем жестом диске обнаружено несколько разделов Microsoft. Выберите\n"
"необходимый раздел для изменения его размера с целью установки вашей новой\n"
-"операционной системы Mandrivalinux.\n"
+"операционной системы Mandriva Linux.\n"
"\n"
"Каждый раздел перечислен так: \"Linux имя\", \"Windows имя\" \"Размер\".\n"
"\n"
@@ -359,7 +359,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"
@@ -415,7 +415,7 @@ msgid ""
msgstr ""
"X (для системы X Window) это сердце графического интерфейса GNU/Linux, на\n"
"базе которого работают все графические среды (KDE, GNOME, AfterStep,\n"
-"WindowMaker, и т.д..), входящие в Mandrivalinux.\n"
+"WindowMaker, и т.д..), входящие в Mandriva Linux.\n"
"\n"
"Вам будет представлен список различных параметров для получения\n"
"оптимального графического отображения: Видеокарта\n"
@@ -473,7 +473,7 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
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, don't queue'', is the choice\n"
@@ -494,11 +494,11 @@ msgid ""
"options and for managing the printer.\n"
"\n"
"If you make a choice now, and later find that you don't 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 ""
"Теперь пришло время выбрать систему печати для вашего компьютера. Другие OS\n"
-"могут предложить вам одну, а Mandrivalinux предлагает две. Каждая из систем\n"
+"могут предложить вам одну, а Mandriva Linux предлагает две. Каждая из систем\n"
"является лучшей для определенной конфигурации.\n"
"\n"
" * \"%s\" -- что означает ``печатать, не ставить в очередь'' (``print,\n"
@@ -527,11 +527,11 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
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"
@@ -583,11 +583,11 @@ msgid ""
"megabytes."
msgstr ""
"Теперь настало время определить, какие программы вы хотите установить в\n"
-"вашу систему. С Mandrivalinux поставляются тысячи пакетов и, для упрощения\n"
+"вашу систему. С Mandriva Linux поставляются тысячи пакетов и, для упрощения\n"
"выбора, они разбиты на группы.\n"
"\n"
"Пакеты сортированы по группам, которые соответствуют специфике\n"
-"использования вашей машины. В Mandrivalinux пакеты сортируются по четырем\n"
+"использования вашей машины. В Mandriva Linux пакеты сортируются по четырем\n"
"категориям. Вы можете смешивать и сочетать приложения из различных\n"
"категорий, например, вариант установки ``Рабочая станция'' может иметь\n"
"приложения из категории ``Разработка''.\n"
@@ -635,13 +635,13 @@ msgstr ""
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
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 размещена на нескольких CD-ROMах. Если выбранный\n"
+"Инсталляция Mandriva Linux размещена на нескольких CD-ROMах. Если выбранный\n"
"пакет находится на другом CD-ROM, DrakX будет отдавать текущий CD и просить\n"
"вас вставить другой по мере надобности."
@@ -753,10 +753,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 don't 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"
@@ -785,10 +785,10 @@ msgstr ""
"\n"
"!! Если был выбран какой-либо серверный пакет, специально или он был частью\n"
"какой-либо группы, вас попросят подтвердить, действительно ли вы желаете\n"
-"установить эти сервера. Под Mandrivalinux все установленные сервера\n"
+"установить эти сервера. Под Mandriva Linux все установленные сервера\n"
"запускаются по умолчанию в процессе загрузки. Даже если они безопасны и не\n"
"имеют известных проблем на момент выпуска дистрибутива, в них могут быть\n"
-"обнаружены дыры в безопасности после выпуска данной версии Mandrivalinux.\n"
+"обнаружены дыры в безопасности после выпуска данной версии Mandriva Linux.\n"
"Если вы не знаете, зачем нужен данный сервис и что он делает, нажмите\n"
"\"%s\". Если вы нажмете \"%s\", тогда все сервисы из списка будут\n"
"установлены и автоматически запущены при загрузке системы. !!\n"
@@ -894,7 +894,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"
@@ -932,7 +932,7 @@ msgstr ""
"\n"
"О поддержке UTF-8 (unicode): Unicode это новая кодировка, которая включает\n"
"в себя все существующие языки. Однако ее полная поддержка в GNU/Linux пока\n"
-"находится в стадии разработки. Поэтому Mandrivalinux будет определять\n"
+"находится в стадии разработки. Поэтому Mandriva Linux будет определять\n"
"использовать ее или нет в зависимости от выбора пользователя:\n"
"\n"
" * Если вы выбираете языки, которые имеют свою традиционную устоявшуюся\n"
@@ -975,11 +975,11 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
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. Будьте осторожны, все данные на нем будут потеряны и\n"
+"раздела Mandriva Linux. Будьте осторожны, все данные на нем будут потеряны и\n"
"их нельзя будет восстановить!"
# DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -1031,7 +1031,7 @@ msgid ""
"generally obtained at the expense of ease of use.\n"
"\n"
"If you don't 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"
@@ -1045,7 +1045,7 @@ msgstr ""
"\n"
"Если вы не знаете что выбрать, оставьте выбор по умолчанию. Вы сможете\n"
"изменить этот уровень безопасности потом с помощью утилиты draksec из\n"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
"\n"
"В поле \"%s\" системе указывается пользователь, который будет отвечать за\n"
"безопасность. На этот адрес будут посылаться сообщения по безопасности."
@@ -1096,7 +1096,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"
@@ -1113,7 +1113,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"
@@ -1281,12 +1281,12 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
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. Если вы\n"
+"Лицензия распространяется на весь дистрибутив Mandriva Linux. Если вы\n"
"согласны со всеми условиями лицензии, отметьте пункт \"%s\". Если нет -\n"
"просто выключите свой компьютер."
@@ -1465,7 +1465,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."
@@ -1490,7 +1490,7 @@ msgstr ""
"Нажмите \"%s\", когда будете готовы начать форматирование разделов.\n"
"\n"
"Нажмите \"%s\", если вы хотите выбрать другой раздел для установки\n"
-"Mandrivalinux.\n"
+"Mandriva Linux.\n"
"\n"
"Нажмите \"%s\", если хотите выбрать разделы, которые следует проверить на\n"
"сбойные блоки (bad blocks)."
@@ -1604,7 +1604,7 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
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"
@@ -1675,7 +1675,7 @@ msgid ""
"emergency boot situations."
msgstr ""
"Здесь вам предложат выбрать, какие разделы будут использоваться для\n"
-"установки вашей системы Mandrivalinux. Если разделы были уже определены\n"
+"установки вашей системы Mandriva Linux. Если разделы были уже определены\n"
"ранее, например, предыдущей инсталляцией GNU/Linux или другой утилитой\n"
"разбиения дисков, вы можете воспользоваться существующими разделами. В\n"
"противном случае, разделы жесткого диска должны быть определены.\n"
diff --git a/perl-install/share/po/help-zh_CN.pot b/perl-install/share/po/help-zh_CN.pot
index eedb1edf9..3257eedf1 100644
--- a/perl-install/share/po/help-zh_CN.pot
+++ b/perl-install/share/po/help-zh_CN.pot
@@ -19,7 +19,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"
@@ -53,7 +53,7 @@ msgstr ""
"单击\"%s\"按钮以后,您可以选择要在您的工作站上安装哪些额外的语言,即为系统文档和应用程序安装特定语言的文件。例如,如果您的计算机要为繁体中文的用户提供服务,请在树视图中选择简体中文作为默认语言,然后在高级选项中选择\"%s\"。\n"
"\n"
"关于 UTF-8 (Unicode) 支持:Unicode 是一种新的字符编码,该编码可支持所有现存的语言。但是,在 GNU/Linux 下完全支持\n"
-"Unicode,仍然在开发和完善中。由此原因,Mandrivalinux 会根据用户的选择是否使用 UTF-8:\n"
+"Unicode,仍然在开发和完善中。由此原因,Mandriva Linux 会根据用户的选择是否使用 UTF-8:\n"
"\n"
" * 如果您所选的语言自身有强制性的编码(latin1 语言、俄语、日语、中文、朝鲜语、泰语、希腊语、土耳其语及大多数 iso-8859-2\n"
"语言),则会默认使用强制编码;\n"
@@ -82,12 +82,12 @@ msgstr ""
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
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"
@@ -114,7 +114,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"
@@ -123,7 +123,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 won't be able to undo this operation\n"
"after you confirm.\n"
"\n"
@@ -142,9 +142,9 @@ 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 ""
-"在这一步里,您需要决定您想要将 Mandrivalinux\n"
+"在这一步里,您需要决定您想要将 Mandriva Linux\n"
"操作系统安装到硬盘的何处。如果您的硬盘完全是空的,或者已有操作系统使用了所有的空间,您就必须要对硬盘进行分区。粗略的说,对硬盘进行分区就是将其划分成几个逻辑上不同的部分,以便创建安装您新的\n"
-"Mandrivalinux 系统所需的空间。\n"
+"Mandriva Linux 系统所需的空间。\n"
"\n"
"由于对硬盘进行分区通常是不可恢复的,并且可能导致数据丢失,所以对于没有经验的用户来说,分区是十分危险的操作。所幸的是,DrakX\n"
"所包含的向导能够显著简化这一过程。在继续这一步骤之前,请花点时间仔细阅读本节及以上的所有内容。\n"
@@ -159,13 +159,13 @@ msgstr ""
" * \"%s\"。如果在您的硬盘上安装了 Microsoft Windows,而该操作系统占用了所有的空间,您就需要为 GNU/Linux\n"
"创建剩余空间。要完成这一操作,您可以删除您的 Microsoft Windows 分区和数据(参看``删除整个磁盘''方案),或者更改\n"
"Microsoft Windows FAT 或 NTFS 分区的大小。更改分区大小通常不会造成任何数据丢失,但您必须事先对 Windows\n"
-"分区进行了磁盘碎片整理。我们强烈推荐您事先备份您的数据。如果您想要在同一台计算机上使用 Mandrivalinux 和 Microsoft\n"
+"分区进行了磁盘碎片整理。我们强烈推荐您事先备份您的数据。如果您想要在同一台计算机上使用 Mandriva Linux 和 Microsoft\n"
"Windows,则推荐使用此选项。\n"
"\n"
" 注意,在执行这一过程之后,您原有的 Microsoft Windows 分区将会比先前小一些。而您在 Microsoft Windows\n"
"下可用来存储数据或安装新软件的剩余空间也会变少。\n"
"\n"
-" * \"%s\"。如果您想要删除硬盘上的全部数据和全部分区,并将其替换为全新的 Mandrivalinux\n"
+" * \"%s\"。如果您想要删除硬盘上的全部数据和全部分区,并将其替换为全新的 Mandriva Linux\n"
"系统,请选择此选项。请额外小心,因为在您确认之后,此操作无法撤销。\n"
"\n"
" !! 如果您选择了此选项,您硬盘上的全部数据都将被删除。 !!\n"
@@ -282,7 +282,7 @@ msgid ""
"generally obtained at the expense of ease of use.\n"
"\n"
"If you don't 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"
@@ -291,7 +291,7 @@ msgstr ""
"在这里,DrakX 将允许您选择计算机要使用的安全级别。说的直白一点,如果计算机将包含关键数据,或者将直接暴露于 Internet\n"
"之下,则应该设置较高的安全级别。较高的安全级别通常以损失易用性作为代价。\n"
"\n"
-"如果您不知道要选择什么,请保持默认选项。您可以稍后从 Mandrivalinux Control Center的一部分 draksec\n"
+"如果您不知道要选择什么,请保持默认选项。您可以稍后从 Mandriva Linux Control Center的一部分 draksec\n"
"来更改安全级别。\n"
"\n"
"请在\"%s\"域中填入要负责安全的人的电子邮件地址。安全信息将被发送到该地址。"
@@ -303,7 +303,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"
@@ -312,26 +312,26 @@ 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 won't 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 ""
"仅当在您的计算机上发现了已有的 GNU/Linux 分区,才会激活这一步骤。\n"
"\n"
-"DrakX 现在需要知道您是想要执行全新安装,还是升级已有的 Mandrivalinux 系统:\n"
+"DrakX 现在需要知道您是想要执行全新安装,还是升级已有的 Mandriva Linux 系统:\n"
"\n"
" *\n"
"\"%s\":总体来说,这将完全销毁旧系统。但是,根据您选择的分区方案,您可以让现有的数据(比如\"主\"目录)免于覆盖。如果您想要更改硬盘的分区方案,或者更该文件系统,您就应该使用此选项。\n"
"\n"
-" * \"%s\":这一安装级别允许您更新目前安装在您 Mandrivalinux\n"
+" * \"%s\":这一安装级别允许您更新目前安装在您 Mandriva Linux\n"
"系统上的软件包。您的分区方案和用户数据都不会被破坏。绝大多数配置步骤仍然可用,与标准安装类似。\n"
"\n"
-"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandrivalinux 系统上工作正常。不推荐在先于 \"8.1\" 版本的\n"
-"Mandrivalinux 系统上执行升级。"
+"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandriva Linux 系统上工作正常。不推荐在先于 \"8.1\" 版本的\n"
+"Mandriva Linux 系统上执行升级。"
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
@@ -379,7 +379,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"
@@ -396,7 +396,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"
@@ -428,7 +428,7 @@ msgstr ""
" * \"%s\":默认情况下,DrakX 会将您的图形界面配置为 \"800x600\" 或 \"1024x768\"\n"
"分辨率。如果这不适合您的话,请单击\"%s\"重新配置您的图形界面。\n"
"\n"
-" * \"%s\":如果您想要配置您的 Internet 或局域网访问,现在就可以进行。请参考印刷文档或在安装完成后使用 Mandrivalinux\n"
+" * \"%s\":如果您想要配置您的 Internet 或局域网访问,现在就可以进行。请参考印刷文档或在安装完成后使用 Mandriva Linux\n"
"Control Center来获得完整的在线帮助。\n"
"\n"
" * \"%s\":如果您所安装的计算机位于代理服务器之后,这里将允许您配置 HTTP 和 FTP 代理服务器地址。\n"
@@ -438,7 +438,7 @@ msgstr ""
" * \"%s\":如果您计划将您的计算机连接到\n"
"Internet,那么保护您的计算机免于攻击的有效方法就是设置防火墙。请参考``初学者指南''中的相应章节,以获得关于防火墙设置的细节。\n"
"\n"
-" * \"%s\":如果您想要更改您的引导程序配置,请单击此按钮。这仅适用于高级用户。请参考印刷文档或 Mandrivalinux Control\n"
+" * \"%s\":如果您想要更改您的引导程序配置,请单击此按钮。这仅适用于高级用户。请参考印刷文档或 Mandriva Linux Control\n"
"Center中关于引导程序配置的帮助。\n"
"\n"
" * \"%s\":在此您可以精确调整要在您的计算机上运行哪些服务。如果您要将此计算机用作服务器,那么应该复查这一设置。"
@@ -455,7 +455,7 @@ msgstr ""
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
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"
@@ -467,7 +467,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"
"的这个时候,很可能有些软件包在发行之后已经更新。有些故障已经被修正,有些安全问题已经被解决。为了让您能够享用这些更新,您现在可以从 Internet\n"
"上下载它们。如果您的 Internet 连接已经可以使用,请选择\"%s\"。如果您愿意以后再升级,请选择\"%s\"。\n"
"\n"
@@ -531,7 +531,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"
@@ -585,7 +585,7 @@ msgid ""
"want to check \"%s\" if your machine is to act as a server, or if you were\n"
"not successful in getting the display configured."
msgstr ""
-"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandrivalinux\n"
+"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandriva Linux\n"
"附带的所有图形环境(KDE、GNOME、AfterStep、WindowMaker 等)都依赖于该系统。\n"
"\n"
"您将会看到不同的参数列表,以便进行图形显示选项的更改来达到最佳状态。其中包括:\n"
@@ -629,7 +629,7 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
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, don't queue'', is the choice\n"
@@ -650,10 +650,10 @@ msgid ""
"options and for managing the printer.\n"
"\n"
"If you make a choice now, and later find that you don't 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 ""
-"现在,应该为您的计算机选择打印系统了。其它的操作系统也许只提供了一种选择,但 Mandrivalinux\n"
+"现在,应该为您的计算机选择打印系统了。其它的操作系统也许只提供了一种选择,但 Mandriva Linux\n"
"提供了两种。每种打印系统都能够在不同的配置中大展身手。\n"
"\n"
" * \"%s\" --\n"
@@ -666,7 +666,7 @@ msgstr ""
"\"pdq\" 一样简单。如果您想模拟一台 \"lpd\" 服务器,不要忘了打开 \"cups-lpd \" 守护程序。\"%s\"\n"
"还包括一个图形界面,可用来打印或选择打印机选项,以及管理打印机。\n"
"\n"
-"如果您现在进行了选择,但稍后又发现您并不喜欢所选择的打印系统,可以轻松修改。只需从 Mandrivalinux Control Center中选择\n"
+"如果您现在进行了选择,但稍后又发现您并不喜欢所选择的打印系统,可以轻松修改。只需从 Mandriva Linux Control Center中选择\n"
"PrinterDrake,然后单击\"%s\"按钮。"
# DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -692,11 +692,11 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
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 ""
-"在继续之前,您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrivalinux\n"
+"在继续之前,您应该仔细阅读许可协议的条款。该许可适用于整个 Mandriva Linux\n"
"发行版。如果您同意其中的全部条款,请选中\"%s\"框。如果不同意,单击\"%s\"按钮将重新启动您的计算机。"
# DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -745,11 +745,11 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
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"
@@ -800,10 +800,10 @@ msgid ""
"command-line interface. The total size of this installation is about 65\n"
"megabytes."
msgstr ""
-"现在该指定要在您的系统中安装哪些程序了。Mandrivalinux\n"
+"现在该指定要在您的系统中安装哪些程序了。Mandriva Linux\n"
"为您准备了数千个软件包。而为了使管理软件包更加容易,软件包已经按相似程度分成了多个组。\n"
"\n"
-"Mandrivalinux\n"
+"Mandriva Linux\n"
"按四个类别对软件包进行了分类。您可以从不同的类别混合选择应用程序。也就是说,``工作站''中也可以选择安装``服务器''分类中的应用程序。\n"
"\n"
" * \"%s\":如果您计划将您的计算机用作工作站,请选择工作站分类中的一个或多个组。\n"
@@ -835,13 +835,13 @@ msgstr ""
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
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 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM,DrakX 将弹出当前\n"
+"Mandriva Linux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM,DrakX 将弹出当前\n"
"CD,并要求您插入所需的正确 CD。如果您手中没有所请求的 CD,只需单击\"%s\",就不会安装相应的软件包了。"
# DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -1009,7 +1009,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."
@@ -1024,7 +1024,7 @@ msgstr ""
"\n"
"如果您准备好格式化分区了,请单击\"%s\"。\n"
"\n"
-"如果您想要选择其它分区用于安装 Mandrivalinux 操作系统,请单击\"%s\"。\n"
+"如果您想要选择其它分区用于安装 Mandriva Linux 操作系统,请单击\"%s\"。\n"
"\n"
"如果您想要选择要检测磁盘上的坏块,请单击单击\"%s\"。"
@@ -1042,10 +1042,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 don't 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"
@@ -1069,8 +1069,8 @@ msgstr ""
"只要您在左侧的树中选择了软件包,右侧就会出现该软件包用途的描述。\n"
"\n"
"!!\n"
-"如果选择了服务器软件包,不管是您特意选中的,还是因为该软件包是某组的成员,您都需要确认是否真的想要安装这些服务器。默认情况下,Mandrivalinux\n"
-"会在启动时自动启动已安装的全部服务。尽管在发行版送出时这些服务是安全的,但完全有可能在此版本 Mandrivalinux\n"
+"如果选择了服务器软件包,不管是您特意选中的,还是因为该软件包是某组的成员,您都需要确认是否真的想要安装这些服务器。默认情况下,Mandriva Linux\n"
+"会在启动时自动启动已安装的全部服务。尽管在发行版送出时这些服务是安全的,但完全有可能在此版本 Mandriva Linux\n"
"完成后发现了相应软件的安全漏洞。如果您并不知道特定服务的用途,或者不知道为什么要安装这些服务,请单击\"%s\"。单击\"%s\"将安装列出的服务,并且启动时这些服务会被自动启动。\n"
"!!\n"
"\n"
@@ -1201,7 +1201,7 @@ msgstr ""
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
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"
@@ -1271,7 +1271,7 @@ msgid ""
"may find it a useful place to store a spare kernel and ramdisk images for\n"
"emergency boot situations."
msgstr ""
-"在这一步中,您需要选择要使用哪个或哪些分区来安装您的 Mandrivalinux 系统。如果已经定义了分区,不管是先前安装的 GNU/Linux\n"
+"在这一步中,您需要选择要使用哪个或哪些分区来安装您的 Mandriva Linux 系统。如果已经定义了分区,不管是先前安装的 GNU/Linux\n"
"还是由其它分区工具划分的,您都可以使用已有的分区。否则,必须对硬盘分区进行定义。\n"
"\n"
"要创建分区,您必须先选择硬盘。您可以单击``hda'' 选择第一个 IDE 硬盘进行分区,``hdb'' 选择第二个 IDE 硬盘,``sda''\n"
diff --git a/perl-install/share/po/hi.po b/perl-install/share/po/hi.po
index 6c3d42c7e..56f2f885b 100644
--- a/perl-install/share/po/hi.po
+++ b/perl-install/share/po/hi.po
@@ -6142,7 +6142,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 ""
@@ -6676,7 +6676,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
@@ -6896,7 +6896,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
diff --git a/perl-install/share/po/hr.po b/perl-install/share/po/hr.po
index afaeab56d..6719f9a28 100644
--- a/perl-install/share/po/hr.po
+++ b/perl-install/share/po/hr.po
@@ -6351,7 +6351,7 @@ msgstr "Pokrećem 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 ""
@@ -6887,7 +6887,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
@@ -7109,7 +7109,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
diff --git a/perl-install/share/po/hu.po b/perl-install/share/po/hu.po
index f543bf7da..11f671a5f 100644
--- a/perl-install/share/po/hu.po
+++ b/perl-install/share/po/hu.po
@@ -6747,7 +6747,7 @@ msgstr "A következő lépés: \"%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 ""
@@ -7305,7 +7305,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
@@ -7534,7 +7534,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
diff --git a/perl-install/share/po/id.po b/perl-install/share/po/id.po
index 8f05c0bed..8971f282a 100644
--- a/perl-install/share/po/id.po
+++ b/perl-install/share/po/id.po
@@ -6699,12 +6699,12 @@ msgstr "Memasuki langkah `%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 ""
"Sumber daya sistem Anda rendah. Anda akan mengalami kesulitan\n"
-"menginstall Mandrivalinux. Jika terjadi, Anda bisa mencoba\n"
+"menginstall Mandriva Linux. Jika terjadi, Anda bisa mencoba\n"
"installasi berbasis teks. Untuk melakukannya, tekan `F1' saat\n"
"booting pada CDROM, lalu ketikkan `text'."
@@ -7241,9 +7241,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 ""
-"Menghubungi situs web Mandrivalinux untuk mendapatkan daftar mirror..."
+"Menghubungi situs web Mandriva Linux untuk mendapatkan daftar mirror..."
#: install_steps_interactive.pm:840
#, c-format
@@ -7466,8 +7466,8 @@ msgstr ""
#: install_steps_newt.pm:20
#, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Installasi Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Installasi Mandriva Linux %s"
#. -PO: This string must fit in a 80-char wide text screen
#: install_steps_newt.pm:34
diff --git a/perl-install/share/po/is.po b/perl-install/share/po/is.po
index db019f131..f75772294 100644
--- a/perl-install/share/po/is.po
+++ b/perl-install/share/po/is.po
@@ -6026,7 +6026,7 @@ msgstr "Hef skref `%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 ""
@@ -6564,7 +6564,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
@@ -6784,7 +6784,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
diff --git a/perl-install/share/po/it.po b/perl-install/share/po/it.po
index 080e8857f..71dc846d5 100644
--- a/perl-install/share/po/it.po
+++ b/perl-install/share/po/it.po
@@ -6808,7 +6808,7 @@ msgstr "Avvio della fase \"%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 ""
@@ -7353,7 +7353,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
@@ -7579,7 +7579,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
diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po
index da3ab2127..f694059e7 100644
--- a/perl-install/share/po/ja.po
+++ b/perl-install/share/po/ja.po
@@ -6496,7 +6496,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 ""
@@ -7036,7 +7036,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
@@ -7260,7 +7260,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
diff --git a/perl-install/share/po/ko.po b/perl-install/share/po/ko.po
index 3cb269865..c44dec12c 100644
--- a/perl-install/share/po/ko.po
+++ b/perl-install/share/po/ko.po
@@ -5846,7 +5846,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 ""
@@ -6365,7 +6365,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
@@ -6582,7 +6582,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
diff --git a/perl-install/share/po/ky.po b/perl-install/share/po/ky.po
index 49ed93580..3622e0ae9 100644
--- a/perl-install/share/po/ky.po
+++ b/perl-install/share/po/ky.po
@@ -6090,7 +6090,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 ""
@@ -6592,7 +6592,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
@@ -6797,7 +6797,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
diff --git a/perl-install/share/po/lt.po b/perl-install/share/po/lt.po
index 6113cefb5..b9ca77674 100644
--- a/perl-install/share/po/lt.po
+++ b/perl-install/share/po/lt.po
@@ -5770,7 +5770,7 @@ msgstr "Įeinama į žingsnį „%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 ""
@@ -6285,7 +6285,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
@@ -6501,7 +6501,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
diff --git a/perl-install/share/po/ltg.po b/perl-install/share/po/ltg.po
index c188e92a1..b7d001d56 100644
--- a/perl-install/share/po/ltg.po
+++ b/perl-install/share/po/ltg.po
@@ -5894,7 +5894,7 @@ msgstr "Uzsuocu sūli `%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 ""
@@ -6431,7 +6431,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
@@ -6647,7 +6647,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
diff --git a/perl-install/share/po/lv.po b/perl-install/share/po/lv.po
index 4b0b60105..c201ad82a 100644
--- a/perl-install/share/po/lv.po
+++ b/perl-install/share/po/lv.po
@@ -5845,7 +5845,7 @@ msgstr "Uzsāku soli `%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 ""
@@ -6380,7 +6380,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
@@ -6594,7 +6594,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
diff --git a/perl-install/share/po/mk.po b/perl-install/share/po/mk.po
index f23c364fc..e020d1c7e 100644
--- a/perl-install/share/po/mk.po
+++ b/perl-install/share/po/mk.po
@@ -6524,7 +6524,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 ""
@@ -7063,7 +7063,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
@@ -7286,7 +7286,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
diff --git a/perl-install/share/po/mn.po b/perl-install/share/po/mn.po
index d8af96a4d..e0f4484bd 100644
--- a/perl-install/share/po/mn.po
+++ b/perl-install/share/po/mn.po